summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaco Guzman <pacoguzmanp@gmail.com>2016-08-18 07:39:28 +0200
committerPaco Guzman <pacoguzmanp@gmail.com>2016-08-18 07:39:28 +0200
commit1fa08b236c5d289cdf1627bb93f80c66f642e2a4 (patch)
tree11f3e9dfd96fa3f743ca23d6711199d4134c2544
parentbac19f4c5c62218f7c59894957548a25b03f69d5 (diff)
downloadgitlab-ce-paco-tab-persistence.tar.gz
Fix failing testpaco-tab-persistence
-rw-r--r--spec/features/merge_requests/create_new_mr_spec.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index 775b38814eb..1aacade7ab5 100644
--- a/spec/features/merge_requests/create_new_mr_spec.rb
+++ b/spec/features/merge_requests/create_new_mr_spec.rb
@@ -51,15 +51,12 @@ feature 'Create New Merge Request', feature: true, js: true do
click_link 'Changes'
- expect(page.find_link('Inline')[:class]).to match(/\bactive\b/)
- expect(page.find_link('Side-by-side')[:class]).not_to match(/\bactive\b/)
+ expect(page).to have_css('a.btn.active', text: 'Inline')
+ expect(page).not_to have_css('a.btn.active', text: 'Side-by-side')
click_link 'Side-by-side'
- wait_for_ajax
- within '.merge-request' do
- expect(page).not_to have_css('a.btn.active', text: 'Inline')
- expect(page).to have_css('a.btn.active', text: 'Side-by-side')
- end
+ expect(page).to have_css('a.btn.active', text: 'Side-by-side')
+ expect(page).not_to have_css('a.btn.active', text: 'Inline')
end
end