Add latest changes from gitlab-org/gitlab@master

spec/javascripts/vue_mr_widget/components/review_app_link_spec.js

@@ -8,6 +8,7 @@ describe('review app link', () => {
   const props = {
     link: '/review',
     cssClass: 'js-link',
+    isCurrent: true,
   };
   let vm;
   let el;

spec/javascripts/vue_mr_widget/mock_data.js

+import { SUCCESS } from '~/vue_merge_request_widget/components/deployment/constants';
+
 export default {
   id: 132,
   iid: 22,
@@ -290,15 +292,20 @@ export const mockStore = {
       name: 'bogus',
       external_url: 'https://fake.com',
       external_url_formatted: 'https://fake.com',
+      status: SUCCESS,
     },
     {
       id: 1,
       name: 'bogus-docs',
       external_url: 'https://fake.com',
       external_url_formatted: 'https://fake.com',
+      status: SUCCESS,
     },
   ],
-  postMergeDeployments: [{ id: 0, name: 'prod' }, { id: 1, name: 'prod-docs' }],
+  postMergeDeployments: [
+    { id: 0, name: 'prod', status: SUCCESS },
+    { id: 1, name: 'prod-docs', status: SUCCESS },
+  ],
   troubleshootingDocsPath: 'troubleshooting-docs-path',
   ciStatus: 'ci-status',
   hasCI: true,

spec/javascripts/vue_mr_widget/mr_widget_options_spec.js

@@ -6,6 +6,7 @@ import { stateKey } from '~/vue_merge_request_widget/stores/state_maps';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import mockData from './mock_data';
 import { faviconDataUrl, overlayDataUrl } from '../lib/utils/mock_data';
+import { SUCCESS } from '~/vue_merge_request_widget/components/deployment/constants';
 const returnPromise = data =>
   new Promise(resolve => {
@@ -277,7 +278,9 @@ describe('mrWidgetOptions', () => {
     describe('fetchDeployments', () => {
       it('should fetch deployments', done => {
-        spyOn(vm.service, 'fetchDeployments').and.returnValue(returnPromise([{ id: 1 }]));
+        spyOn(vm.service, 'fetchDeployments').and.returnValue(
+          returnPromise([{ id: 1, status: SUCCESS }]),
+        );
         vm.fetchPreMergeDeployments();
@@ -554,7 +557,7 @@ describe('mrWidgetOptions', () => {
       deployed_at: '2017-03-22T22:44:42.258Z',
       deployed_at_formatted: 'Mar 22, 2017 10:44pm',
       changes,
-      status: 'success',
+      status: SUCCESS,
     };
     beforeEach(done => {

spec/lib/api/entities/release_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe API::Entities::Release do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:release) { create(:release, :with_evidence, project: project) }
+  let(:user) { create(:user) }
+  let(:entity) { described_class.new(release, current_user: user) }
+
+  subject { entity.as_json }
+
+  describe 'evidence' do
+    context 'when the current user can download code' do
+      it 'exposes the evidence sha and the json path' do
+        allow(Ability).to receive(:allowed?).and_call_original
+        allow(Ability).to receive(:allowed?)
+          .with(user, :download_code, project).and_return(true)
+
+        expect(subject[:evidence_sha]).to eq(release.evidence_sha)
+        expect(subject[:assets][:evidence_file_path]).to eq(
+          Gitlab::Routing.url_helpers.evidence_project_release_url(project,
+                                                                   release.tag,
+                                                                   format: :json)
+        )
+      end
+    end
+
+    context 'when the current user cannot download code' do
+      it 'does not expose any evidence data' do
+        allow(Ability).to receive(:allowed?).and_call_original
+        allow(Ability).to receive(:allowed?)
+          .with(user, :download_code, project).and_return(false)
+
+        expect(subject.keys).not_to include(:evidence_sha)
+        expect(subject[:assets].keys).not_to include(:evidence_file_path)
+      end
+    end
+  end
+end

spec/models/ci/build_spec.rb

@@ -4063,4 +4063,54 @@ describe Ci::Build do
       expect(job.invalid_dependencies).to eq([pre_stage_job_invalid])
     end
   end
+
+  describe '#execute_hooks' do
+    context 'with project hooks' do
+      before do
+        create(:project_hook, project: project, job_events: true)
+      end
+
+      it 'execute hooks' do
+        expect_any_instance_of(ProjectHook).to receive(:async_execute)
+
+        build.execute_hooks
+      end
+    end
+
+    context 'without relevant project hooks' do
+      before do
+        create(:project_hook, project: project, job_events: false)
+      end
+
+      it 'does not execute a hook' do
+        expect_any_instance_of(ProjectHook).not_to receive(:async_execute)
+
+        build.execute_hooks
+      end
+    end
+
+    context 'with project services' do
+      before do
+        create(:service, active: true, job_events: true, project: project)
+      end
+
+      it 'execute services' do
+        expect_any_instance_of(Service).to receive(:async_execute)
+
+        build.execute_hooks
+      end
+    end
+
+    context 'without relevant project services' do
+      before do
+        create(:service, active: true, job_events: false, project: project)
+      end
+
+      it 'execute services' do
+        expect_any_instance_of(Service).not_to receive(:async_execute)
+
+        build.execute_hooks
+      end
+    end
+  end
 end

spec/services/cohorts_service_spec.rb

@@ -22,73 +22,73 @@ describe CohortsService do
       expected_cohorts = [
         {
           registration_month: month_start(11),
-          activity_months: Array.new(12) { { total: 0, percentage: 0 } },
+          activity_months: Array.new(11) { { total: 0, percentage: 0 } },
           total: 0,
           inactive: 0
         },
         {
           registration_month: month_start(10),
-          activity_months: [{ total: 2, percentage: 100 }] + Array.new(10) { { total: 1, percentage: 50 } },
+          activity_months: Array.new(10) { { total: 1, percentage: 50 } },
           total: 2,
           inactive: 0
         },
         {
           registration_month: month_start(9),
-          activity_months: Array.new(10) { { total: 0, percentage: 0 } },
+          activity_months: Array.new(9) { { total: 0, percentage: 0 } },
           total: 0,
           inactive: 0
         },
         {
           registration_month: month_start(8),
-          activity_months: [{ total: 2, percentage: 100 }] + Array.new(8) { { total: 1, percentage: 50 } },
+          activity_months: Array.new(8) { { total: 1, percentage: 50 } },
           total: 2,
           inactive: 0
         },
         {
           registration_month: month_start(7),
-          activity_months: Array.new(8) { { total: 0, percentage: 0 } },
+          activity_months: Array.new(7) { { total: 0, percentage: 0 } },
           total: 0,
           inactive: 0
         },
         {
           registration_month: month_start(6),
-          activity_months: [{ total: 2, percentage: 100 }] + Array.new(6) { { total: 1, percentage: 50 } },
+          activity_months: Array.new(6) { { total: 1, percentage: 50 } },
           total: 2,
           inactive: 0
         },
         {
           registration_month: month_start(5),
-          activity_months: Array.new(6) { { total: 0, percentage: 0 } },
+          activity_months: Array.new(5) { { total: 0, percentage: 0 } },
           total: 0,
           inactive: 0
         },
         {
           registration_month: month_start(4),
-          activity_months: [{ total: 2, percentage: 100 }] + Array.new(4) { { total: 1, percentage: 50 } },
+          activity_months: Array.new(4) { { total: 1, percentage: 50 } },
           total: 2,
           inactive: 0
         },
         {
           registration_month: month_start(3),
-          activity_months: Array.new(4) { { total: 0, percentage: 0 } },
+          activity_months: Array.new(3) { { total: 0, percentage: 0 } },
           total: 0,
           inactive: 0
         },
         {
           registration_month: month_start(2),
-          activity_months: [{ total: 2, percentage: 100 }] + Array.new(2) { { total: 1, percentage: 50 } },
+          activity_months: Array.new(2) { { total: 1, percentage: 50 } },
           total: 2,
           inactive: 0
         },
         {
           registration_month: month_start(1),
-          activity_months: Array.new(2) { { total: 0, percentage: 0 } },
+          activity_months: Array.new(1) { { total: 0, percentage: 0 } },
           total: 0,
           inactive: 0
         },
         {
           registration_month: month_start(0),
-          activity_months: [{ total: 2, percentage: 100 }],
+          activity_months: [],
           total: 2,
           inactive: 1
         }