Add latest changes from gitlab-org/gitlab@master

spec/frontend/registry/explorer/stores/mutations_spec.js

@@ -10,8 +10,9 @@ describe('Mutations Registry Explorer Store', () => {
   describe('SET_INITIAL_STATE', () => {
     it('should set the initial state', () => {
-      const expectedState = { ...mockState, config: { endpoint: 'foo' } };
-      mutations[types.SET_INITIAL_STATE](mockState, { endpoint: 'foo' });
+      const payload = { endpoint: 'foo', isGroupPage: true };
+      const expectedState = { ...mockState, config: payload };
+      mutations[types.SET_INITIAL_STATE](mockState, payload);
       expect(mockState).toEqual(expectedState);
     });

spec/frontend/registry/explorer/stubs.js

+export const GlModal = {
+  template: '<div><slot name="modal-title"></slot><slot></slot><slot name="modal-ok"></slot></div>',
+  methods: {
+    show: jest.fn(),
+  },
+};
+
+export const GlEmptyState = {
+  template: '<div><slot name="description"></slot></div>',
+  name: 'GlEmptyStateSTub',
+};

spec/javascripts/flash_spec.js

@@ -40,7 +40,7 @@ describe('Flash', () => {
       expect(el.style['transition-property']).toBe('opacity');
-      expect(el.style['transition-duration']).toBe('0.3s');
+      expect(el.style['transition-duration']).toBe('0.15s');
     });
     it('sets opacity style', () => {

spec/javascripts/ide/components/commit_sidebar/form_spec.js

@@ -52,7 +52,7 @@ describe('IDE commit form', () => {
       vm.$store.state.stagedFiles.push('test');
       vm.$nextTick(() => {
-        expect(vm.$el.querySelector('p').textContent).toContain('1 unstaged and 1 staged changes');
+        expect(vm.$el.querySelector('p').textContent).toContain('1 staged and 1 unstaged changes');
         done();
       });
     });

spec/javascripts/ide/components/file_row_extra_spec.js

@@ -63,7 +63,7 @@ describe('IDE extra file row component', () => {
       stagedFilesCount = 1;
       unstagedFilesCount = 1;
-      expect(vm.folderChangesTooltip).toBe('1 unstaged and 1 staged changes');
+      expect(vm.folderChangesTooltip).toBe('1 staged and 1 unstaged changes');
     });
   });

spec/javascripts/ide/stores/actions_spec.js

@@ -225,35 +225,6 @@ describe('Multi-file store actions', () => {
           .catch(done.fail);
       });
-      describe('when `gon.feature.stageAllByDefault` is true', () => {
-        const originalGonFeatures = Object.assign({}, gon.features);
-
-        beforeAll(() => {
-          gon.features = { stageAllByDefault: true };
-        });
-
-        afterAll(() => {
-          gon.features = originalGonFeatures;
-        });
-
-        it('adds tmp file to staged files', done => {
-          const name = 'test';
-
-          store
-            .dispatch('createTempEntry', {
-              name,
-              branchId: 'mybranch',
-              type: 'blob',
-            })
-            .then(() => {
-              expect(store.state.stagedFiles).toEqual([jasmine.objectContaining({ name })]);
-
-              done();
-            })
-            .catch(done.fail);
-        });
-      });
-
       it('adds tmp file to open files', done => {
         const name = 'test';
@@ -274,7 +245,7 @@ describe('Multi-file store actions', () => {
           .catch(done.fail);
       });
-      it('adds tmp file to changed files', done => {
+      it('adds tmp file to staged files', done => {
         const name = 'test';
         store
@@ -284,9 +255,7 @@ describe('Multi-file store actions', () => {
             type: 'blob',
           })
           .then(() => {
-            expect(store.state.changedFiles).toEqual([
-              jasmine.objectContaining({ name, tempFile: true }),
-            ]);
+            expect(store.state.stagedFiles).toEqual([jasmine.objectContaining({ name })]);
             done();
           })
@@ -294,15 +263,9 @@ describe('Multi-file store actions', () => {
       });
       it('sets tmp file as active', () => {
-        const dispatch = jasmine.createSpy();
-        const commit = jasmine.createSpy();
-
-        createTempEntry(
-          { state: store.state, getters: store.getters, dispatch, commit },
-          { name: 'test', branchId: 'mybranch', type: 'blob' },
-        );
-        expect(dispatch).toHaveBeenCalledWith('setFileActive', 'test');
+        createTempEntry(store, { name: 'test', branchId: 'mybranch', type: 'blob' });
+        expect(store.dispatch).toHaveBeenCalledWith('setFileActive', 'test');
       });
       it('creates flash message if file already exists', done => {
@@ -804,55 +767,19 @@ describe('Multi-file store actions', () => {
         });
       });
-      describe('when `gon.feature.stageAllByDefault` is true', () => {
-        const originalGonFeatures = Object.assign({}, gon.features);
-
-        beforeAll(() => {
-          gon.features = { stageAllByDefault: true };
-        });
-
-        afterAll(() => {
-          gon.features = originalGonFeatures;
-        });
-
-        it('by default renames an entry and stages it', () => {
-          const dispatch = jasmine.createSpy();
-          const commit = jasmine.createSpy();
-
-          renameEntry(
-            { dispatch, commit, state: store.state, getters: store.getters },
-            { path: 'orig', name: 'renamed' },
-          );
-
-          expect(commit.calls.allArgs()).toEqual([
-            [types.RENAME_ENTRY, { path: 'orig', name: 'renamed', parentPath: undefined }],
-            [types.STAGE_CHANGE, jasmine.objectContaining({ path: 'renamed' })],
-          ]);
-        });
-      });
-      it('by default renames an entry and adds to changed', done => {
-        testAction(
-          renameEntry,
+      it('by default renames an entry and stages it', () => {
+        const dispatch = jasmine.createSpy();
+        const commit = jasmine.createSpy();
+        renameEntry(
+          { dispatch, commit, state: store.state, getters: store.getters },
           { path: 'orig', name: 'renamed' },
-          store.state,
-          [
-            {
-              type: types.RENAME_ENTRY,
-              payload: {
-                path: 'orig',
-                name: 'renamed',
-                parentPath: undefined,
-              },
-            },
-            {
-              type: types.ADD_FILE_TO_CHANGED,
-              payload: 'renamed',
-            },
-          ],
-          jasmine.any(Object),
-          done,
         );
+
+        expect(commit.calls.allArgs()).toEqual([
+          [types.RENAME_ENTRY, { path: 'orig', name: 'renamed', parentPath: undefined }],
+          [types.STAGE_CHANGE, jasmine.objectContaining({ path: 'renamed' })],
+        ]);
       });
       it('if not changed, completely unstages and discards entry if renamed to original', done => {

spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js

 import Vue from 'vue';
-import _ from 'underscore';
+import { head } from 'lodash';
 import { GlSearchBoxByType, GlInfiniteScroll } from '@gitlab/ui';
 import { mount, createLocalVue } from '@vue/test-utils';
@@ -99,9 +99,9 @@ describe('ProjectSelector component', () => {
   it(`triggers a "projectClicked" event when a project is clicked`, () => {
     spyOn(vm, '$emit');
-    wrapper.find(ProjectListItem).vm.$emit('click', _.first(searchResults));
-    expect(vm.$emit).toHaveBeenCalledWith('projectClicked', _.first(searchResults));
+    wrapper.find(ProjectListItem).vm.$emit('click', head(searchResults));
+    expect(vm.$emit).toHaveBeenCalledWith('projectClicked', head(searchResults));
   });
   it(`shows a "no results" message if showNoResultsMessage === true`, () => {

spec/lib/gitlab/quick_actions/substitution_definition_spec.rb

@@ -19,11 +19,29 @@ EOF
       expect(subject.perform_substitution(self, nil)).to be_nil
     end
-    it 'performs the substitution by default' do
-      expect(subject.perform_substitution(self, content)).to eq <<EOF
+    context 'when content contains command name' do
+      it 'performs the substitution by default' do
+        expect(subject.perform_substitution(self, content)).to eq <<EOF
 Hello! Let's do this!
 I like this stuff foo
 EOF
+      end
+    end
+
+    context 'when content contains command name in word' do
+      let(:content) do
+        <<EOF
+Hello! Let's do this!
+`/sub_names` I like this stuff
+EOF
+      end
+
+      it 'does not perform the substitution' do
+        expect(subject.perform_substitution(self, content)).to eq <<EOF
+Hello! Let's do this!
+`/sub_names` I like this stuff
+EOF
+      end
     end
   end
@@ -41,5 +59,9 @@ EOF
     it 'is nil if content does not have the command' do
       expect(subject.match('blah')).to be_falsey
     end
+
+    it 'is nil if content contains the command as prefix' do
+      expect(subject.match('/sub_namex')).to be_falsey
+    end
   end
 end

spec/models/ci/build_spec.rb

@@ -33,7 +33,7 @@ describe Ci::Build do
   it { is_expected.to respond_to(:has_trace?) }
   it { is_expected.to respond_to(:trace) }
-  it { is_expected.to delegate_method(:merge_request_event?).to(:pipeline) }
+  it { is_expected.to delegate_method(:merge_request?).to(:pipeline) }
   it { is_expected.to delegate_method(:merge_request_ref?).to(:pipeline) }
   it { is_expected.to delegate_method(:legacy_detached_merge_request_pipeline?).to(:pipeline) }

spec/models/ci/pipeline_spec.rb

@@ -162,6 +162,23 @@ describe Ci::Pipeline, :mailer do
     end
   end
+  describe '#merge_request?' do
+    let(:pipeline) { create(:ci_pipeline, merge_request: merge_request) }
+    let(:merge_request) { create(:merge_request) }
+
+    it 'returns true' do
+      expect(pipeline).to be_merge_request
+    end
+
+    context 'when merge request is nil' do
+      let(:merge_request) { nil }
+
+      it 'returns false' do
+        expect(pipeline).not_to be_merge_request
+      end
+    end
+  end
+
   describe '#detached_merge_request_pipeline?' do
     subject { pipeline.detached_merge_request_pipeline? }
@@ -367,48 +384,6 @@ describe Ci::Pipeline, :mailer do
     end
   end
-  describe 'Validations for merge request pipelines' do
-    let(:pipeline) do
-      build(:ci_pipeline, source: source, merge_request: merge_request)
-    end
-
-    let(:merge_request) do
-      create(:merge_request,
-        source_project: project,
-        source_branch:  'feature',
-        target_project: project,
-        target_branch:  'master')
-    end
-
-    context 'when source is merge request' do
-      let(:source) { :merge_request_event }
-
-      context 'when merge request is specified' do
-        it { expect(pipeline).to be_valid }
-      end
-
-      context 'when merge request is empty' do
-        let(:merge_request) { nil }
-
-        it { expect(pipeline).not_to be_valid }
-      end
-    end
-
-    context 'when source is web' do
-      let(:source) { :web }
-
-      context 'when merge request is specified' do
-        it { expect(pipeline).not_to be_valid }
-      end
-
-      context 'when merge request is empty' do
-        let(:merge_request) { nil }
-
-        it { expect(pipeline).to be_valid }
-      end
-    end
-  end
-
   describe 'modules' do
     it_behaves_like 'AtomicInternalId', validate_presence: false do
       let(:internal_id_attribute) { :iid }
@@ -612,9 +587,9 @@ describe Ci::Pipeline, :mailer do
       ]
     end
-    context 'when source is merge request' do
+    context 'when pipeline is merge request' do
       let(:pipeline) do
-        create(:ci_pipeline, source: :merge_request_event, merge_request: merge_request)
+        create(:ci_pipeline, merge_request: merge_request)
       end
       let(:merge_request) do
@@ -651,7 +626,7 @@ describe Ci::Pipeline, :mailer do
             'CI_MERGE_REQUEST_TITLE' => merge_request.title,
             'CI_MERGE_REQUEST_ASSIGNEES' => merge_request.assignee_username_list,
             'CI_MERGE_REQUEST_MILESTONE' => milestone.title,
-            'CI_MERGE_REQUEST_LABELS' => labels.map(&:title).join(','),
+            'CI_MERGE_REQUEST_LABELS' => labels.map(&:title).sort.join(','),
             'CI_MERGE_REQUEST_EVENT_TYPE' => pipeline.merge_request_event_type.to_s)
       end
@@ -1263,9 +1238,9 @@ describe Ci::Pipeline, :mailer do
         is_expected.to be_truthy
       end
-      context 'when source is merge request' do
+      context 'when pipeline is merge request' do
         let(:pipeline) do
-          create(:ci_pipeline, source: :merge_request_event, merge_request: merge_request)
+          create(:ci_pipeline, merge_request: merge_request)
         end
         let(:merge_request) do

spec/services/ci/create_cross_project_pipeline_service_spec.rb

@@ -148,6 +148,12 @@ describe Ci::CreateCrossProjectPipelineService, '#execute' do
       end
       context 'when "include" is provided' do
+        let(:file_content) do
+          YAML.dump(
+            rspec: { script: 'rspec' },
+            echo: { script: 'echo' })
+        end
+
         shared_examples 'creates a child pipeline' do
           it 'creates only one new pipeline' do
             expect { service.execute(bridge) }
@@ -189,9 +195,6 @@ describe Ci::CreateCrossProjectPipelineService, '#execute' do
         end
         before do
-          file_content = YAML.dump(
-            rspec: { script: 'rspec' },
-            echo: { script: 'echo' })
           upstream_project.repository.create_file(
             user, 'child-pipeline.yml', file_content, message: 'message', branch_name: 'master')
@@ -218,6 +221,29 @@ describe Ci::CreateCrossProjectPipelineService, '#execute' do
           it_behaves_like 'creates a child pipeline'
         end
+        context 'when the parent is a merge request pipeline' do
+          let(:merge_request) { create(:merge_request, source_project: bridge.project, target_project: bridge.project) }
+          let(:file_content) do
+            YAML.dump(
+              workflow: { rules: [{ if: '$CI_MERGE_REQUEST_ID' }] },
+              rspec: { script: 'rspec' },
+              echo: { script: 'echo' })
+          end
+
+          before do
+            bridge.pipeline.update!(source: :merge_request_event, merge_request: merge_request)
+          end
+
+          it_behaves_like 'creates a child pipeline'
+
+          it 'propagates the merge request to the child pipeline' do
+            pipeline = service.execute(bridge)
+
+            expect(pipeline.merge_request).to eq(merge_request)
+            expect(pipeline).to be_merge_request
+          end
+        end
+
         context 'when upstream pipeline is a child pipeline' do
           let!(:pipeline_source) do
             create(:ci_sources_pipeline,

spec/services/ci/create_pipeline_service_spec.rb

@@ -1473,15 +1473,6 @@ describe Ci::CreatePipelineService do
               end
             end
           end
-
-          context 'when merge request is not specified' do
-            let(:merge_request) { nil }
-
-            it 'does not create a detached merge request pipeline' do
-              expect(pipeline).not_to be_persisted
-              expect(pipeline.errors[:merge_request]).to eq(["can't be blank"])
-            end
-          end
         end
         context "when config does not have merge_requests keywords" do
@@ -1518,17 +1509,6 @@ describe Ci::CreatePipelineService do
                 .to eq(['No stages / jobs for this pipeline.'])
             end
           end
-
-          context 'when merge request is not specified' do
-            let(:merge_request) { nil }
-
-            it 'does not create a detached merge request pipeline' do
-              expect(pipeline).not_to be_persisted
-
-              expect(pipeline.errors[:base])
-                .to eq(['No stages / jobs for this pipeline.'])
-            end
-          end
         end
         context "when config uses regular expression for only keyword" do
@@ -1623,6 +1603,7 @@ describe Ci::CreatePipelineService do
       context 'when source is web' do
         let(:source) { :web }
+        let(:merge_request) { nil }
         context "when config has merge_requests keywords" do
           let(:config) do
@@ -1644,30 +1625,11 @@ describe Ci::CreatePipelineService do
             }
           end
-          context 'when merge request is specified' do
-            let(:merge_request) do
-              create(:merge_request,
-                source_project: project,
-                source_branch: Gitlab::Git.ref_name(ref_name),
-                target_project: project,
-                target_branch: 'master')
-            end
-
-            it 'does not create a merge request pipeline' do
-              expect(pipeline).not_to be_persisted
-              expect(pipeline.errors[:merge_request]).to eq(["must be blank"])
-            end
-          end
-
-          context 'when merge request is not specified' do
-            let(:merge_request) { nil }
-
-            it 'creates a branch pipeline' do
-              expect(pipeline).to be_persisted
-              expect(pipeline).to be_web
-              expect(pipeline.merge_request).to be_nil
-              expect(pipeline.builds.order(:stage_id).pluck(:name)).to eq(%w[build pages])
-            end
+          it 'creates a branch pipeline' do
+            expect(pipeline).to be_persisted
+            expect(pipeline).to be_web
+            expect(pipeline.merge_request).to be_nil
+            expect(pipeline.builds.order(:stage_id).pluck(:name)).to eq(%w[build pages])
           end
         end
       end

spec/support/helpers/kubernetes_helpers.rb

@@ -101,7 +101,7 @@ module KubernetesHelpers
     end
     logs_url = service.api_url + "/api/v1/namespaces/#{namespace}/pods/#{pod_name}" \
-    "/log?#{container_query_param}tailLines=#{Clusters::Platforms::Kubernetes::LOGS_LIMIT}&timestamps=true"
+    "/log?#{container_query_param}tailLines=#{::PodLogs::KubernetesService::LOGS_LIMIT}&timestamps=true"
     if status
       response = { status: status }