kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Remove use of wait_for_ajax since jQuery was removed

Fixes #23812

See merge request !7111
This commit is contained in:
Stan Hu 2016-10-26 04:31:02 +00:00
commit 3d174c7198
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
spec/features/merge_requests/created_from_fork_spec.rb
View file

@ -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
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'