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

4 files changed, 71 insertions, 21 deletions

diff --git a/spec/support/shared_examples/lib/gitlab/gl_repository_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/gl_repository_shared_examples.rb
new file mode 100644
index 00000000000..97f4341340d
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/gl_repository_shared_examples.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'parsing gl_repository identifier' do
+  subject { described_class.new(identifier) }
+
+  it 'returns correct information' do
+    aggregate_failures do
+      expect(subject.repo_type).to eq(expected_type)
+      expect(subject.fetch_container!).to eq(expected_container)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb
new file mode 100644
index 00000000000..06ea540706a
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+shared_examples 'stuck import job detection' do
+  context 'when the job has completed' do
+    context 'when the import status was already updated' do
+      before do
+        allow(Gitlab::SidekiqStatus).to receive(:completed_jids) do
+          import_state.start
+          import_state.finish
+
+          [import_state.jid]
+        end
+      end
+
+      it 'does not mark the import as failed' do
+        worker.perform
+
+        expect(import_state.reload.status).to eq('finished')
+      end
+    end
+
+    context 'when the import status was not updated' do
+      before do
+        allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return([import_state.jid])
+      end
+
+      it 'marks the import as failed' do
+        worker.perform
+
+        expect(import_state.reload.status).to eq('failed')
+      end
+    end
+  end
+
+  context 'when the job is still in Sidekiq' do
+    before do
+      allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return([])
+    end
+
+    it 'does not mark the import as failed' do
+      expect { worker.perform }.not_to change { import_state.reload.status }
+    end
+  end
+end
diff --git a/spec/support/shared_examples/lib/gitlab/position_formatters_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/position_formatters_shared_examples.rb
index c9300aff3e6..326800e6dc2 100644
--- a/spec/support/shared_examples/lib/gitlab/position_formatters_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/position_formatters_shared_examples.rb
@@ -32,7 +32,21 @@ RSpec.shared_examples "position formatter" do
 
     subject { formatter.to_h }
 
-    it { is_expected.to eq(formatter_hash) }
+    context 'when file_identifier_hash is disabled' do
+      before do
+        stub_feature_flags(file_identifier_hash: false)
+      end
+
+      it { is_expected.to eq(formatter_hash.except(:file_identifier_hash)) }
+    end
+
+    context 'when file_identifier_hash is enabled' do
+      before do
+        stub_feature_flags(file_identifier_hash: true)
+      end
+
+      it { is_expected.to eq(formatter_hash) }
+    end
   end
 
   describe '#==' do
diff --git a/spec/support/shared_examples/lib/gitlab/repo_type_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/repo_type_shared_examples.rb
index 69ae9339f10..4aeae788114 100644
--- a/spec/support/shared_examples/lib/gitlab/repo_type_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/repo_type_shared_examples.rb
@@ -7,26 +7,6 @@ RSpec.shared_examples 'a repo type' do
     it { is_expected.to eq(expected_identifier) }
   end
 
-  describe '#fetch_id' do
-    it 'finds an id match in the identifier' do
-      expect(described_class.fetch_id(expected_identifier)).to eq(expected_id)
-    end
-
-    it 'does not break on other identifiers' do
-      expect(described_class.fetch_id('wiki-noid')).to eq(nil)
-    end
-  end
-
-  describe '#fetch_container!' do
-    it 'returns the container' do
-      expect(described_class.fetch_container!(expected_identifier)).to eq expected_container
-    end
-
-    it 'raises an exception if the identifier is invalid' do
-      expect { described_class.fetch_container!('project-noid') }.to raise_error ArgumentError
-    end
-  end
-
   describe '#path_suffix' do
     subject { described_class.path_suffix }