Add latest changes from gitlab-org/gitlab@master

10 files changed, 144 insertions, 50 deletions

diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb
index 0905ab0aef8..23f660d111a 100644
--- a/spec/features/profiles/user_edit_profile_spec.rb
+++ b/spec/features/profiles/user_edit_profile_spec.rb
@@ -66,6 +66,34 @@ describe 'User edit profile' do
     end
   end
 
+  describe 'when I change my role' do
+    context 'experiment enabled' do
+      before do
+        stub_experiment_for_user(signup_flow: true)
+        visit(profile_path)
+      end
+
+      it 'changes my role' do
+        expect(page).to have_content 'Role'
+        select 'Data Analyst', from: 'user_role'
+        submit_settings
+        user.reload
+        expect(user.role).to eq 'data_analyst'
+      end
+    end
+
+    context 'experiment disabled' do
+      before do
+        stub_experiment_for_user(signup_flow: false)
+        visit(profile_path)
+      end
+
+      it 'does not show the role picker' do
+        expect(page).not_to have_content 'Role'
+      end
+    end
+  end
+
   context 'user avatar' do
     before do
       attach_file(:user_avatar, Rails.root.join('spec', 'fixtures', 'banana_sample.gif'))
diff --git a/spec/frontend/boards/stores/getters_spec.js b/spec/frontend/boards/stores/getters_spec.js
new file mode 100644
index 00000000000..38b2333e679
--- /dev/null
+++ b/spec/frontend/boards/stores/getters_spec.js
@@ -0,0 +1,21 @@
+import getters from '~/boards/stores/getters';
+
+describe('Boards - Getters', () => {
+  describe('getLabelToggleState', () => {
+    it('should return "on" when isShowingLabels is true', () => {
+      const state = {
+        isShowingLabels: true,
+      };
+
+      expect(getters.getLabelToggleState(state)).toBe('on');
+    });
+
+    it('should return "off" when isShowingLabels is false', () => {
+      const state = {
+        isShowingLabels: false,
+      };
+
+      expect(getters.getLabelToggleState(state)).toBe('off');
+    });
+  });
+});
diff --git a/spec/javascripts/boards/board_card_spec.js b/spec/javascripts/boards/board_card_spec.js
index 9f441ca319e..51433a58212 100644
--- a/spec/javascripts/boards/board_card_spec.js
+++ b/spec/javascripts/boards/board_card_spec.js
@@ -10,6 +10,7 @@ import eventHub from '~/boards/eventhub';
 import '~/boards/models/label';
 import '~/boards/models/assignee';
 import '~/boards/models/list';
+import store from '~/boards/stores';
 import boardsStore from '~/boards/stores/boards_store';
 import boardCard from '~/boards/components/board_card.vue';
 import { listObj, boardsMockInterceptor, mockBoardService } from './mock_data';
@@ -40,6 +41,7 @@ describe('Board card', () => {
       list.issues[0].labels.push(label1);
 
       vm = new BoardCardComp({
+        store,
         propsData: {
           list,
           issue: list.issues[0],
diff --git a/spec/javascripts/boards/board_list_common_spec.js b/spec/javascripts/boards/board_list_common_spec.js
index cb337e4cc83..5cd17323d0d 100644
--- a/spec/javascripts/boards/board_list_common_spec.js
+++ b/spec/javascripts/boards/board_list_common_spec.js
@@ -10,6 +10,7 @@ import BoardList from '~/boards/components/board_list.vue';
 import '~/boards/models/issue';
 import '~/boards/models/list';
 import { listObj, boardsMockInterceptor, mockBoardService } from './mock_data';
+import store from '~/boards/stores';
 import boardsStore from '~/boards/stores/boards_store';
 
 window.Sortable = Sortable;
@@ -39,6 +40,7 @@ export default function createComponent({ done, listIssueProps = {}, componentPr
 
   const component = new BoardListComp({
     el,
+    store,
     propsData: {
       disabled: false,
       list,
diff --git a/spec/javascripts/boards/issue_card_spec.js b/spec/javascripts/boards/issue_card_spec.js
index 314e051665e..df2b04cd6df 100644
--- a/spec/javascripts/boards/issue_card_spec.js
+++ b/spec/javascripts/boards/issue_card_spec.js
@@ -10,6 +10,7 @@ import '~/boards/models/issue';
 import '~/boards/models/list';
 import IssueCardInner from '~/boards/components/issue_card_inner.vue';
 import { listObj } from './mock_data';
+import store from '~/boards/stores';
 
 describe('Issue card component', () => {
   const user = new ListAssignee({
@@ -50,6 +51,7 @@ describe('Issue card component', () => {
 
     component = new Vue({
       el: document.querySelector('.test-container'),
+      store,
       components: {
         'issue-card': IssueCardInner,
       },
diff --git a/spec/lib/gitlab/instrumentation_helper_spec.rb b/spec/lib/gitlab/instrumentation_helper_spec.rb
new file mode 100644
index 00000000000..c2674638743
--- /dev/null
+++ b/spec/lib/gitlab/instrumentation_helper_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'fast_spec_helper'
+require 'rspec-parameterized'
+
+describe Gitlab::InstrumentationHelper do
+  using RSpec::Parameterized::TableSyntax
+
+  describe '.queue_duration_for_job' do
+    where(:enqueued_at, :created_at, :time_now, :expected_duration) do
+      "2019-06-01T00:00:00.000+0000" | nil                            | "2019-06-01T02:00:00.000+0000" | 2.hours.to_f
+      "2019-06-01T02:00:00.000+0000" | nil                            | "2019-06-01T02:00:00.001+0000" | 0.001
+      "2019-06-01T02:00:00.000+0000" | "2019-05-01T02:00:00.000+0000" | "2019-06-01T02:00:01.000+0000" | 1
+      nil                            | "2019-06-01T02:00:00.000+0000" | "2019-06-01T02:00:00.001+0000" | 0.001
+      nil                            | nil                            | "2019-06-01T02:00:00.001+0000" | nil
+      "2019-06-01T02:00:00.000+0200" | nil                            | "2019-06-01T02:00:00.000-0200" | 4.hours.to_f
+      1571825569.998168              | nil                            | "2019-10-23T12:13:16.000+0200" | 26.001832
+      1571825569                     | nil                            | "2019-10-23T12:13:16.000+0200" | 27
+      "invalid_date"                 | nil                            | "2019-10-23T12:13:16.000+0200" | nil
+      ""                             | nil                            | "2019-10-23T12:13:16.000+0200" | nil
+      0                              | nil                            | "2019-10-23T12:13:16.000+0200" | nil
+      -1                             | nil                            | "2019-10-23T12:13:16.000+0200" | nil
+      "2019-06-01T02:00:00.000+0000" | nil                            | "2019-06-01T00:00:00.000+0000" | 0
+      Time.at(1571999233)            | nil                            | "2019-10-25T12:29:16.000+0200" | 123
+    end
+
+    with_them do
+      let(:job) { { 'enqueued_at' => enqueued_at, 'created_at' => created_at } }
+
+      it "returns the correct duration" do
+        Timecop.freeze(Time.iso8601(time_now)) do
+          expect(described_class.queue_duration_for_job(job)).to eq(expected_duration)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
index 46fbc069efb..cb870cc996b 100644
--- a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
+++ b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 
 describe Gitlab::SidekiqLogging::StructuredLogger do
   describe '#call' do
diff --git a/spec/lib/gitlab/sidekiq_middleware/metrics_spec.rb b/spec/lib/gitlab/sidekiq_middleware/metrics_spec.rb
index df16b9d073c..0d8cff3a295 100644
--- a/spec/lib/gitlab/sidekiq_middleware/metrics_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/metrics_spec.rb
@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 
 describe Gitlab::SidekiqMiddleware::Metrics do
   let(:middleware) { described_class.new }
-
   let(:concurrency_metric) { double('concurrency metric') }
+
+  let(:queue_duration_seconds) { double('queue duration seconds metric') }
   let(:completion_seconds_metric) { double('completion seconds metric') }
   let(:user_execution_seconds_metric) { double('user execution seconds metric') }
   let(:failed_total_metric) { double('failed total metric') }
@@ -13,6 +14,7 @@ describe Gitlab::SidekiqMiddleware::Metrics do
   let(:running_jobs_metric) { double('running jobs metric') }
 
   before do
+    allow(Gitlab::Metrics).to receive(:histogram).with(:sidekiq_jobs_queue_duration_seconds, anything, anything, anything).and_return(queue_duration_seconds)
     allow(Gitlab::Metrics).to receive(:histogram).with(:sidekiq_jobs_completion_seconds, anything, anything, anything).and_return(completion_seconds_metric)
     allow(Gitlab::Metrics).to receive(:histogram).with(:sidekiq_jobs_cpu_seconds, anything, anything, anything).and_return(user_execution_seconds_metric)
     allow(Gitlab::Metrics).to receive(:counter).with(:sidekiq_jobs_failed_total, anything).and_return(failed_total_metric)
@@ -20,7 +22,6 @@ describe Gitlab::SidekiqMiddleware::Metrics do
     allow(Gitlab::Metrics).to receive(:gauge).with(:sidekiq_running_jobs, anything, {}, :all).and_return(running_jobs_metric)
     allow(Gitlab::Metrics).to receive(:gauge).with(:sidekiq_concurrency, anything, {}, :all).and_return(concurrency_metric)
 
-    allow(running_jobs_metric).to receive(:increment)
     allow(concurrency_metric).to receive(:set)
   end
 
@@ -32,62 +33,76 @@ describe Gitlab::SidekiqMiddleware::Metrics do
     end
   end
 
+  it 'ignore user execution when measured 0' do
+    allow(completion_seconds_metric).to receive(:observe)
+
+    expect(user_execution_seconds_metric).not_to receive(:observe)
+  end
+
   describe '#call' do
     let(:worker) { double(:worker) }
 
-    it 'yields block' do
-      allow(completion_seconds_metric).to receive(:observe)
-      allow(user_execution_seconds_metric).to receive(:observe)
+    let(:job) { {} }
+    let(:job_status) { :done }
+    let(:labels) { { queue: :test } }
+    let(:labels_with_job_status) { { queue: :test, job_status: job_status } }
 
-      expect { |b| middleware.call(worker, {}, :test, &b) }.to yield_control.once
-    end
+    let(:thread_cputime_before) { 1 }
+    let(:thread_cputime_after) { 2 }
+    let(:thread_cputime_duration) { thread_cputime_after - thread_cputime_before }
 
-    it 'sets queue specific metrics' do
-      labels = { queue: :test }
-      labels_with_job_status = { queue: :test, job_status: :done }
-      allow(middleware).to receive(:get_thread_cputime).and_return(1, 3)
-      allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(2, 3)
+    let(:monotonic_time_before) { 11 }
+    let(:monotonic_time_after) { 20 }
+    let(:monotonic_time_duration) { monotonic_time_after - monotonic_time_before }
+
+    let(:queue_duration_for_job) { 0.01 }
+
+    before do
+      allow(middleware).to receive(:get_thread_cputime).and_return(thread_cputime_before, thread_cputime_after)
+      allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(monotonic_time_before, monotonic_time_after)
+      allow(Gitlab::InstrumentationHelper).to receive(:queue_duration_for_job).with(job).and_return(queue_duration_for_job)
 
       expect(running_jobs_metric).to receive(:increment).with(labels, 1)
       expect(running_jobs_metric).to receive(:increment).with(labels, -1)
-      expect(user_execution_seconds_metric).to receive(:observe).with(labels_with_job_status, 2)
-      expect(completion_seconds_metric).to receive(:observe).with(labels_with_job_status, 1)
 
-      middleware.call(worker, {}, :test) { nil }
+      expect(queue_duration_seconds).to receive(:observe).with(labels, queue_duration_for_job) if queue_duration_for_job
+      expect(user_execution_seconds_metric).to receive(:observe).with(labels_with_job_status, thread_cputime_duration)
+      expect(completion_seconds_metric).to receive(:observe).with(labels_with_job_status, monotonic_time_duration)
     end
 
-    it 'ignore user execution when measured 0' do
-      allow(completion_seconds_metric).to receive(:observe)
-      allow(middleware).to receive(:get_thread_cputime).and_return(0, 0)
+    it 'yields block' do
+      expect { |b| middleware.call(worker, job, :test, &b) }.to yield_control.once
+    end
+
+    it 'sets queue specific metrics' do
+      middleware.call(worker, job, :test) { nil }
+    end
+
+    context 'when job_duration is not available' do
+      let(:queue_duration_for_job) { nil }
 
-      expect(user_execution_seconds_metric).not_to receive(:observe)
+      it 'does not set the queue_duration_seconds histogram' do
+        middleware.call(worker, job, :test) { nil }
+      end
     end
 
     context 'when job is retried' do
-      it 'sets sidekiq_jobs_retried_total metric' do
-        allow(completion_seconds_metric).to receive(:observe)
-        expect(user_execution_seconds_metric).to receive(:observe)
+      let(:job) { { 'retry_count' => 1 } }
 
+      it 'sets sidekiq_jobs_retried_total metric' do
         expect(retried_total_metric).to receive(:increment)
 
-        middleware.call(worker, { 'retry_count' => 1 }, :test) { nil }
+        middleware.call(worker, job, :test) { nil }
       end
     end
 
     context 'when error is raised' do
-      it 'sets sidekiq_jobs_failed_total and reraises' do
-        labels = { queue: :test }
-        labels_with_job_status = { queue: :test, job_status: :fail }
-        allow(middleware).to receive(:get_thread_cputime).and_return(1, 4)
-        allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(2, 6)
+      let(:job_status) { :fail }
 
-        expect(running_jobs_metric).to receive(:increment).with(labels, 1)
-        expect(running_jobs_metric).to receive(:increment).with(labels, -1)
+      it 'sets sidekiq_jobs_failed_total and reraises' do
         expect(failed_total_metric).to receive(:increment).with(labels, 1)
-        expect(user_execution_seconds_metric).to receive(:observe).with(labels_with_job_status, 3)
-        expect(completion_seconds_metric).to receive(:observe).with(labels_with_job_status, 4)
 
-        expect { middleware.call(worker, {}, :test) { raise StandardError, "Failed" } }.to raise_error(StandardError, "Failed")
+        expect { middleware.call(worker, job, :test) { raise StandardError, "Failed" } }.to raise_error(StandardError, "Failed")
       end
     end
   end
diff --git a/spec/services/projects/container_repository/delete_tags_service_spec.rb b/spec/services/projects/container_repository/delete_tags_service_spec.rb
index f296ef3a776..91b668495d8 100644
--- a/spec/services/projects/container_repository/delete_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/delete_tags_service_spec.rb
@@ -57,21 +57,7 @@ describe Projects::ContainerRepository::DeleteTagsService do
         end
       end
 
-      context 'with dummy tags disabled' do
-        let(:tags) { %w[A Ba] }
-
-        before do
-          stub_feature_flags(container_registry_smart_delete: false)
-        end
-
-        it 'deletes tags one by one' do
-          expect_delete_tag('sha256:configA')
-          expect_delete_tag('sha256:configB')
-          is_expected.to include(status: :success)
-        end
-      end
-
-      context 'with dummy tags enabled' do
+      context 'with tags to delete' do
         let(:tags) { %w[A Ba] }
 
         it 'deletes the tags using a dummy image' do
diff --git a/spec/views/profiles/show.html.haml_spec.rb b/spec/views/profiles/show.html.haml_spec.rb
index 592b3a56ba3..14e6feed3ab 100644
--- a/spec/views/profiles/show.html.haml_spec.rb
+++ b/spec/views/profiles/show.html.haml_spec.rb
@@ -8,6 +8,7 @@ describe 'profiles/show' do
   before do
     assign(:user, user)
     allow(controller).to receive(:current_user).and_return(user)
+    allow(view).to receive(:experiment_enabled?)
   end
 
   context 'when the profile page is opened' do