diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-26 04:31:02 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-26 04:31:02 +0000 |
| commit | 3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (patch) | |
| tree | 7bd96ac4c5b787effcfc2d87bd25cb35c5601298 | |
| parent | 052480ae53afa112e744674a16ff57aa367b1d0d (diff) | |
| parent | 3fe5004a37602177363945fa1a7805b802ebe39d (diff) | |
| download | gitlab-ce-3d174c7198f103cdedd7c7ffb7678aff1dd4de33.tar.gz | |
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
| -rw-r--r-- | spec/features/merge_requests/created_from_fork_spec.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb index cfc1244429f..142649297cc 100644 --- a/spec/features/merge_requests/created_from_fork_spec.rb +++ b/spec/features/merge_requests/created_from_fork_spec.rb @@ -40,8 +40,6 @@ feature 'Merge request created from fork' do end context 'pipeline present in source project' do - include WaitForAjax - given(:pipeline) do create(:ci_pipeline, project: fork_project, @@ -57,7 +55,6 @@ feature 'Merge request created from fork' do scenario 'user visits a pipelines page', js: true do visit_merge_request(merge_request) page.within('.merge-request-tabs') { click_link 'Builds' } - wait_for_ajax page.within('table.ci-table') do expect(page).to have_content 'rspec' |