summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-08-17 22:55:24 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-08-17 22:55:24 -0500
commitbac19f4c5c62218f7c59894957548a25b03f69d5 (patch)
treef4c7a8fa6173b9a4731030f9d9f475c91ede175e
parent43252ccbee64333634f13dd59509a1d19eef5c6e (diff)
downloadgitlab-ce-tab-persistance.tar.gz
Fix failing testtab-persistance
Test was not waiting for the page to be fully loaded
-rw-r--r--spec/features/merge_requests/create_new_mr_spec.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index b63931d9d35..775b38814eb 100644
--- a/spec/features/merge_requests/create_new_mr_spec.rb
+++ b/spec/features/merge_requests/create_new_mr_spec.rb
@@ -1,6 +1,8 @@
require 'spec_helper'
feature 'Create New Merge Request', feature: true, js: true do
+ include WaitForAjax
+
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
@@ -53,10 +55,11 @@ feature 'Create New Merge Request', feature: true, js: true do
expect(page.find_link('Side-by-side')[:class]).not_to match(/\bactive\b/)
click_link 'Side-by-side'
+ wait_for_ajax
- click_link 'Changes'
-
- expect(page.find_link('Inline')[:class]).not_to match(/\bactive\b/)
- expect(page.find_link('Side-by-side')[:class]).to match(/\bactive\b/)
+ 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
end
end