Add latest changes from gitlab-org/gitlab@master

11 files changed, 266 insertions, 140 deletions

diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb
index b76d350ebbc..b6c64a964a6 100644
--- a/spec/controllers/projects/services_controller_spec.rb
+++ b/spec/controllers/projects/services_controller_spec.rb
@@ -191,16 +191,81 @@ describe Projects::ServicesController do
         end
       end
     end
+
+    context 'Prometheus service' do
+      let!(:service) { create(:prometheus_service, project: project) }
+      let(:service_params) { { manual_configuration: '1', api_url: 'http://example.com' } }
+
+      context 'feature flag :settings_operations_prometheus_service is enabled' do
+        before do
+          stub_feature_flags(settings_operations_prometheus_service: true)
+        end
+
+        it 'redirects user back to edit page with alert' do
+          put :update, params: project_params.merge(service: service_params)
+
+          expect(response).to redirect_to(edit_project_service_path(project, service))
+          expected_alert = "You can now manage your Prometheus settings on the <a href=\"#{project_settings_operations_path(project)}\">Operations</a> page. Fields on this page has been deprecated."
+
+          expect(response).to set_flash.now[:alert].to(expected_alert)
+        end
+
+        it 'does not modify service' do
+          expect { put :update, params: project_params.merge(service: service_params) }.not_to change { project.prometheus_service.reload.attributes }
+        end
+      end
+
+      context 'feature flag :settings_operations_prometheus_service is disabled' do
+        before do
+          stub_feature_flags(settings_operations_prometheus_service: false)
+        end
+
+        it 'modifies service' do
+          expect { put :update, params: project_params.merge(service: service_params) }.to change { project.prometheus_service.reload.attributes }
+        end
+      end
+    end
   end
 
   describe 'GET #edit' do
-    before do
-      get :edit, params: project_params(id: 'jira')
+    context 'Jira service' do
+      let(:service_param) { 'jira' }
+
+      before do
+        get :edit, params: project_params(id: service_param)
+      end
+
+      context 'with approved services' do
+        it 'renders edit page' do
+          expect(response).to be_successful
+        end
+      end
     end
 
-    context 'with approved services' do
-      it 'renders edit page' do
-        expect(response).to be_successful
+    context 'Prometheus service' do
+      let(:service_param) { 'prometheus' }
+
+      context 'feature flag :settings_operations_prometheus_service is enabled' do
+        before do
+          stub_feature_flags(settings_operations_prometheus_service: true)
+          get :edit, params: project_params(id: service_param)
+        end
+
+        it 'renders deprecation warning notice' do
+          expected_alert = "You can now manage your Prometheus settings on the <a href=\"#{project_settings_operations_path(project)}\">Operations</a> page. Fields on this page has been deprecated."
+          expect(response).to set_flash.now[:alert].to(expected_alert)
+        end
+      end
+
+      context 'feature flag :settings_operations_prometheus_service is disabled' do
+        before do
+          stub_feature_flags(settings_operations_prometheus_service: false)
+          get :edit, params: project_params(id: service_param)
+        end
+
+        it 'does not render deprecation warning notice' do
+          expect(response).not_to set_flash.now[:alert]
+        end
       end
     end
   end
diff --git a/spec/features/admin/admin_browses_logs_spec.rb b/spec/features/admin/admin_browses_logs_spec.rb
index 2b97362c8e9..45e860e1536 100644
--- a/spec/features/admin/admin_browses_logs_spec.rb
+++ b/spec/features/admin/admin_browses_logs_spec.rb
@@ -10,7 +10,7 @@ describe 'Admin browses logs' do
   it 'shows available log files' do
     visit admin_logs_path
 
-    expect(page).to have_link 'application.log'
+    expect(page).to have_link 'application_json.log'
     expect(page).to have_link 'git_json.log'
     expect(page).to have_link 'test.log'
     expect(page).to have_link 'sidekiq.log'
diff --git a/spec/features/projects/services/user_activates_prometheus_spec.rb b/spec/features/projects/services/user_activates_prometheus_spec.rb
index a83d3e2e8be..ab372d532aa 100644
--- a/spec/features/projects/services/user_activates_prometheus_spec.rb
+++ b/spec/features/projects/services/user_activates_prometheus_spec.rb
@@ -15,11 +15,12 @@ describe 'User activates Prometheus' do
     click_link('Prometheus')
   end
 
-  it 'activates service' do
+  it 'does not activate service and informs about deprecation' do
     check('Active')
     fill_in('API URL', with: 'http://prometheus.example.com')
     click_button('Save changes')
 
-    expect(page).to have_content('Prometheus activated.')
+    expect(page).not_to have_content('Prometheus activated.')
+    expect(page).to have_content('Fields on this page has been deprecated.')
   end
 end
diff --git a/spec/frontend/ide/components/ide_status_mr_spec.js b/spec/frontend/ide/components/ide_status_mr_spec.js
new file mode 100644
index 00000000000..4d9ad61201d
--- /dev/null
+++ b/spec/frontend/ide/components/ide_status_mr_spec.js
@@ -0,0 +1,59 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlIcon, GlLink } from '@gitlab/ui';
+import { TEST_HOST } from 'helpers/test_constants';
+import IdeStatusMr from '~/ide/components/ide_status_mr.vue';
+
+const TEST_TEXT = '!9001';
+const TEST_URL = `${TEST_HOST}merge-requests/9001`;
+
+describe('ide/components/ide_status_mr', () => {
+  let wrapper;
+
+  const createComponent = props => {
+    wrapper = shallowMount(IdeStatusMr, {
+      propsData: props,
+    });
+  };
+  const findIcon = () => wrapper.find(GlIcon);
+  const findLink = () => wrapper.find(GlLink);
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  describe('when mounted', () => {
+    beforeEach(() => {
+      createComponent({
+        text: TEST_TEXT,
+        url: TEST_URL,
+      });
+    });
+
+    it('renders icon', () => {
+      const icon = findIcon();
+
+      expect(icon.exists()).toBe(true);
+      expect(icon.props()).toEqual(
+        expect.objectContaining({
+          name: 'merge-request',
+        }),
+      );
+    });
+
+    it('renders link', () => {
+      const link = findLink();
+
+      expect(link.exists()).toBe(true);
+      expect(link.attributes()).toEqual(
+        expect.objectContaining({
+          href: TEST_URL,
+        }),
+      );
+      expect(link.text()).toEqual(TEST_TEXT);
+    });
+
+    it('renders text', () => {
+      expect(wrapper.text()).toBe(`Merge request ${TEST_TEXT}`);
+    });
+  });
+});
diff --git a/spec/frontend/ide/components/panes/right_spec.js b/spec/frontend/ide/components/panes/right_spec.js
index 7e408be96fc..84b2d440b60 100644
--- a/spec/frontend/ide/components/panes/right_spec.js
+++ b/spec/frontend/ide/components/panes/right_spec.js
@@ -75,28 +75,6 @@ describe('ide/components/panes/right.vue', () => {
     });
   });
 
-  describe('merge request tab', () => {
-    it('is shown if there is a currentMergeRequestId', () => {
-      store.state.currentMergeRequestId = 1;
-
-      createComponent();
-
-      expect(wrapper.find(CollapsibleSidebar).props('extensionTabs')).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            show: true,
-            title: 'Merge Request',
-            views: expect.arrayContaining([
-              expect.objectContaining({
-                name: rightSidebarViews.mergeRequestInfo.name,
-              }),
-            ]),
-          }),
-        ]),
-      );
-    });
-  });
-
   describe('clientside live preview tab', () => {
     it('is shown if there is a packageJson and clientsidePreviewEnabled', () => {
       Vue.set(store.state.entries, 'package.json', {
diff --git a/spec/javascripts/ide/components/ide_status_bar_spec.js b/spec/javascripts/ide/components/ide_status_bar_spec.js
index 69f163574fb..3facf1c266a 100644
--- a/spec/javascripts/ide/components/ide_status_bar_spec.js
+++ b/spec/javascripts/ide/components/ide_status_bar_spec.js
@@ -1,94 +1,129 @@
 import Vue from 'vue';
+import _ from 'lodash';
 import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
-import store from '~/ide/stores';
-import ideStatusBar from '~/ide/components/ide_status_bar.vue';
+import { TEST_HOST } from 'spec/test_constants';
+import { createStore } from '~/ide/stores';
+import IdeStatusBar from '~/ide/components/ide_status_bar.vue';
 import { rightSidebarViews } from '~/ide/constants';
-import { resetStore } from '../helpers';
 import { projectData } from '../mock_data';
 
+const TEST_PROJECT_ID = 'abcproject';
+const TEST_MERGE_REQUEST_ID = '9001';
+const TEST_MERGE_REQUEST_URL = `${TEST_HOST}merge-requests/${TEST_MERGE_REQUEST_ID}`;
+
 describe('ideStatusBar', () => {
+  let store;
   let vm;
 
-  beforeEach(() => {
-    const Component = Vue.extend(ideStatusBar);
+  const createComponent = () => {
+    vm = createComponentWithStore(Vue.extend(IdeStatusBar), store).$mount();
+  };
+  const findMRStatus = () => vm.$el.querySelector('.js-ide-status-mr');
 
-    store.state.currentProjectId = 'abcproject';
-    store.state.projects.abcproject = projectData;
+  beforeEach(() => {
+    store = createStore();
+    store.state.currentProjectId = TEST_PROJECT_ID;
+    store.state.projects[TEST_PROJECT_ID] = _.clone(projectData);
     store.state.currentBranchId = 'master';
-
-    vm = createComponentWithStore(Component, store).$mount();
   });
 
   afterEach(() => {
     vm.$destroy();
-
-    resetStore(vm.$store);
   });
 
-  it('renders the statusbar', () => {
-    expect(vm.$el.className).toBe('ide-status-bar');
-  });
+  describe('default', () => {
+    beforeEach(() => {
+      createComponent();
+    });
 
-  describe('mounted', () => {
     it('triggers a setInterval', () => {
       expect(vm.intervalId).not.toBe(null);
     });
-  });
 
-  describe('commitAgeUpdate', () => {
-    beforeEach(function() {
-      jasmine.clock().install();
-      spyOn(vm, 'commitAgeUpdate').and.callFake(() => {});
-      vm.startTimer();
+    it('renders the statusbar', () => {
+      expect(vm.$el.className).toBe('ide-status-bar');
     });
 
-    afterEach(function() {
-      jasmine.clock().uninstall();
-    });
+    describe('commitAgeUpdate', () => {
+      beforeEach(function() {
+        jasmine.clock().install();
+        spyOn(vm, 'commitAgeUpdate').and.callFake(() => {});
+        vm.startTimer();
+      });
 
-    it('gets called every second', () => {
-      expect(vm.commitAgeUpdate).not.toHaveBeenCalled();
+      afterEach(function() {
+        jasmine.clock().uninstall();
+      });
 
-      jasmine.clock().tick(1100);
+      it('gets called every second', () => {
+        expect(vm.commitAgeUpdate).not.toHaveBeenCalled();
 
-      expect(vm.commitAgeUpdate.calls.count()).toEqual(1);
+        jasmine.clock().tick(1100);
 
-      jasmine.clock().tick(1000);
+        expect(vm.commitAgeUpdate.calls.count()).toEqual(1);
 
-      expect(vm.commitAgeUpdate.calls.count()).toEqual(2);
+        jasmine.clock().tick(1000);
+
+        expect(vm.commitAgeUpdate.calls.count()).toEqual(2);
+      });
     });
-  });
 
-  describe('getCommitPath', () => {
-    it('returns the path to the commit details', () => {
-      expect(vm.getCommitPath('abc123de')).toBe('/commit/abc123de');
+    describe('getCommitPath', () => {
+      it('returns the path to the commit details', () => {
+        expect(vm.getCommitPath('abc123de')).toBe('/commit/abc123de');
+      });
+    });
+
+    describe('pipeline status', () => {
+      it('opens right sidebar on clicking icon', done => {
+        spyOn(vm, 'openRightPane');
+        Vue.set(vm.$store.state.pipelines, 'latestPipeline', {
+          details: {
+            status: {
+              text: 'success',
+              details_path: 'test',
+              icon: 'status_success',
+            },
+          },
+          commit: {
+            author_gravatar_url: 'www',
+          },
+        });
+
+        vm.$nextTick()
+          .then(() => {
+            vm.$el.querySelector('.ide-status-pipeline button').click();
+
+            expect(vm.openRightPane).toHaveBeenCalledWith(rightSidebarViews.pipelines);
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+    });
+
+    it('does not show merge request status', () => {
+      expect(findMRStatus()).toBe(null);
     });
   });
 
-  describe('pipeline status', () => {
-    it('opens right sidebar on clicking icon', done => {
-      spyOn(vm, 'openRightPane');
-      Vue.set(vm.$store.state.pipelines, 'latestPipeline', {
-        details: {
-          status: {
-            text: 'success',
-            details_path: 'test',
-            icon: 'status_success',
+  describe('with merge request in store', () => {
+    beforeEach(() => {
+      store.state.projects[TEST_PROJECT_ID].mergeRequests = {
+        [TEST_MERGE_REQUEST_ID]: {
+          web_url: TEST_MERGE_REQUEST_URL,
+          references: {
+            short: `!${TEST_MERGE_REQUEST_ID}`,
           },
         },
-        commit: {
-          author_gravatar_url: 'www',
-        },
-      });
+      };
+      store.state.currentMergeRequestId = TEST_MERGE_REQUEST_ID;
 
-      vm.$nextTick()
-        .then(() => {
-          vm.$el.querySelector('.ide-status-pipeline button').click();
+      createComponent();
+    });
 
-          expect(vm.openRightPane).toHaveBeenCalledWith(rightSidebarViews.pipelines);
-        })
-        .then(done)
-        .catch(done.fail);
+    it('shows merge request status', () => {
+      expect(findMRStatus().textContent.trim()).toEqual(`Merge request !${TEST_MERGE_REQUEST_ID}`);
+      expect(findMRStatus().querySelector('a').href).toEqual(TEST_MERGE_REQUEST_URL);
     });
   });
 });
diff --git a/spec/javascripts/ide/components/merge_requests/info_spec.js b/spec/javascripts/ide/components/merge_requests/info_spec.js
deleted file mode 100644
index 98a29e5128b..00000000000
--- a/spec/javascripts/ide/components/merge_requests/info_spec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import Vue from 'vue';
-import '~/behaviors/markdown/render_gfm';
-import { createStore } from '~/ide/stores';
-import Info from '~/ide/components/merge_requests/info.vue';
-import { createComponentWithStore } from '../../../helpers/vue_mount_component_helper';
-
-describe('IDE merge request details', () => {
-  let Component;
-  let vm;
-
-  beforeAll(() => {
-    Component = Vue.extend(Info);
-  });
-
-  beforeEach(() => {
-    const store = createStore();
-    store.state.currentProjectId = 'gitlab-ce';
-    store.state.currentMergeRequestId = 1;
-    store.state.projects['gitlab-ce'] = {
-      mergeRequests: {
-        1: {
-          iid: 1,
-          title: 'Testing',
-          title_html: '<span class="title-html">Testing</span>',
-          description: 'Description',
-          description_html: '<p class="description-html">Description HTML</p>',
-        },
-      },
-    };
-
-    vm = createComponentWithStore(Component, store).$mount();
-  });
-
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  it('renders merge request IID', () => {
-    expect(vm.$el.querySelector('.detail-page-header').textContent).toContain('!1');
-  });
-
-  it('renders title as HTML', () => {
-    expect(vm.$el.querySelector('.title-html')).not.toBe(null);
-    expect(vm.$el.querySelector('.title').textContent).toContain('Testing');
-  });
-
-  it('renders description as HTML', () => {
-    expect(vm.$el.querySelector('.description-html')).not.toBe(null);
-    expect(vm.$el.querySelector('.description').textContent).toContain('Description HTML');
-  });
-});
diff --git a/spec/javascripts/ide/stores/actions/merge_request_spec.js b/spec/javascripts/ide/stores/actions/merge_request_spec.js
index ee0e51003c5..498e5142f0c 100644
--- a/spec/javascripts/ide/stores/actions/merge_request_spec.js
+++ b/spec/javascripts/ide/stores/actions/merge_request_spec.js
@@ -137,9 +137,7 @@ describe('IDE store merge request actions', () => {
         store
           .dispatch('getMergeRequestData', { projectId: TEST_PROJECT, mergeRequestId: 1 })
           .then(() => {
-            expect(service.getProjectMergeRequestData).toHaveBeenCalledWith(TEST_PROJECT, 1, {
-              render_html: true,
-            });
+            expect(service.getProjectMergeRequestData).toHaveBeenCalledWith(TEST_PROJECT, 1);
 
             done();
           })
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 86bf5710635..7695617cb57 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -30,6 +30,7 @@ Issue:
 - last_edited_at
 - last_edited_by_id
 - discussion_locked
+- health_status
 Event:
 - id
 - target_type
@@ -824,3 +825,4 @@ Epic:
   - state_id
   - start_date_sourcing_epic_id
   - due_date_sourcing_epic_id
+  - health_status
diff --git a/spec/lib/gitlab/profiler_spec.rb b/spec/lib/gitlab/profiler_spec.rb
index 8f6fb6eda65..0186d48fd1b 100644
--- a/spec/lib/gitlab/profiler_spec.rb
+++ b/spec/lib/gitlab/profiler_spec.rb
@@ -192,4 +192,43 @@ describe Gitlab::Profiler do
       expect(described_class.log_load_times_by_model(null_logger)).to be_nil
     end
   end
+
+  describe '.print_by_total_time' do
+    let(:stdout) { StringIO.new }
+
+    let(:output) do
+      stdout.rewind
+      stdout.read
+    end
+
+    let_it_be(:result) do
+      RubyProf.profile do
+        sleep 0.1
+        1.to_s
+      end
+    end
+
+    before do
+      stub_const('STDOUT', stdout)
+    end
+
+    it 'prints a profile result sorted by total time' do
+      described_class.print_by_total_time(result)
+
+      total_times =
+        output
+          .scan(/^\s+\d+\.\d+\s+(\d+\.\d+)/)
+          .map { |(total)| total.to_f }
+
+      expect(output).to include('Kernel#sleep')
+      expect(total_times).to eq(total_times.sort.reverse)
+      expect(total_times).not_to eq(total_times.uniq)
+    end
+
+    it 'accepts a max_percent option' do
+      described_class.print_by_total_time(result, max_percent: 50)
+
+      expect(output).not_to include('Kernel#sleep')
+    end
+  end
 end
diff --git a/spec/migrations/drop_activate_prometheus_services_for_shared_cluster_applications_background_migration_spec.rb b/spec/migrations/drop_background_migration_jobs_spec.rb
index 5851b26dba4..ac76e897f6c 100644
--- a/spec/migrations/drop_activate_prometheus_services_for_shared_cluster_applications_background_migration_spec.rb
+++ b/spec/migrations/drop_background_migration_jobs_spec.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20200116051619_drop_activate_prometheus_services_for_shared_cluster_applications_background_migration.rb')
+require Rails.root.join('db', 'migrate', '20200116051619_drop_background_migration_jobs.rb')
 
-describe DropActivatePrometheusServicesForSharedClusterApplicationsBackgroundMigration, :sidekiq, :redis, :migration, schema: 2020_01_16_051619 do
+describe DropBackgroundMigrationJobs, :sidekiq, :redis, :migration, schema: 2020_01_16_051619 do
   subject(:migration) { described_class.new }
 
   describe '#up' do