@@ -199,4 +199,43 @@ public void ShouldUseConfiguredTag(string tag, string featureName, string preRel
199
199
fixture . AssertFullSemver ( config , expectedFullSemVer ) ;
200
200
}
201
201
}
202
+
203
+ [ Test ]
204
+ public void BranchCreatedAfterFinishReleaseShouldInheritAndIncrementFromLastMasterCommitTag ( )
205
+ {
206
+ using ( var fixture = new BaseGitFlowRepositoryFixture ( "0.1.0" ) )
207
+ {
208
+ //validate current version
209
+ fixture . AssertFullSemver ( "0.2.0-unstable.1" ) ;
210
+ fixture . Repository . CreateBranch ( "release/0.2.0" ) ;
211
+ fixture . Repository . Checkout ( "release/0.2.0" ) ;
212
+
213
+ //validate release version
214
+ fixture . AssertFullSemver ( "0.2.0-beta.1+0" ) ;
215
+
216
+ fixture . Checkout ( "master" ) ;
217
+ fixture . Repository . MergeNoFF ( "release/0.2.0" ) ;
218
+ fixture . Repository . ApplyTag ( "0.2.0" ) ;
219
+
220
+ //validate master branch version
221
+ fixture . AssertFullSemver ( "0.2.0" ) ;
222
+
223
+ fixture . Checkout ( "develop" ) ;
224
+ fixture . Repository . MergeNoFF ( "release/0.2.0" ) ;
225
+
226
+ fixture . Repository . MakeACommit ( ) ;
227
+
228
+ //validate develop branch version after merging release 0.2.0 to master and develop (finish release)
229
+ fixture . AssertFullSemver ( "0.3.0-unstable.1" ) ;
230
+
231
+ //create a feature branch from develop
232
+ fixture . Repository . CreateBranch ( "feature/TEST-1" ) ;
233
+ fixture . Repository . Checkout ( "feature/TEST-1" ) ;
234
+ fixture . Repository . MakeACommit ( ) ;
235
+
236
+ //I'm not entirely sure what the + value should be but I know the semvar major/minor/patch should be 0.3.0
237
+ fixture . AssertFullSemver ( "0.3.0-TEST-1.1+3" ) ;
238
+
239
+ }
240
+ }
202
241
}
0 commit comments