summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-04 02:31:55 +0000
committerStan Hu <stanhu@gmail.com>2019-04-04 02:31:55 +0000
commit74ace2a445a44a13bd22c1907b8ec55b1772d403 (patch)
treef5bb1b66263c81955fcb3029b7dfbf63b0ecb966
parent13ace389787f21b847ca09eccc194c3b08a7ea86 (diff)
parent942fd15284df33e8e3e51beb175f38ca5cf65928 (diff)
downloadgitlab-ce-74ace2a445a44a13bd22c1907b8ec55b1772d403.tar.gz
Merge branch 'da-fix-broken-master' into 'master'
Fix broken spec for Merge request > Revert modal See merge request gitlab-org/gitlab-ce!26961
-rw-r--r--spec/features/user_sees_revert_modal_spec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/features/user_sees_revert_modal_spec.rb b/spec/features/user_sees_revert_modal_spec.rb
index 3b48ea4786d..d2cdade88d1 100644
--- a/spec/features/user_sees_revert_modal_spec.rb
+++ b/spec/features/user_sees_revert_modal_spec.rb
@@ -17,12 +17,14 @@ describe 'Merge request > User sees revert modal', :js do
end
it 'shows the revert modal' do
- expect(page).to have_content('Revert this merge request')
+ page.within('.modal-header') do
+ expect(page).to have_content 'Revert this merge request'
+ end
end
it 'closes the revert modal with escape keypress' do
find('#modal-revert-commit').send_keys(:escape)
- expect(page).not_to have_content('Revert this merge request')
+ expect(page).not_to have_selector('#modal-revert-commit', visible: true)
end
end