summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-02-14 16:04:20 +0000
committerFelipe Artur <felipefac@gmail.com>2017-02-17 18:02:55 -0200
commit69e0c3c5c56f8e9a254af1b7f553e00d1c07834c (patch)
tree7a437f5f28c2ad3f023ab0bee477efb5f6593a90 /spec
parent772b37af122de100ff2db000a3a150ac6ac48107 (diff)
downloadgitlab-ce-69e0c3c5c56f8e9a254af1b7f553e00d1c07834c.tar.gz
Merge branch '27932-merge-request-pipelines-displays-json' into 'master'
Adds `.json` to the endpoint requested in order to avoid showing JSON Closes #27932 See merge request !9105
Diffstat (limited to 'spec')
-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