Commit 3d174c71 authored by Stan Hu's avatar Stan Hu

Merge branch 'sh-fix-ajax-spec-failure' into 'master'

Remove use of wait_for_ajax since jQuery was removed

Fixes #23812

See merge request !7111
parents 052480ae 3fe5004a
...@@ -40,8 +40,6 @@ feature 'Merge request created from fork' do ...@@ -40,8 +40,6 @@ feature 'Merge request created from fork' do
end end
context 'pipeline present in source project' do context 'pipeline present in source project' do
include WaitForAjax
given(:pipeline) do given(:pipeline) do
create(:ci_pipeline, create(:ci_pipeline,
project: fork_project, project: fork_project,
...@@ -57,7 +55,6 @@ feature 'Merge request created from fork' do ...@@ -57,7 +55,6 @@ feature 'Merge request created from fork' do
scenario 'user visits a pipelines page', js: true do scenario 'user visits a pipelines page', js: true do
visit_merge_request(merge_request) visit_merge_request(merge_request)
page.within('.merge-request-tabs') { click_link 'Builds' } page.within('.merge-request-tabs') { click_link 'Builds' }
wait_for_ajax
page.within('table.ci-table') do page.within('table.ci-table') do
expect(page).to have_content 'rspec' expect(page).to have_content 'rspec'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment