summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-02-10 19:41:15 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-02-10 20:00:43 +0000
commit86558d53ddcf008fff396d25c38c9462fb77f615 (patch)
tree58c1a6f9f7436eae0ec5b75094326c6872f01a2f /spec/features
parent4f265c3bbc10130f57d79c90c7063b66ae173a94 (diff)
downloadgitlab-ce-86558d53ddcf008fff396d25c38c9462fb77f615.tar.gz
Adds verification in case the endpoint already has `.json`
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_requests/create_new_mr_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index e853fb7e016..0832a3656a8 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 WaitForVueResource
+
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
@@ -99,6 +101,7 @@ feature 'Create New Merge Request', feature: true, js: true do
page.within('.merge-request') do
click_link 'Pipelines'
+ wait_for_vue_resource
expect(page).to have_content "##{pipeline.id}"
end