Add latest changes from gitlab-org/gitlab@13-0-stable-ee

4 files changed, 25 insertions, 17 deletions

diff --git a/spec/support/shared_examples/lib/gitlab/cycle_analytics/base_stage_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/cycle_analytics/base_stage_shared_examples.rb
index 851ed9c65a3..14292f70228 100644
--- a/spec/support/shared_examples/lib/gitlab/cycle_analytics/base_stage_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/cycle_analytics/base_stage_shared_examples.rb
@@ -63,7 +63,7 @@ shared_examples 'Gitlab::Analytics::CycleAnalytics::DataCollector backend exampl
 
   context 'provides the same results as the old implementation' do
     it 'for the median' do
-      expect(data_collector.median.seconds).to eq(ISSUES_MEDIAN)
+      expect(data_collector.median.seconds).to be_within(0.5).of(ISSUES_MEDIAN)
     end
 
     it 'for the list of event records' do
diff --git a/spec/support/shared_examples/lib/gitlab/helm_generated_script_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/helm_generated_script_shared_examples.rb
deleted file mode 100644
index bbf8a946f8b..00000000000
--- a/spec/support/shared_examples/lib/gitlab/helm_generated_script_shared_examples.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.shared_examples 'helm commands' do
-  describe '#generate_script' do
-    let(:helm_setup) do
-      <<~EOS
-         set -xeo pipefail
-      EOS
-    end
-
-    it 'returns appropriate command' do
-      expect(subject.generate_script.strip).to eq((helm_setup + commands).strip)
-    end
-  end
-end
diff --git a/spec/support/shared_examples/lib/gitlab/import_export/project/rake_task_object_storage_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/import_export/project/rake_task_object_storage_shared_examples.rb
new file mode 100644
index 00000000000..d6dc89a2c15
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/import_export/project/rake_task_object_storage_shared_examples.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'rake task with disabled object_storage' do |service_class, method|
+  it 'disables direct & background upload only for service call' do
+    expect_next_instance_of(service_class) do |service|
+      expect(service).to receive(:execute).and_wrap_original do |m|
+        expect(Settings.uploads.object_store['enabled']).to eq(false)
+
+        m.call
+      end
+    end
+
+    expect(rake_task).to receive(method).and_wrap_original do |m, *args|
+      expect(Settings.uploads.object_store['enabled']).to eq(true)
+      expect(Settings.uploads.object_store).not_to receive(:[]=).with('enabled', false)
+
+      m.call(*args)
+    end
+
+    subject
+  end
+end
diff --git a/spec/support/shared_examples/lib/gitlab/migration_helpers_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/migration_helpers_shared_examples.rb
index 8893ed5504b..72d672fd36c 100644
--- a/spec/support/shared_examples/lib/gitlab/migration_helpers_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/migration_helpers_shared_examples.rb
@@ -13,10 +13,11 @@ end
 RSpec.shared_examples 'performs validation' do |validation_option|
   it 'performs validation' do
     expect(model).to receive(:disable_statement_timeout).and_call_original
+    expect(model).to receive(:statement_timeout_disabled?).and_return(false)
     expect(model).to receive(:execute).with(/statement_timeout/)
     expect(model).to receive(:execute).ordered.with(/NOT VALID/)
     expect(model).to receive(:execute).ordered.with(/VALIDATE CONSTRAINT/)
-    expect(model).to receive(:execute).with(/RESET ALL/)
+    expect(model).to receive(:execute).ordered.with(/RESET ALL/)
 
     model.add_concurrent_foreign_key(*args, **options.merge(validation_option))
   end