1 files changed, 10 insertions, 36 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 932152c0764..199d1b9a3ca 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
@@ -7,23 +7,21 @@ 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] }
+  let(:settings) { ::Gitlab::GithubImport::Settings.new(project) }
+  let(:stage_enabled) { true }
+
+  before do
+    settings.write({ single_endpoint_issue_events_import: stage_enabled })
+  end
 
   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
-
-    context 'when single endpoint feature flag enabled' do
-      it 'imports all the issue events' do
+    context 'when stage is enabled' do
+      it 'imports issue events' do
         waiter = Gitlab::JobWaiter.new(2, '123')
 
-        expect(Gitlab::GithubImport::Importer::IssueEventsImporter).not_to receive(:new)
         expect(Gitlab::GithubImport::Importer::SingleEndpointIssueEventsImporter)
           .to receive(:new)
           .with(project, client)
@@ -39,35 +37,11 @@ RSpec.describe Gitlab::GithubImport::Stage::ImportIssueEventsWorker do
       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 flags are disabled' do
-      let(:feature_flag_state) { false }
-      let(:single_endpoint_feature_flag_state) { false }
+    context 'when stage is disabled' do
+      let(:stage_enabled) { 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)