Prepare release 6.18.0 (#421)

Co-authored-by: Prashant Ramcharan <[email protected]>
prashant-ramcharan · Nov 10, 2024 · 67938dc · 67938dc
1 parent 8757650
commit 67938dc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+CHANGES IN VERSION 6.18.0
+=================================
+* [FIX] Don't rerun failed tests when rerun attempts is set to 0
+* [MAINTENANCE] Upgrade to Cucumber version 7.20.1
+
 CHANGES IN VERSION 6.17.0
 =================================
 * [FIX] NullPointerException when resolving classpath feature URIs

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'io.github.prashant-ramcharan'
-version '6.17.0'
+version '6.18.0'
 
 apply plugin: 'java'
 apply plugin: 'maven-publish'
@@ -12,7 +12,7 @@ compileJava {
 }
 
 ext {
-    cucumberVersion = '7.19.0'
+    cucumberVersion = '7.20.1'
     testNGVersion = '7.9.0'
     jacksonVersion = '2.17.0'
     httpcomponentsVersion = '4.5.13'

diff --git a/src/main/java/courgette/runtime/CourgetteProperties.java b/src/main/java/courgette/runtime/CourgetteProperties.java
@@ -109,6 +109,10 @@ public boolean isMultipleMobileDeviceTypes() {
         return courgetteOptions.mobileDeviceType().equals(MobileDeviceType.SIMULATOR_AND_REAL_DEVICE);
     }
 
+    public boolean isRerunEnabled() {
+        return courgetteOptions.rerunFailedScenarios() && courgetteOptions.rerunAttempts() > 0;
+    }
+
     public CourgetteSlackOptions slackOptions() {
         return new CourgetteSlackOptions(courgetteOptions.slackWebhookUrl(),
                 Arrays.asList(courgetteOptions.slackChannel()),

diff --git a/src/main/java/courgette/runtime/CourgetteRunnerInfo.java b/src/main/java/courgette/runtime/CourgetteRunnerInfo.java
@@ -30,7 +30,7 @@ public CourgetteRunnerInfo(CourgetteProperties courgetteProperties, Feature feat
         this.courgetteReportOptions = new CourgetteReportOptions(feature, lineId, courgetteProperties);
         this.courgetteRuntimeOptions = new CourgetteRuntimeOptions(courgetteProperties, courgetteReportOptions, feature);
         this.courgetteRunLevel = courgetteProperties.getCourgetteOptions().runLevel();
-        this.rerun = courgetteProperties.getCourgetteOptions().rerunFailedScenarios() &&
+        this.rerun = courgetteProperties.isRerunEnabled() &&
                 checkRerunCondition(feature,
                         courgetteProperties.getCourgetteOptions().excludeFeatureFromRerun(),
                         courgetteProperties.getCourgetteOptions().excludeTagFromRerun());

diff --git a/src/main/resources/report/templates/index.mustache b/src/main/resources/report/templates/index.mustache
@@ -184,13 +184,13 @@
                             <div class="col-sm-7">
                                 Cucumber Version:
                             </div>
-                            <div>7.19.0</div>
+                            <div>7.20.1</div>
                         </div>
                         <div class="row mt-4">
                             <div class="col-sm-7">
                                 Courgette Version:
                             </div>
-                            <div>6.17.0</div>
+                            <div>6.18.0</div>
                         </div>
                         <div class="row mt-4">
                             <div><a href class="col-sm-9" data-toggle="modal" data-target="#environment_info">Additional