Add latest changes from gitlab-org/gitlab@master

5 files changed, 185 insertions, 7 deletions

diff --git a/spec/lib/gitlab/background_migration/set_default_iteration_cadences_spec.rb b/spec/lib/gitlab/background_migration/set_default_iteration_cadences_spec.rb
new file mode 100644
index 00000000000..d0e51593fd4
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/set_default_iteration_cadences_spec.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::SetDefaultIterationCadences, schema: 20201231133921 do
+  let(:namespaces) { table(:namespaces) }
+  let(:iterations) { table(:sprints) }
+  let(:iterations_cadences) { table(:iterations_cadences) }
+
+  describe '#perform' do
+    context 'when no iteration cadences exists' do
+      let!(:group_1) { namespaces.create!(name: 'group 1', path: 'group-1') }
+      let!(:group_2) { namespaces.create!(name: 'group 2', path: 'group-2') }
+      let!(:group_3) { namespaces.create!(name: 'group 3', path: 'group-3') }
+
+      let!(:iteration_1) { iterations.create!(group_id: group_1.id, iid: 1, title: 'Iteration 1', start_date: 10.days.ago, due_date: 8.days.ago) }
+      let!(:iteration_2) { iterations.create!(group_id: group_3.id, iid: 1, title: 'Iteration 2', start_date: 10.days.ago, due_date: 8.days.ago) }
+      let!(:iteration_3) { iterations.create!(group_id: group_3.id, iid: 1, title: 'Iteration 3', start_date: 5.days.ago, due_date: 2.days.ago) }
+
+      before do
+        described_class.new.perform(group_1.id, group_2.id, group_3.id, namespaces.last.id + 1)
+      end
+
+      it 'creates iterations_cadence records for the requested groups' do
+        expect(iterations_cadences.count).to eq(2)
+      end
+
+      it 'assigns the iteration cadences to the iterations correctly' do
+        iterations_cadence = iterations_cadences.find_by(group_id: group_1.id)
+        iteration_records = iterations.where(iterations_cadence_id: iterations_cadence.id)
+
+        expect(iterations_cadence.start_date).to eq(iteration_1.start_date)
+        expect(iterations_cadence.last_run_date).to eq(iteration_1.start_date)
+        expect(iterations_cadence.title).to eq('group 1 Iterations')
+        expect(iteration_records.size).to eq(1)
+        expect(iteration_records.first.id).to eq(iteration_1.id)
+
+        iterations_cadence = iterations_cadences.find_by(group_id: group_3.id)
+        iteration_records = iterations.where(iterations_cadence_id: iterations_cadence.id)
+
+        expect(iterations_cadence.start_date).to eq(iteration_3.start_date)
+        expect(iterations_cadence.last_run_date).to eq(iteration_3.start_date)
+        expect(iterations_cadence.title).to eq('group 3 Iterations')
+        expect(iteration_records.size).to eq(2)
+        expect(iteration_records.first.id).to eq(iteration_2.id)
+        expect(iteration_records.second.id).to eq(iteration_3.id)
+      end
+    end
+
+    context 'when an iteration cadence exists for a group' do
+      let!(:group) { namespaces.create!(name: 'group', path: 'group') }
+
+      let!(:iterations_cadence_1) { iterations_cadences.create!(group_id: group.id, start_date: 5.days.ago, title: 'Cadence 1') }
+      let!(:iterations_cadence_2) { iterations_cadences.create!(group_id: group.id, start_date: 2.days.ago, title: 'Cadence 2') }
+
+      let!(:iteration_1) { iterations.create!(group_id: group.id, iid: 1, title: 'Iteration 1', start_date: 10.days.ago, due_date: 8.days.ago) }
+      let!(:iteration_2) { iterations.create!(group_id: group.id, iterations_cadence_id: iterations_cadence_1.id, iid: 2, title: 'Iteration 2', start_date: 5.days.ago, due_date: 3.days.ago) }
+      let!(:iteration_3) { iterations.create!(group_id: group.id, iterations_cadence_id: iterations_cadence_2.id, iid: 3, title: 'Iteration 3', start_date: 2.days.ago, due_date: 1.day.ago) }
+
+      subject { described_class.new.perform(group.id) }
+
+      it 'does not create a new iterations_cadence' do
+        expect { subject }.not_to change { iterations_cadences.count }
+      end
+
+      it 'assigns iteration cadences to iterations if needed' do
+        subject
+
+        expect(iteration_1.reload.iterations_cadence_id).to eq(iterations_cadence_1.id)
+        expect(iteration_2.reload.iterations_cadence_id).to eq(iterations_cadence_1.id)
+        expect(iteration_3.reload.iterations_cadence_id).to eq(iterations_cadence_2.id)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/database/migrations/observers/query_statistics_spec.rb b/spec/lib/gitlab/database/migrations/observers/query_statistics_spec.rb
new file mode 100644
index 00000000000..a3b03050b33
--- /dev/null
+++ b/spec/lib/gitlab/database/migrations/observers/query_statistics_spec.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Gitlab::Database::Migrations::Observers::QueryStatistics do
+  subject { described_class.new }
+
+  let(:connection) { ActiveRecord::Base.connection }
+
+  def mock_pgss(enabled: true)
+    if enabled
+      allow(subject).to receive(:function_exists?).with(:pg_stat_statements_reset).and_return(true)
+      allow(connection).to receive(:view_exists?).with(:pg_stat_statements).and_return(true)
+    else
+      allow(subject).to receive(:function_exists?).with(:pg_stat_statements_reset).and_return(false)
+      allow(connection).to receive(:view_exists?).with(:pg_stat_statements).and_return(false)
+    end
+  end
+
+  describe '#before' do
+    context 'with pgss available' do
+      it 'resets pg_stat_statements' do
+        mock_pgss(enabled: true)
+        expect(connection).to receive(:execute).with('select pg_stat_statements_reset()').once
+
+        subject.before
+      end
+    end
+
+    context 'without pgss available' do
+      it 'executes nothing' do
+        mock_pgss(enabled: false)
+        expect(connection).not_to receive(:execute)
+
+        subject.before
+      end
+    end
+  end
+
+  describe '#record' do
+    let(:observation) { Gitlab::Database::Migrations::Observation.new }
+    let(:result) { double }
+    let(:pgss_query) do
+      <<~SQL
+        SELECT query, calls, total_time, max_time, mean_time, rows
+        FROM pg_stat_statements
+        ORDER BY total_time DESC
+      SQL
+    end
+
+    context 'with pgss available' do
+      it 'fetches data from pg_stat_statements and stores on the observation' do
+        mock_pgss(enabled: true)
+        expect(connection).to receive(:execute).with(pgss_query).once.and_return(result)
+
+        expect { subject.record(observation) }.to change { observation.query_statistics }.from(nil).to(result)
+      end
+    end
+
+    context 'without pgss available' do
+      it 'executes nothing' do
+        mock_pgss(enabled: false)
+        expect(connection).not_to receive(:execute)
+
+        expect { subject.record(observation) }.not_to change { observation.query_statistics }
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/graphql/docs/renderer_spec.rb b/spec/lib/gitlab/graphql/docs/renderer_spec.rb
index 064e0c6828b..2923e589ff7 100644
--- a/spec/lib/gitlab/graphql/docs/renderer_spec.rb
+++ b/spec/lib/gitlab/graphql/docs/renderer_spec.rb
@@ -5,21 +5,25 @@ require 'spec_helper'
 RSpec.describe Gitlab::Graphql::Docs::Renderer do
   describe '#contents' do
     # Returns a Schema that uses the given `type`
-    def mock_schema(type)
+    def mock_schema(type, field_description)
       query_type = Class.new(Types::BaseObject) do
-        graphql_name 'QueryType'
+        graphql_name 'Query'
 
-        field :foo, type, null: true
+        field :foo, type, null: true do
+          description field_description
+          argument :id, GraphQL::ID_TYPE, required: false, description: 'ID of the object.'
+        end
       end
 
       GraphQL::Schema.define(query: query_type)
     end
 
     let_it_be(:template) { Rails.root.join('lib/gitlab/graphql/docs/templates/', 'default.md.haml') }
+    let(:field_description) { 'List of objects.' }
 
     subject(:contents) do
       described_class.new(
-        mock_schema(type).graphql_definition,
+        mock_schema(type, field_description).graphql_definition,
         output_dir: nil,
         template: template
       ).contents
@@ -45,6 +49,32 @@ RSpec.describe Gitlab::Graphql::Docs::Renderer do
 
         is_expected.to include(expectation)
       end
+
+      context 'query generation' do
+        let(:expectation) do
+          <<~DOC
+            ### Foo
+
+            List of objects.
+
+            | Name | Description | Type |
+            | ----- | ---- | ----------- |
+            | `id` | ID of the object. | ID |
+          DOC
+        end
+
+        it 'generates the query with arguments' do
+          expect(subject).to include(expectation)
+        end
+
+        context 'when description does not end with `.`' do
+          let(:field_description) { 'List of objects' }
+
+          it 'adds the `.` to the end' do
+            expect(subject).to include(expectation)
+          end
+        end
+      end
     end
 
     context 'A type with fields defined in reverse alphabetical order' do
diff --git a/spec/lib/gitlab/usage/docs/renderer_spec.rb b/spec/lib/gitlab/usage/docs/renderer_spec.rb
index 0677aa2d9d7..07f25cfcfa7 100644
--- a/spec/lib/gitlab/usage/docs/renderer_spec.rb
+++ b/spec/lib/gitlab/usage/docs/renderer_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Gitlab::Usage::Docs::Renderer do
   describe 'contents' do
     let(:dictionary_path) { Gitlab::Usage::Docs::Renderer::DICTIONARY_PATH }
-    let(:items) { Gitlab::Usage::MetricDefinition.definitions }
+    let(:items) { Gitlab::Usage::MetricDefinition.definitions.first(10).to_h }
 
     it 'generates dictionary for given items' do
       generated_dictionary = described_class.new(items).contents
diff --git a/spec/lib/gitlab_spec.rb b/spec/lib/gitlab_spec.rb
index 5f945d5b9fc..c5738ae730f 100644
--- a/spec/lib/gitlab_spec.rb
+++ b/spec/lib/gitlab_spec.rb
@@ -363,8 +363,13 @@ RSpec.describe Gitlab do
       expect(described_class.maintenance_mode?).to eq(false)
     end
 
-    it 'returns false when maintenance mode feature flag is disabled' do
-      stub_feature_flags(maintenance_mode: false)
+    it 'returns false when maintenance mode column is not present' do
+      stub_maintenance_mode_setting(true)
+
+      allow(::Gitlab::CurrentSettings.current_application_settings)
+        .to receive(:respond_to?)
+        .with(:maintenance_mode, false)
+        .and_return(false)
 
       expect(described_class.maintenance_mode?).to eq(false)
     end