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

3 files changed, 23 insertions, 1 deletions

diff --git a/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6
index 483b414126a..8ae98f9bf97 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6
+++ b/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6
@@ -8,7 +8,22 @@
  * Uses Vue.Resource
  */
 class PipelinesService {
-  constructor(endpoint) {
+
+  /**
+   * FIXME: The url provided to request the pipelines in the new merge request
+   * page already has `.json`.
+   * This should be fixed when the endpoint is improved.
+   *
+   * @param  {String} root
+   */
+  constructor(root) {
+    let endpoint;
+
+    if (root.indexOf('.json') === -1) {
+      endpoint = `${root}.json`;
+    } else {
+      endpoint = root;
+    }
     this.pipelines = Vue.resource(endpoint);
   }
 
diff --git a/changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml b/changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml
new file mode 100644
index 00000000000..b7505e28401
--- /dev/null
+++ b/changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml
@@ -0,0 +1,4 @@
+---
+title: Fix Merge request pipelines displays JSON
+merge_request:
+author:
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