Add latest changes from gitlab-org/gitlab@master

1 files changed, 41 insertions, 12 deletions

diff --git a/spec/workers/gitlab/github_import/stage/import_issue_events_worker_spec.rb b/spec/workers/gitlab/github_import/stage/import_issue_events_worker_spec.rb
index b3c6a48767c..932152c0764 100644
--- a/spec/workers/gitlab/github_import/stage/import_issue_events_worker_spec.rb
+++ b/spec/workers/gitlab/github_import/stage/import_issue_events_worker_spec.rb
@@ -8,37 +8,66 @@ RSpec.describe Gitlab::GithubImport::Stage::ImportIssueEventsWorker do
   let(:project) { create(:project) }
   let!(:group) { create(:group, projects: [project]) }
   let(:feature_flag_state) { [group] }
+  let(:single_endpoint_feature_flag_state) { [group] }
 
   describe '#import' do
     let(:importer) { instance_double('Gitlab::GithubImport::Importer::SingleEndpointIssueEventsImporter') }
     let(:client) { instance_double('Gitlab::GithubImport::Client') }
 
     before do
+      stub_feature_flags(github_importer_single_endpoint_issue_events_import: single_endpoint_feature_flag_state)
       stub_feature_flags(github_importer_issue_events_import: feature_flag_state)
     end
 
-    it 'imports all the issue events' do
-      waiter = Gitlab::JobWaiter.new(2, '123')
+    context 'when single endpoint feature flag enabled' do
+      it 'imports all the issue events' do
+        waiter = Gitlab::JobWaiter.new(2, '123')
 
-      expect(Gitlab::GithubImport::Importer::SingleEndpointIssueEventsImporter)
-        .to receive(:new)
-        .with(project, client)
-        .and_return(importer)
+        expect(Gitlab::GithubImport::Importer::IssueEventsImporter).not_to receive(:new)
+        expect(Gitlab::GithubImport::Importer::SingleEndpointIssueEventsImporter)
+          .to receive(:new)
+          .with(project, client)
+          .and_return(importer)
 
-      expect(importer).to receive(:execute).and_return(waiter)
+        expect(importer).to receive(:execute).and_return(waiter)
 
-      expect(Gitlab::GithubImport::AdvanceStageWorker)
-        .to receive(:perform_async)
-        .with(project.id, { '123' => 2 }, :notes)
+        expect(Gitlab::GithubImport::AdvanceStageWorker)
+          .to receive(:perform_async)
+          .with(project.id, { '123' => 2 }, :notes)
 
-      worker.import(client, project)
+        worker.import(client, project)
+      end
+    end
+
+    context 'when import issue events feature flag enabled' do
+      let(:single_endpoint_feature_flag_state) { false }
+
+      it 'imports the issue events partly' do
+        waiter = Gitlab::JobWaiter.new(2, '123')
+
+        expect(Gitlab::GithubImport::Importer::SingleEndpointIssueEventsImporter).not_to receive(:new)
+        expect(Gitlab::GithubImport::Importer::IssueEventsImporter)
+          .to receive(:new)
+          .with(project, client)
+          .and_return(importer)
+
+        expect(importer).to receive(:execute).and_return(waiter)
+
+        expect(Gitlab::GithubImport::AdvanceStageWorker)
+          .to receive(:perform_async)
+          .with(project.id, { '123' => 2 }, :notes)
+
+        worker.import(client, project)
+      end
     end
 
-    context 'when feature flag is disabled' do
+    context 'when feature flags are disabled' do
       let(:feature_flag_state) { false }
+      let(:single_endpoint_feature_flag_state) { false }
 
       it 'skips issue events import and calls next stage' do
         expect(Gitlab::GithubImport::Importer::SingleEndpointIssueEventsImporter).not_to receive(:new)
+        expect(Gitlab::GithubImport::Importer::IssueEventsImporter).not_to receive(:new)
         expect(Gitlab::GithubImport::AdvanceStageWorker).to receive(:perform_async).with(project.id, {}, :notes)
 
         worker.import(client, project)