in src/integrationTests/kotlin/UseCase4Test.kt [55:90]
override fun setUp() {
super.setUp()
runBlocking(Dispatchers.IO) {
repository.checkout("main")
assertCorrectCheckedOutBranch("main")
secondCommitOnMain = createAndCommitNewFile("file5.txt", "second")
thirdCommitOnMain = createAndCommitNewFile("file6.txt", "third")
Awaitility.await()
.atMost(15000, TimeUnit.MILLISECONDS)
.pollDelay(50, TimeUnit.MILLISECONDS)
.until {
gitCommitsCountEquals(2)
}
repository.checkoutNew(featureBranch)
assertCorrectCheckedOutBranch(featureBranch)
repository.git("branch")
firstCommitOnFeature = createAndCommitNewFile("file7.txt", "refactor")
secondCommitOnFeature = createAndCommitNewFile("file8.txt", "whatever")
thirdCommitOnFeature = createAndCommitNewFile("file9.txt", "it works")
fourthCommitOnFeature = createAndCommitNewFile("file10.txt", "testy")
fifthCommitOnFeature = createAndCommitNewFile("file11.txt", "new file")
assertCorrectCheckedOutBranch(featureBranch)
Awaitility.await()
.atMost(15000, TimeUnit.MILLISECONDS)
.pollDelay(50, TimeUnit.MILLISECONDS)
.until {
gitCommitsCountEquals(7)
}
}
}