summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-10-25 17:04:58 -0700
committerStan Hu <stanhu@gmail.com>2016-10-25 17:04:58 -0700
commit3fe5004a37602177363945fa1a7805b802ebe39d (patch)
tree026e857e657cdd803c0e57f1012978b37a12caba
parentd6e72f617237274f38f7e59fac9889d796692008 (diff)
downloadgitlab-ce-3fe5004a37602177363945fa1a7805b802ebe39d.tar.gz
Remove use of wait_for_ajax since jQuery was removedsh-fix-ajax-spec-failure
Fixes #23812
-rw-r--r--spec/features/merge_requests/created_from_fork_spec.rb3
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'