From bac19f4c5c62218f7c59894957548a25b03f69d5 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 17 Aug 2016 22:55:24 -0500 Subject: [PATCH] Fix failing test Test was not waiting for the page to be fully loaded --- spec/features/merge_requests/create_new_mr_spec.rb | 11 +++++++---- 1 file 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