[issue allegro#286] Create rc1 in case of no rc version in incrementP…

…rerelase strategy
krzysiekbielicki · Mar 28, 2019 · 05d359c · 05d359c
1 parent 4b84950
commit 05d359c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...ain/groovy/pl/allegro/tech/build/axion/release/domain/PredefinedVersionIncrementer.groovy b/...ain/groovy/pl/allegro/tech/build/axion/release/domain/PredefinedVersionIncrementer.groovy
@@ -43,7 +43,7 @@ enum PredefinedVersionIncrementer {
                     .build()
             }
         }
-        return context.currentVersion.incrementPatchVersion()
+        return context.currentVersion.incrementPatchVersion('rc1')
     }),
 
     BRANCH_SPECIFIC('branchSpecific', { VersionIncrementerContext context, Map config ->

diff --git a/...groovy/pl/allegro/tech/build/axion/release/domain/PredefinedVersionIncrementerTest.groovy b/...groovy/pl/allegro/tech/build/axion/release/domain/PredefinedVersionIncrementerTest.groovy
@@ -41,15 +41,23 @@ class PredefinedVersionIncrementerTest extends Specification {
         expect:
         versionIncrementerFor('branchSpecific', ['release.*': 'incrementPatch', 'master': 'incrementMinor'])(context) == Version.valueOf('0.2.0')
     }
-    
+
     def "should increment prerelease version when incrementPrerelease rule used"() {
         given:
         VersionIncrementerContext context = new VersionIncrementerContext(Version.valueOf('0.1.0-rc1'), scmPosition('master'))
-        
+
         expect:
         versionIncrementerFor('incrementPrerelease')(context) == Version.valueOf('0.1.0-rc2')
     }
 
+    def "should create prerelease version when incrementPrerelease rule used"() {
+        given:
+        VersionIncrementerContext context = new VersionIncrementerContext(Version.valueOf('0.1.0'), scmPosition('master'))
+
+        expect:
+        versionIncrementerFor('incrementPrerelease')(context) == Version.valueOf('0.1.1-rc1')
+    }
+
     def "should increment prerelease version even when it has leading zeroes when incrementPrerelease rule used"() {
         given:
         VersionIncrementerContext context = new VersionIncrementerContext(Version.valueOf('0.1.0-rc01'), scmPosition('master'))