Add latest changes from gitlab-org/gitlab@master

lib/gitlab/ci/pipeline/chain/config/content/source.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        module Config
+          class Content
+            class Source
+              include Gitlab::Utils::StrongMemoize
+
+              DEFAULT_YAML_FILE = '.gitlab-ci.yml'
+
+              def initialize(pipeline, command)
+                @pipeline = pipeline
+                @command = command
+              end
+
+              def exists?
+                strong_memoize(:exists) do
+                  content.present?
+                end
+              end
+
+              def content
+                raise NotImplementedError
+              end
+
+              def source
+                raise NotImplementedError
+              end
+
+              def project
+                @project ||= @pipeline.project
+              end
+
+              def ci_config_path
+                @ci_config_path ||= project.ci_config_path.presence || DEFAULT_YAML_FILE
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/import_export/project_tree_restorer.rb

@@ -105,7 +105,7 @@ module Gitlab
         save_id_mapping(relation_key, data_hash, relation_object)
       rescue => e
         # re-raise if not enabled
-        raise e unless Feature.enabled?(:import_graceful_failures, @project.group)
+        raise e unless Feature.enabled?(:import_graceful_failures, @project.group, default_enabled: true)
         log_import_failure(relation_key, relation_index, e)
       end

locale/gitlab.pot

@@ -2960,6 +2960,9 @@ msgstr ""
 msgid "Can't scan the code?"
 msgstr ""
+msgid "Canary"
+msgstr ""
+
 msgid "Canary Deployments is a popular CI strategy, where a small portion of the fleet is updated to the new version of your application."
 msgstr ""
@@ -15325,16 +15328,16 @@ msgstr ""
 msgid "SearchCodeResults|of %{link_to_project}"
 msgstr ""
-msgid "SearchResults|Showing %{count} %{scope} for \"%{term}\""
+msgid "SearchResults|Showing %{count} %{scope} for%{term_element}"
 msgstr ""
-msgid "SearchResults|Showing %{count} %{scope} for \"%{term}\" in your personal and project snippets"
+msgid "SearchResults|Showing %{count} %{scope} for%{term_element} in your personal and project snippets"
 msgstr ""
-msgid "SearchResults|Showing %{from} - %{to} of %{count} %{scope} for \"%{term}\""
+msgid "SearchResults|Showing %{from} - %{to} of %{count} %{scope} for%{term_element}"
 msgstr ""
-msgid "SearchResults|Showing %{from} - %{to} of %{count} %{scope} for \"%{term}\" in your personal and project snippets"
+msgid "SearchResults|Showing %{from} - %{to} of %{count} %{scope} for%{term_element} in your personal and project snippets"
 msgstr ""
 msgid "SearchResults|We couldn't find any %{scope} matching %{term}"
@@ -16963,6 +16966,9 @@ msgstr ""
 msgid "Subtracts"
 msgstr ""
+msgid "Succeeded"
+msgstr ""
+
 msgid "Successfully activated"
 msgstr ""
@@ -18760,6 +18766,9 @@ msgstr ""
 msgid "Unable to load the diff. %{button_try_again}"
 msgstr ""
+msgid "Unable to load the merge request widget. Try reloading the page."
+msgstr ""
+
 msgid "Unable to resolve"
 msgstr ""

spec/controllers/projects/merge_requests_controller_spec.rb

@@ -1073,7 +1073,7 @@ describe Projects::MergeRequestsController do
     end
     it 'renders MergeRequest as JSON' do
-      expect(json_response.keys).to include('id', 'iid', 'description')
+      expect(json_response.keys).to include('id', 'iid')
     end
   end
@@ -1107,7 +1107,7 @@ describe Projects::MergeRequestsController do
     it 'renders MergeRequest as JSON' do
       subject
-      expect(json_response.keys).to include('id', 'iid', 'description')
+      expect(json_response.keys).to include('id', 'iid')
     end
   end

spec/features/projects/pipelines/pipelines_spec.rb

@@ -706,7 +706,7 @@ describe 'Pipelines', :js do
             click_on 'Run Pipeline'
           end
-          it { expect(page).to have_content('Missing .gitlab-ci.yml file') }
+          it { expect(page).to have_content('Missing CI config file') }
           it 'creates a pipeline after first request failed and a valid gitlab-ci.yml file is available when trying again' do
             click_button project.default_branch

spec/features/projects/wiki/markdown_preview_spec.rb

@@ -29,11 +29,11 @@ describe 'Projects > Wiki > User previews markdown changes', :js do
         expect(page).to have_content("regular link")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/regular\">regular link</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a/b/relative\">relative link 1</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a/b/c/relative\">relative link 2</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a/b/c/e/f/relative\">relative link 3</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/title%20with%20spaces\">spaced link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a/b/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a/b/c/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a/b/c/e/f/relative\">relative link 3</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/title%20with%20spaces\">spaced link</a>")
       end
     end
@@ -43,11 +43,11 @@ describe 'Projects > Wiki > User previews markdown changes', :js do
         expect(page).to have_content("regular link")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/regular\">regular link</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/relative\">relative link 1</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/title%20with%20spaces\">spaced link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/title%20with%20spaces\">spaced link</a>")
       end
     end
@@ -57,11 +57,11 @@ describe 'Projects > Wiki > User previews markdown changes', :js do
         expect(page).to have_content("regular link")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/regular\">regular link</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/relative\">relative link 1</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/title%20with%20spaces\">spaced link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/title%20with%20spaces\">spaced link</a>")
       end
     end
   end
@@ -77,11 +77,11 @@ describe 'Projects > Wiki > User previews markdown changes', :js do
         expect(page).to have_content("regular link")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/regular\">regular link</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a/b/relative\">relative link 1</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a/b/c/relative\">relative link 2</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a/b/c/e/f/relative\">relative link 3</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/title%20with%20spaces\">spaced link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a/b/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a/b/c/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a/b/c/e/f/relative\">relative link 3</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/title%20with%20spaces\">spaced link</a>")
       end
     end
@@ -95,11 +95,11 @@ describe 'Projects > Wiki > User previews markdown changes', :js do
         expect(page).to have_content("regular link")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/regular\">regular link</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/relative\">relative link 1</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/title%20with%20spaces\">spaced link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/title%20with%20spaces\">spaced link</a>")
       end
     end
@@ -113,11 +113,11 @@ describe 'Projects > Wiki > User previews markdown changes', :js do
         expect(page).to have_content("regular link")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/regular\">regular link</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/relative\">relative link 1</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
-        expect(page.html).to include("<a href=\"/#{project.full_path}/wikis/title%20with%20spaces\">spaced link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/regular\">regular link</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/relative\">relative link 1</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/c-page/relative\">relative link 2</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/a-page/b-page/c-page/e/f/relative\">relative link 3</a>")
+        expect(page.html).to include("<a href=\"/#{project.full_path}/-/wikis/title%20with%20spaces\">spaced link</a>")
       end
     end

spec/features/projects/wiki/user_creates_wiki_page_spec.rb

@@ -55,7 +55,7 @@ describe "User creates wiki page" do
         end
         expect(current_path).to include("one/two/three-test")
-        expect(page).to have_xpath("//a[@href='/#{project.full_path}/wikis/one/two/three-test']")
+        expect(page).to have_xpath("//a[@href='/#{project.full_path}/-/wikis/one/two/three-test']")
       end
       it "has `Create home` as a commit message", :js do

spec/frontend/boards/services/board_service_spec.js → spec/frontend/boards/boards_store_spec.js

-import BoardService from '~/boards/services/board_service';
 import { TEST_HOST } from 'helpers/test_constants';
 import AxiosMockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import boardsStore from '~/boards/stores/boards_store';
-describe('BoardService', () => {
+describe('boardsStore', () => {
   const dummyResponse = "without type checking this doesn't matter";
   const boardId = 'dummy-board-id';
   const endpoints = {
@@ -14,7 +13,6 @@ describe('BoardService', () => {
     recentBoardsEndpoint: `${TEST_HOST}/recent/boards`,
   };
-  let service;
   let axiosMock;
   beforeEach(() => {
@@ -23,7 +21,6 @@ describe('BoardService', () => {
       ...endpoints,
       boardId,
     });
-    service = new BoardService();
   });
   describe('all', () => {
@@ -31,13 +28,13 @@ describe('BoardService', () => {
       axiosMock.onGet(endpoints.listsEndpoint).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.all()).resolves.toEqual(expectedResponse);
+      return expect(boardsStore.all()).resolves.toEqual(expectedResponse);
     });
     it('fails for error response', () => {
       axiosMock.onGet(endpoints.listsEndpoint).replyOnce(500);
-      return expect(service.all()).rejects.toThrow();
+      return expect(boardsStore.all()).rejects.toThrow();
     });
   });
@@ -48,13 +45,13 @@ describe('BoardService', () => {
       axiosMock.onPost(listsEndpointGenerate).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.generateDefaultLists()).resolves.toEqual(expectedResponse);
+      return expect(boardsStore.generateDefaultLists()).resolves.toEqual(expectedResponse);
     });
     it('fails for error response', () => {
       axiosMock.onPost(listsEndpointGenerate).replyOnce(500);
-      return expect(service.generateDefaultLists()).rejects.toThrow();
+      return expect(boardsStore.generateDefaultLists()).rejects.toThrow();
     });
   });
@@ -76,7 +73,7 @@ describe('BoardService', () => {
       requestSpy.mockReturnValue([200, dummyResponse]);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.createList(entityId, entityType))
+      return expect(boardsStore.createList(entityId, entityType))
         .resolves.toEqual(expectedResponse)
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -86,7 +83,7 @@ describe('BoardService', () => {
     it('fails for error response', () => {
       requestSpy.mockReturnValue([500]);
-      return expect(service.createList(entityId, entityType))
+      return expect(boardsStore.createList(entityId, entityType))
         .rejects.toThrow()
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -113,7 +110,7 @@ describe('BoardService', () => {
       requestSpy.mockReturnValue([200, dummyResponse]);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.updateList(id, position, collapsed))
+      return expect(boardsStore.updateList(id, position, collapsed))
         .resolves.toEqual(expectedResponse)
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -123,7 +120,7 @@ describe('BoardService', () => {
     it('fails for error response', () => {
       requestSpy.mockReturnValue([500]);
-      return expect(service.updateList(id, position, collapsed))
+      return expect(boardsStore.updateList(id, position, collapsed))
         .rejects.toThrow()
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -147,7 +144,7 @@ describe('BoardService', () => {
       requestSpy.mockReturnValue([200, dummyResponse]);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.destroyList(id))
+      return expect(boardsStore.destroyList(id))
         .resolves.toEqual(expectedResponse)
         .then(() => {
           expect(requestSpy).toHaveBeenCalled();
@@ -157,7 +154,7 @@ describe('BoardService', () => {
     it('fails for error response', () => {
       requestSpy.mockReturnValue([500]);
-      return expect(service.destroyList(id))
+      return expect(boardsStore.destroyList(id))
         .rejects.toThrow()
         .then(() => {
           expect(requestSpy).toHaveBeenCalled();
@@ -173,7 +170,7 @@ describe('BoardService', () => {
       axiosMock.onGet(url).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.getIssuesForList(id)).resolves.toEqual(expectedResponse);
+      return expect(boardsStore.getIssuesForList(id)).resolves.toEqual(expectedResponse);
     });
     it('makes a request to fetch list issues with filter', () => {
@@ -181,13 +178,13 @@ describe('BoardService', () => {
       axiosMock.onGet(`${url}&algal=scrubber`).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.getIssuesForList(id, filter)).resolves.toEqual(expectedResponse);
+      return expect(boardsStore.getIssuesForList(id, filter)).resolves.toEqual(expectedResponse);
     });
     it('fails for error response', () => {
       axiosMock.onGet(url).replyOnce(500);
-      return expect(service.getIssuesForList(id)).rejects.toThrow();
+      return expect(boardsStore.getIssuesForList(id)).rejects.toThrow();
     });
   });
@@ -228,7 +225,7 @@ describe('BoardService', () => {
       requestSpy.mockReturnValue([200, dummyResponse]);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.moveIssue(id, fromListId, toListId, moveBeforeId, moveAfterId))
+      return expect(boardsStore.moveIssue(id, fromListId, toListId, moveBeforeId, moveAfterId))
         .resolves.toEqual(expectedResponse)
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -238,7 +235,7 @@ describe('BoardService', () => {
     it('fails for error response', () => {
       requestSpy.mockReturnValue([500]);
-      return expect(service.moveIssue(id, fromListId, toListId, moveBeforeId, moveAfterId))
+      return expect(boardsStore.moveIssue(id, fromListId, toListId, moveBeforeId, moveAfterId))
         .rejects.toThrow()
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -267,7 +264,7 @@ describe('BoardService', () => {
       requestSpy.mockReturnValue([200, dummyResponse]);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.newIssue(id, issue))
+      return expect(boardsStore.newIssue(id, issue))
         .resolves.toEqual(expectedResponse)
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -277,7 +274,7 @@ describe('BoardService', () => {
     it('fails for error response', () => {
       requestSpy.mockReturnValue([500]);
-      return expect(service.newIssue(id, issue))
+      return expect(boardsStore.newIssue(id, issue))
         .rejects.toThrow()
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -304,13 +301,13 @@ describe('BoardService', () => {
       axiosMock.onGet(url).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.getBacklog(requestParams)).resolves.toEqual(expectedResponse);
+      return expect(boardsStore.getBacklog(requestParams)).resolves.toEqual(expectedResponse);
     });
     it('fails for error response', () => {
       axiosMock.onGet(url).replyOnce(500);
-      return expect(service.getBacklog(requestParams)).rejects.toThrow();
+      return expect(boardsStore.getBacklog(requestParams)).rejects.toThrow();
     });
   });
@@ -337,7 +334,7 @@ describe('BoardService', () => {
       requestSpy.mockReturnValue([200, dummyResponse]);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.bulkUpdate(issueIds, extraData))
+      return expect(boardsStore.bulkUpdate(issueIds, extraData))
         .resolves.toEqual(expectedResponse)
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -347,7 +344,7 @@ describe('BoardService', () => {
     it('fails for error response', () => {
       requestSpy.mockReturnValue([500]);
-      return expect(service.bulkUpdate(issueIds, extraData))
+      return expect(boardsStore.bulkUpdate(issueIds, extraData))
         .rejects.toThrow()
         .then(() => {
           expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -362,13 +359,13 @@ describe('BoardService', () => {
       axiosMock.onGet(dummyEndpoint).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(BoardService.getIssueInfo(dummyEndpoint)).resolves.toEqual(expectedResponse);
+      return expect(boardsStore.getIssueInfo(dummyEndpoint)).resolves.toEqual(expectedResponse);
     });
     it('fails for error response', () => {
       axiosMock.onGet(dummyEndpoint).replyOnce(500);
-      return expect(BoardService.getIssueInfo(dummyEndpoint)).rejects.toThrow();
+      return expect(boardsStore.getIssueInfo(dummyEndpoint)).rejects.toThrow();
     });
   });
@@ -379,7 +376,7 @@ describe('BoardService', () => {
       axiosMock.onPost(dummyEndpoint).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(BoardService.toggleIssueSubscription(dummyEndpoint)).resolves.toEqual(
+      return expect(boardsStore.toggleIssueSubscription(dummyEndpoint)).resolves.toEqual(
         expectedResponse,
       );
     });
@@ -387,7 +384,7 @@ describe('BoardService', () => {
     it('fails for error response', () => {
       axiosMock.onPost(dummyEndpoint).replyOnce(500);
-      return expect(BoardService.toggleIssueSubscription(dummyEndpoint)).rejects.toThrow();
+      return expect(boardsStore.toggleIssueSubscription(dummyEndpoint)).rejects.toThrow();
     });
   });
@@ -398,13 +395,13 @@ describe('BoardService', () => {
       axiosMock.onGet(url).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.allBoards()).resolves.toEqual(expectedResponse);
+      return expect(boardsStore.allBoards()).resolves.toEqual(expectedResponse);
     });
     it('fails for error response', () => {
       axiosMock.onGet(url).replyOnce(500);
-      return expect(service.allBoards()).rejects.toThrow();
+      return expect(boardsStore.allBoards()).rejects.toThrow();
     });
   });
@@ -415,13 +412,13 @@ describe('BoardService', () => {
       axiosMock.onGet(url).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.recentBoards()).resolves.toEqual(expectedResponse);
+      return expect(boardsStore.recentBoards()).resolves.toEqual(expectedResponse);
     });
     it('fails for error response', () => {
       axiosMock.onGet(url).replyOnce(500);
-      return expect(service.recentBoards()).rejects.toThrow();
+      return expect(boardsStore.recentBoards()).rejects.toThrow();
     });
   });
@@ -462,7 +459,7 @@ describe('BoardService', () => {
         const expectedResponse = expect.objectContaining({ data: dummyResponse });
         return expect(
-          service.createBoard({
+          boardsStore.createBoard({
             ...board,
             id,
           }),
@@ -477,7 +474,7 @@ describe('BoardService', () => {
         requestSpy.mockReturnValue([500]);
         return expect(
-          service.createBoard({
+          boardsStore.createBoard({
             ...board,
             id,
           }),
@@ -513,7 +510,7 @@ describe('BoardService', () => {
         requestSpy.mockReturnValue([200, dummyResponse]);
         const expectedResponse = expect.objectContaining({ data: dummyResponse });
-        return expect(service.createBoard(board))
+        return expect(boardsStore.createBoard(board))
           .resolves.toEqual(expectedResponse)
           .then(() => {
             expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -523,7 +520,7 @@ describe('BoardService', () => {
       it('fails for error response', () => {
         requestSpy.mockReturnValue([500]);
-        return expect(service.createBoard(board))
+        return expect(boardsStore.createBoard(board))
           .rejects.toThrow()
           .then(() => {
             expect(requestSpy).toHaveBeenCalledWith(expectedRequest);
@@ -540,13 +537,13 @@ describe('BoardService', () => {
       axiosMock.onDelete(url).replyOnce(200, dummyResponse);
       const expectedResponse = expect.objectContaining({ data: dummyResponse });
-      return expect(service.deleteBoard({ id })).resolves.toEqual(expectedResponse);
+      return expect(boardsStore.deleteBoard({ id })).resolves.toEqual(expectedResponse);
     });
     it('fails for error response', () => {
       axiosMock.onDelete(url).replyOnce(500);
-      return expect(service.deleteBoard({ id })).rejects.toThrow();
+      return expect(boardsStore.deleteBoard({ id })).rejects.toThrow();
     });
   });
 });

spec/frontend/gfm_auto_complete_spec.js

 /* eslint no-param-reassign: "off" */
 import $ from 'jquery';
-import { membersBeforeSave } from '~/gfm_auto_complete';
-import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete';
+import GfmAutoComplete, { membersBeforeSave } from 'ee_else_ce/gfm_auto_complete';
 import 'jquery.caret';
 import 'at.js';

spec/frontend/notes/components/note_app_spec.js

 import $ from 'helpers/jquery';
 import AxiosMockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
 import Vue from 'vue';
 import { mount, createLocalVue } from '@vue/test-utils';
+import { setTestTimeout } from 'helpers/timeout';
+import axios from '~/lib/utils/axios_utils';
 import NotesApp from '~/notes/components/notes_app.vue';
 import service from '~/notes/services/notes_service';
 import createStore from '~/notes/stores';
 import '~/behaviors/markdown/render_gfm';
-import { setTestTimeout } from 'helpers/timeout';
 // TODO: use generated fixture (https://gitlab.com/gitlab-org/gitlab-foss/issues/62491)
 import * as mockData from '../../notes/mock_data';
 import * as urlUtility from '~/lib/utils/url_utility';
@@ -77,6 +77,8 @@ describe('note_app', () => {
   describe('set data', () => {
     beforeEach(() => {
+      setFixtures('<div class="js-discussions-count"></div>');
+
       axiosMock.onAny().reply(200, []);
       wrapper = mountComponent();
       return waitForDiscussionsRequest();
@@ -97,6 +99,10 @@ describe('note_app', () => {
     it('should fetch discussions', () => {
       expect(store.state.discussions).toEqual([]);
     });
+
+    it('updates discussions badge', () => {
+      expect(document.querySelector('.js-discussions-count').textContent).toEqual('0');
+    });
   });
   describe('render', () => {
@@ -161,6 +167,7 @@ describe('note_app', () => {
   describe('while fetching data', () => {
     beforeEach(() => {
+      setFixtures('<div class="js-discussions-count"></div>');
       axiosMock.onAny().reply(200, []);
       wrapper = mountComponent();
     });
@@ -177,6 +184,10 @@ describe('note_app', () => {
         'Write a comment or drag your files here…',
       );
     });
+
+    it('should not update discussions badge (it should be blank)', () => {
+      expect(document.querySelector('.js-discussions-count').textContent).toEqual('');
+    });
   });
   describe('update note', () => {

spec/helpers/search_helper_spec.rb

@@ -122,13 +122,13 @@ describe SearchHelper do
       it 'uses the correct singular label' do
         collection = Kaminari.paginate_array([:foo]).page(1).per(10)
-        expect(search_entries_info(collection, scope, 'foo')).to eq("Showing 1 #{label} for \"foo\"")
+        expect(search_entries_info(collection, scope, 'foo')).to eq("Showing 1 #{label} for<span>&nbsp;<code>foo</code>&nbsp;</span>")
       end
       it 'uses the correct plural label' do
         collection = Kaminari.paginate_array([:foo] * 23).page(1).per(10)
-        expect(search_entries_info(collection, scope, 'foo')).to eq("Showing 1 - 10 of 23 #{label.pluralize} for \"foo\"")
+        expect(search_entries_info(collection, scope, 'foo')).to eq("Showing 1 - 10 of 23 #{label.pluralize} for<span>&nbsp;<code>foo</code>&nbsp;</span>")
       end
     end

spec/helpers/wiki_helper_spec.rb

@@ -27,7 +27,7 @@ describe WikiHelper do
     let(:classes) { "btn btn-default has-tooltip reverse-sort-btn qa-reverse-sort rspec-reverse-sort" }
     def expected_link(sort, direction, icon_class)
-      path = "/#{project.full_path}/wikis/pages?direction=#{direction}&sort=#{sort}"
+      path = "/#{project.full_path}/-/wikis/pages?direction=#{direction}&sort=#{sort}"
       helper.link_to(path, type: 'button', class: classes, title: 'Sort direction') do
         helper.sprite_icon("sort-#{icon_class}", size: 16)

spec/javascripts/boards/boards_store_spec.js

@@ -8,7 +8,6 @@ import '~/boards/models/label';
 import '~/boards/models/assignee';
 import '~/boards/models/issue';
 import '~/boards/models/list';
-import '~/boards/services/board_service';
 import boardsStore from '~/boards/stores/boards_store';
 import eventHub from '~/boards/eventhub';
 import { listObj, listObjDuplicate, boardsMockInterceptor } from './mock_data';

spec/javascripts/boards/issue_spec.js

@@ -5,7 +5,6 @@ import '~/boards/models/label';
 import '~/boards/models/assignee';
 import '~/boards/models/issue';
 import '~/boards/models/list';
-import '~/boards/services/board_service';
 import boardsStore from '~/boards/stores/boards_store';
 import { setMockEndpoints } from './mock_data';

spec/javascripts/boards/list_spec.js

@@ -10,7 +10,6 @@ import '~/boards/models/label';
 import '~/boards/models/assignee';
 import '~/boards/models/issue';
 import '~/boards/models/list';
-import '~/boards/services/board_service';
 import boardsStore from '~/boards/stores/boards_store';
 import { listObj, listObjDuplicate, boardsMockInterceptor } from './mock_data';

spec/javascripts/vue_mr_widget/mock_data.js

@@ -222,6 +222,7 @@ export default {
   plain_diff_path: '/root/acets-app/merge_requests/22.diff',
   merge_request_basic_path: '/root/acets-app/merge_requests/22.json?serializer=basic',
   merge_request_widget_path: '/root/acets-app/merge_requests/22/widget.json',
+  merge_request_cached_widget_path: '/cached.json',
   merge_check_path: '/root/acets-app/merge_requests/22/merge_check',
   ci_environments_status_url: '/root/acets-app/merge_requests/22/ci_environments_status',
   project_archived: false,

spec/javascripts/vue_mr_widget/mr_widget_options_spec.js

 import Vue from 'vue';
+import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
 import mrWidgetOptions from '~/vue_merge_request_widget/mr_widget_options.vue';
 import eventHub from '~/vue_merge_request_widget/event_hub';
 import notify from '~/lib/utils/notify';
@@ -17,6 +19,7 @@ const returnPromise = data =>
 describe('mrWidgetOptions', () => {
   let vm;
+  let mock;
   let MrWidgetOptions;
   const COLLABORATION_MESSAGE = 'Allows commits from members who can merge to the target branch';
@@ -25,6 +28,13 @@ describe('mrWidgetOptions', () => {
     // Prevent component mounting
     delete mrWidgetOptions.el;
+    gl.mrWidgetData = { ...mockData };
+    gon.features = { asyncMrWidget: true };
+
+    mock = new MockAdapter(axios);
+    mock.onGet(mockData.merge_request_widget_path).reply(() => [200, { ...mockData }]);
+    mock.onGet(mockData.merge_request_cached_widget_path).reply(() => [200, { ...mockData }]);
+
     MrWidgetOptions = Vue.extend(mrWidgetOptions);
     vm = mountComponent(MrWidgetOptions, {
       mrData: { ...mockData },
@@ -33,6 +43,9 @@ describe('mrWidgetOptions', () => {
   afterEach(() => {
     vm.$destroy();
+    mock.restore();
+    gl.mrWidgetData = {};
+    gon.features = {};
   });
   describe('data', () => {
@@ -308,59 +321,61 @@ describe('mrWidgetOptions', () => {
     });
     describe('bindEventHubListeners', () => {
-      it('should bind eventHub listeners', () => {
+      it('should bind eventHub listeners', done => {
         spyOn(vm, 'checkStatus').and.returnValue(() => {});
         spyOn(vm.service, 'checkStatus').and.returnValue(returnPromise(mockData));
         spyOn(vm, 'fetchActionsContent');
         spyOn(vm.mr, 'setData');
         spyOn(vm, 'resumePolling');
         spyOn(vm, 'stopPolling');
-        spyOn(eventHub, '$on');
-        vm.bindEventHubListeners();
-        eventHub.$emit('SetBranchRemoveFlag', ['flag']);
-        expect(vm.mr.isRemovingSourceBranch).toEqual('flag');
-        eventHub.$emit('FailedToMerge');
-        expect(vm.mr.state).toEqual('failedToMerge');
-        eventHub.$emit('UpdateWidgetData', mockData);
-        expect(vm.mr.setData).toHaveBeenCalledWith(mockData);
-        eventHub.$emit('EnablePolling');
-        expect(vm.resumePolling).toHaveBeenCalled();
-        eventHub.$emit('DisablePolling');
-        expect(vm.stopPolling).toHaveBeenCalled();
-        const listenersWithServiceRequest = {
-          MRWidgetUpdateRequested: true,
-          FetchActionsContent: true,
-        };
-        const allArgs = eventHub.$on.calls.allArgs();
-        allArgs.forEach(params => {
-          const eventName = params[0];
-          const callback = params[1];
-          if (listenersWithServiceRequest[eventName]) {
-            listenersWithServiceRequest[eventName] = callback;
-          }
-        });
-        listenersWithServiceRequest.MRWidgetUpdateRequested();
-        expect(vm.checkStatus).toHaveBeenCalled();
-        listenersWithServiceRequest.FetchActionsContent();
-        expect(vm.fetchActionsContent).toHaveBeenCalled();
+        spyOn(eventHub, '$on').and.callThrough();
+        setTimeout(() => {
+          eventHub.$emit('SetBranchRemoveFlag', ['flag']);
+          expect(vm.mr.isRemovingSourceBranch).toEqual('flag');
+          eventHub.$emit('FailedToMerge');
+          expect(vm.mr.state).toEqual('failedToMerge');
+          eventHub.$emit('UpdateWidgetData', mockData);
+          expect(vm.mr.setData).toHaveBeenCalledWith(mockData);
+          eventHub.$emit('EnablePolling');
+          expect(vm.resumePolling).toHaveBeenCalled();
+          eventHub.$emit('DisablePolling');
+          expect(vm.stopPolling).toHaveBeenCalled();
+          const listenersWithServiceRequest = {
+            MRWidgetUpdateRequested: true,
+            FetchActionsContent: true,
+          };
+          const allArgs = eventHub.$on.calls.allArgs();
+          allArgs.forEach(params => {
+            const eventName = params[0];
+            const callback = params[1];
+            if (listenersWithServiceRequest[eventName]) {
+              listenersWithServiceRequest[eventName] = callback;
+            }
+          });
+          listenersWithServiceRequest.MRWidgetUpdateRequested();
+          expect(vm.checkStatus).toHaveBeenCalled();
+          listenersWithServiceRequest.FetchActionsContent();
+          expect(vm.fetchActionsContent).toHaveBeenCalled();
+          done();
+        });
       });
     });
@@ -451,22 +466,30 @@ describe('mrWidgetOptions', () => {
     });
     describe('resumePolling', () => {
-      it('should call stopTimer on pollingInterval', () => {
-        spyOn(vm.pollingInterval, 'resume');
-        vm.resumePolling();
-        expect(vm.pollingInterval.resume).toHaveBeenCalled();
+      it('should call stopTimer on pollingInterval', done => {
+        setTimeout(() => {
+          spyOn(vm.pollingInterval, 'resume');
+
+          vm.resumePolling();
+          expect(vm.pollingInterval.resume).toHaveBeenCalled();
+          done();
+        });
       });
     });
     describe('stopPolling', () => {
-      it('should call stopTimer on pollingInterval', () => {
-        spyOn(vm.pollingInterval, 'stopTimer');
-        vm.stopPolling();
-        expect(vm.pollingInterval.stopTimer).toHaveBeenCalled();
+      it('should call stopTimer on pollingInterval', done => {
+        setTimeout(() => {
+          spyOn(vm.pollingInterval, 'stopTimer');
+
+          vm.stopPolling();
+          expect(vm.pollingInterval.stopTimer).toHaveBeenCalled();
+          done();
+        });
       });
     });
   });

spec/lib/banzai/pipeline/wiki_pipeline_spec.rb

@@ -72,14 +72,14 @@ describe Banzai::Pipeline::WikiPipeline do
               markdown = "[Page](./page)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/page\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/page\"")
             end
             it "rewrites file links to be at the scope of the current directory" do
               markdown = "[Link to Page](./page.md)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/page.md\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/page.md\"")
             end
           end
@@ -88,14 +88,14 @@ describe Banzai::Pipeline::WikiPipeline do
               markdown = "[Link to Page](../page)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/page\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/page\"")
             end
             it "rewrites file links to be at the scope of the parent directory" do
               markdown = "[Link to Page](../page.md)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/page.md\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/page.md\"")
             end
           end
@@ -104,14 +104,14 @@ describe Banzai::Pipeline::WikiPipeline do
               markdown = "[Link to Page](./subdirectory/page)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/subdirectory/page\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/subdirectory/page\"")
             end
             it "rewrites file links to be at the scope of the sub-directory" do
               markdown = "[Link to Page](./subdirectory/page.md)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/subdirectory/page.md\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/subdirectory/page.md\"")
             end
           end
@@ -120,35 +120,35 @@ describe Banzai::Pipeline::WikiPipeline do
               markdown = "[Link to Page](page)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/page\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page\"")
             end
             it 'rewrites non-file links (with spaces) to be at the scope of the wiki root' do
               markdown = "[Link to Page](page slug)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/page%20slug\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page%20slug\"")
             end
             it "rewrites file links to be at the scope of the current directory" do
               markdown = "[Link to Page](page.md)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/nested/twice/page.md\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/page.md\"")
             end
             it 'rewrites links with anchor' do
               markdown = '[Link to Header](start-page#title)'
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/start-page#title\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/start-page#title\"")
             end
             it 'rewrites links (with spaces) with anchor' do
               markdown = '[Link to Header](start page#title)'
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/start%20page#title\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/start%20page#title\"")
             end
           end
@@ -157,14 +157,14 @@ describe Banzai::Pipeline::WikiPipeline do
               markdown = "[Link to Page](/page)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/page\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page\"")
             end
             it 'rewrites file links to be at the scope of the wiki root' do
               markdown = "[Link to Page](/page.md)"
               output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/wikis/page.md\"")
+              expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page.md\"")
             end
           end
         end
@@ -270,28 +270,28 @@ describe Banzai::Pipeline::WikiPipeline do
       markdown = "![video_file](video_file_name.mp4)"
       output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-      expect(output).to include('<video src="/wiki_link_ns/wiki_link_project/wikis/nested/twice/video_file_name.mp4"')
+      expect(output).to include('<video src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/video_file_name.mp4"')
     end
     it 'rewrites and replaces video links names with white spaces to %20' do
       markdown = "![video file](video file name.mp4)"
       output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-      expect(output).to include('<video src="/wiki_link_ns/wiki_link_project/wikis/nested/twice/video%20file%20name.mp4"')
+      expect(output).to include('<video src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/video%20file%20name.mp4"')
     end
     it 'generates audio html structure' do
       markdown = "![audio_file](audio_file_name.wav)"
       output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-      expect(output).to include('<audio src="/wiki_link_ns/wiki_link_project/wikis/nested/twice/audio_file_name.wav"')
+      expect(output).to include('<audio src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/audio_file_name.wav"')
     end
     it 'rewrites and replaces audio links names with white spaces to %20' do
       markdown = "![audio file](audio file name.wav)"
       output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
-      expect(output).to include('<audio src="/wiki_link_ns/wiki_link_project/wikis/nested/twice/audio%20file%20name.wav"')
+      expect(output).to include('<audio src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/audio%20file%20name.wav"')
     end
   end
 end

spec/lib/gitlab/chat/command_spec.rb

@@ -44,7 +44,7 @@ describe Gitlab::Chat::Command do
     let(:pipeline) { command.create_pipeline }
     before do
-      stub_repository_ci_yaml_file(sha: project.commit.id)
+      stub_ci_pipeline_yaml_file(gitlab_ci_yaml)
       project.add_developer(chat_name.user)
     end

spec/lib/gitlab/ci/pipeline/chain/build_spec.rb

@@ -30,7 +30,7 @@ describe Gitlab::Ci::Pipeline::Chain::Build do
   let(:step) { described_class.new(pipeline, command) }
   before do
-    stub_repository_ci_yaml_file(sha: anything)
+    stub_ci_pipeline_yaml_file(gitlab_ci_yaml)
   end
   it 'never breaks the chain' do