MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of notification assertions in Git tests

Browse Source
This commit is contained in:
Kirill Likhodedov
2017-02-26 15:15:55 +00:00
parent 6d299eb126
commit 66302d5a31
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt
+3 -3
View File
@@ -234,7 +234,7 @@ class GitBranchWorkerTest : GitPlatformTest() {
assertCurrentBranch("master")
assertCurrentRevision("master")
assertSuccessfulNotification("Revision not found in project, community and contrib")
assertErrorNotification("Couldn't checkout unknown_ref", "Revision not found in project, community and contrib")
}
fun test_checkout_revision_checkout_ref_with_partial_success() {
@@ -627,8 +627,8 @@ class GitBranchWorkerTest : GitPlatformTest() {
mergeBranch("master2", TestUiHandler())
assertSuccessfulNotification("Merged " + bcode("master2") + " to " + bcode("master") + "<br/><a href='delete'>Delete master2</a>",
myVcsNotifier.lastNotification.content)
assertSuccessfulNotification("Merged ${bcode("master2")} to ${bcode("master")}<br/>" +
"<a href='delete'>Delete master2</a>")
assertFile(myUltimate, "branch_file.txt", "branch content")
assertFile(myCommunity, "branch_file.txt", "branch content")
assertFile(myContrib, "branch_file.txt", "branch content")