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

git tests: fix rebase tests after 05131fe: PCE is not thrown anymore

Browse Source
This commit is contained in:
Kirill Likhodedov
2018-06-24 16:53:23 +03:00
parent bab2021712
commit 154caa3730
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt
-5
View File
@@ -17,7 +17,6 @@ package git4idea.rebase
import com.intellij.dvcs.DvcsUtil
import com.intellij.openapi.progress.EmptyProgressIndicator
import com.intellij.openapi.progress.ProcessCanceledException
import com.intellij.openapi.ui.DialogWrapper
import com.intellij.openapi.ui.Messages
import com.intellij.openapi.vcs.ui.CommitMessage
@@ -31,7 +30,6 @@ import git4idea.test.*
import org.junit.Assume
import org.mockito.Mockito
import org.mockito.Mockito.`when`
import kotlin.test.assertFailsWith
class GitSingleRepoRebaseTest : GitRebaseBaseTest() {
@@ -494,8 +492,6 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() {
repo.`diverge feature and master`()
dialogManager.onDialog(GitRebaseEditor::class.java) { DialogWrapper.CANCEL_EXIT_CODE }
assertFailsWith(ProcessCanceledException::class) { rebaseInteractively() }
assertNoNotification()
assertNoRebaseInProgress(repo)
repo.`assert feature not rebased on master`()
@@ -511,7 +507,6 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() {
}
dialogManager.onMessage { Messages.CANCEL }
assertFailsWith(ProcessCanceledException::class) { rebaseInteractively() }
assertNoNotification()
assertNoRebaseInProgress(repo)