-
Notifications
You must be signed in to change notification settings - Fork 157
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix broken test: Use global definition "v" instead of "release-" as T…
…agPrefix
- Loading branch information
Showing
2 changed files
with
16 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 15 additions & 14 deletions
29
src/test/groovy/pl/allegro/tech/build/axion/release/Fixtures.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,54 @@ | ||
| package pl.allegro.tech.build.axion.release | ||
|
|
||
| import pl.allegro.tech.build.axion.release.domain.scm.ScmRepository | ||
|
|
||
| // Centralize setup for tests. This class is reachable from 'integration' and 'test' source tree. | ||
| final class Fixtures { | ||
| // Split up Fixtures, so its easier to see what they are used for. | ||
| // Shared fixtures can be in the Fixtures class itself (there are none at the hour of writing) | ||
| final class FixtureUseGlobalVersion { | ||
| static void setupABranchWithHighTagAndBBranchWithLowTag(ScmRepository repository) { | ||
| // * (tag: release-2.0.0, high) some commit 2 | ||
| // | * (HEAD -> low, tag: release-1.0.1) some commit 3 | ||
| // * (tag: v2.0.0, high) some commit 2 | ||
| // | * (HEAD -> low, tag: v1.0.1) some commit 3 | ||
| // |/ | ||
| // * (tag: release-1.0.0, start) some commit 1 | ||
| // * (tag: v1.0.0, start) some commit 1 | ||
| // * (master) initial commit | ||
| repository.branch('start') | ||
| repository.checkout('start') | ||
| repository.commit(['*'], 'some commit 1') | ||
| repository.tag('release-1.0.0') | ||
| repository.tag("${TagPrefixConf.fullPrefix()}1.0.0") | ||
| repository.branch('high') | ||
| repository.checkout('high') | ||
| repository.commit(['*'], 'some commit 2') | ||
| repository.tag('release-2.0.0') | ||
| repository.tag("${TagPrefixConf.fullPrefix()}2.0.0") | ||
| repository.checkout('start') | ||
| repository.branch('low') | ||
| repository.checkout('low') | ||
| repository.commit(['*'], 'some commit 3') | ||
| repository.tag('release-1.0.1') | ||
| repository.tag("${TagPrefixConf.fullPrefix()}1.0.1") | ||
| } | ||
| static void setupABranchWithHighTagsOutOfOrderAndBBranchWithLowTag(ScmRepository repository) { | ||
| // * 570120a (HEAD -> high, tag: release-2.0.0) some commit 3 | ||
| // * 610acf2 (tag: release-3.0.0) some commit 2 | ||
| // | * b510d23 (tag: release-1.0.1, low) some commit 3 | ||
| // * 570120a (HEAD -> high, tag: v2.0.0) some commit 3 | ||
| // * 610acf2 (tag: v3.0.0) some commit 2 | ||
| // | * b510d23 (tag: v1.0.1, low) some commit 3 | ||
| // |/ | ||
| // * 0b4c7ac (tag: release-1.0.0, start) some commit 1 | ||
| // * 0b4c7ac (tag: v1.0.0, start) some commit 1 | ||
| // * eeae3d9 (master) initial commit | ||
| repository.branch('start') | ||
| repository.checkout('start') | ||
| repository.commit(['*'], 'some commit 1') | ||
| repository.tag('release-1.0.0') | ||
| repository.tag("${TagPrefixConf.fullPrefix()}1.0.0") | ||
| repository.branch('high') | ||
| repository.checkout('high') | ||
| repository.commit(['*'], 'some commit 2') | ||
| repository.tag('release-3.0.0') | ||
| repository.tag("${TagPrefixConf.fullPrefix()}3.0.0") | ||
| repository.commit(['*'], 'some commit 3') | ||
| repository.tag('release-2.0.0') | ||
| repository.tag("${TagPrefixConf.fullPrefix()}2.0.0") | ||
| repository.checkout('start') | ||
| repository.branch('low') | ||
| repository.checkout('low') | ||
| repository.commit(['*'], 'some commit 3') | ||
| repository.tag('release-1.0.1') | ||
| repository.tag("${TagPrefixConf.fullPrefix()}1.0.1") | ||
| } | ||
| } | ||
| } |