Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953

4 files changed, 120 insertions, 5 deletions

diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb
index c4bf5da0cf0..7c8e57702ae 100644
--- a/spec/support/features/discussion_comments_shared_example.rb
+++ b/spec/support/features/discussion_comments_shared_example.rb
@@ -176,7 +176,7 @@ shared_examples 'thread comments' do |resource_name|
 
         if resource_name == 'merge request'
           let(:note_id) { find("#{comments_selector} .note:first-child", match: :first)['data-note-id'] }
-          let(:reply_id) { find("#{comments_selector} .note:last-child", match: :first)['data-note-id'] }
+          let(:reply_id) { find("#{comments_selector} .note:last-of-type", match: :first)['data-note-id'] }
 
           it 'can be replied to after resolving' do
             click_button "Resolve thread"
diff --git a/spec/support/matchers/gitaly_matchers.rb b/spec/support/matchers/gitaly_matchers.rb
index ebfabcd8f24..933ed22b5d0 100644
--- a/spec/support/matchers/gitaly_matchers.rb
+++ b/spec/support/matchers/gitaly_matchers.rb
@@ -9,6 +9,6 @@ end
 
 RSpec::Matchers.define :gitaly_request_with_params do |params|
   match do |actual|
-    params.reduce(true) { |r, (key, val)| r && actual.send(key) == val }
+    params.reduce(true) { |r, (key, val)| r && actual[key.to_s] == val }
   end
 end
diff --git a/spec/support/shared_examples/models/services_fields_shared_examples.rb b/spec/support/shared_examples/models/services_fields_shared_examples.rb
new file mode 100644
index 00000000000..6fbd0da9383
--- /dev/null
+++ b/spec/support/shared_examples/models/services_fields_shared_examples.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+shared_examples 'issue tracker fields' do
+  let(:title) { 'custom title' }
+  let(:description) { 'custom description' }
+  let(:url) { 'http://issue_tracker.example.com' }
+
+  context 'when data are stored in the properties' do
+    describe '#update' do
+      before do
+        service.update(title: 'new_title', description: 'new description')
+      end
+
+      it 'removes title and description from properties' do
+        expect(service.reload.properties).not_to include('title', 'description')
+      end
+
+      it 'stores title & description in services table' do
+        expect(service.read_attribute(:title)).to eq('new_title')
+        expect(service.read_attribute(:description)).to eq('new description')
+      end
+    end
+
+    describe 'reading fields' do
+      it 'returns correct values' do
+        expect(service.title).to eq(title)
+        expect(service.description).to eq(description)
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/models/update_project_statistics_shared_examples.rb b/spec/support/shared_examples/models/update_project_statistics_shared_examples.rb
index 1b09c3dd636..aad63982e7a 100644
--- a/spec/support/shared_examples/models/update_project_statistics_shared_examples.rb
+++ b/spec/support/shared_examples/models/update_project_statistics_shared_examples.rb
@@ -25,16 +25,36 @@ shared_examples_for 'UpdateProjectStatistics' do
         .to change { reload_stat }
         .by(delta)
     end
+
+    it 'schedules a namespace statistics worker' do
+      expect(Namespaces::ScheduleAggregationWorker)
+        .to receive(:perform_async).once
+
+      subject.save!
+    end
+
+    context 'when feature flag is disabled for the namespace' do
+      it 'does not schedules a namespace statistics worker' do
+        namespace = subject.project.root_ancestor
+
+        stub_feature_flags(update_statistics_namespace: false, namespace: namespace)
+
+        expect(Namespaces::ScheduleAggregationWorker)
+          .not_to receive(:perform_async)
+
+        subject.save!
+      end
+    end
   end
 
   context 'when updating' do
+    let(:delta) { 42 }
+
     before do
       subject.save!
     end
 
     it 'updates project statistics' do
-      delta = 42
-
       expect(ProjectStatistics)
         .to receive(:increment_statistic)
         .and_call_original
@@ -45,6 +65,42 @@ shared_examples_for 'UpdateProjectStatistics' do
         .to change { reload_stat }
         .by(delta)
     end
+
+    it 'schedules a namespace statistics worker' do
+      expect(Namespaces::ScheduleAggregationWorker)
+        .to receive(:perform_async).once
+
+      subject.write_attribute(statistic_attribute, read_attribute + delta)
+      subject.save!
+    end
+
+    it 'avoids N + 1 queries' do
+      subject.write_attribute(statistic_attribute, read_attribute + delta)
+
+      control_count = ActiveRecord::QueryRecorder.new do
+        subject.save!
+      end
+
+      subject.write_attribute(statistic_attribute, read_attribute + delta)
+
+      expect do
+        subject.save!
+      end.not_to exceed_query_limit(control_count)
+    end
+
+    context 'when the feature flag is disabled for the namespace' do
+      it 'does not schedule a namespace statistics worker' do
+        namespace = subject.project.root_ancestor
+
+        stub_feature_flags(update_statistics_namespace: false, namespace: namespace)
+
+        expect(Namespaces::ScheduleAggregationWorker)
+          .not_to receive(:perform_async)
+
+        subject.write_attribute(statistic_attribute, read_attribute + delta)
+        subject.save!
+      end
+    end
   end
 
   context 'when destroying' do
@@ -59,11 +115,18 @@ shared_examples_for 'UpdateProjectStatistics' do
         .to receive(:increment_statistic)
         .and_call_original
 
-      expect { subject.destroy }
+      expect { subject.destroy! }
         .to change { reload_stat }
         .by(delta)
     end
 
+    it 'schedules a namespace statistics worker' do
+      expect(Namespaces::ScheduleAggregationWorker)
+        .to receive(:perform_async).once
+
+      subject.destroy!
+    end
+
     context 'when it is destroyed from the project level' do
       it 'does not update the project statistics' do
         expect(ProjectStatistics)
@@ -72,6 +135,27 @@ shared_examples_for 'UpdateProjectStatistics' do
         project.update(pending_delete: true)
         project.destroy!
       end
+
+      it 'does not schedule a namespace statistics worker' do
+        expect(Namespaces::ScheduleAggregationWorker)
+          .not_to receive(:perform_async)
+
+        project.update(pending_delete: true)
+        project.destroy!
+      end
+    end
+
+    context 'when feature flag is disabled for the namespace' do
+      it 'does not schedule a namespace statistics worker' do
+        namespace = subject.project.root_ancestor
+
+        stub_feature_flags(update_statistics_namespace: false, namespace: namespace)
+
+        expect(Namespaces::ScheduleAggregationWorker)
+          .not_to receive(:perform_async)
+
+        subject.destroy!
+      end
     end
   end
 end