spec/views/search/show.html.haml_spec.rb

@@ -4,93 +4,118 @@
 
 RSpec.describe 'search/show' do
   let(:search_term) { nil }
+  let(:user) { build(:user) }
 
   before do
     stub_template "search/_category.html.haml" => 'Category Partial'
     stub_template "search/_results.html.haml" => 'Results Partial'
-
-    @search_term = search_term
-
-    render
   end
 
-  context 'when the search page is opened' do
-    it 'displays the title' do
-      expect(rendered).to have_selector('h1.page-title', text: 'Search')
-      expect(rendered).not_to have_selector('h1.page-title code')
+  context 'feature flag enabled' do
+    before do
+      allow(self).to receive(:current_user).and_return(user)
+      @search_term = search_term
+
+      render
     end
 
-    it 'does not render partials' do
-      expect(rendered).not_to render_template('search/_category')
-      expect(rendered).not_to render_template('search/_results')
+    context 'when search term is supplied' do
+      let(:search_term) { 'Search Foo' }
+
+      it 'will not render category partial' do
+        expect(rendered).not_to render_template('search/_category')
+        expect(rendered).to render_template('search/_results')
+      end
     end
   end
 
-  context 'when search term is supplied' do
-    let(:search_term) { 'Search Foo' }
+  context 'feature flag disabled' do
+    before do
+      stub_feature_flags(search_page_vertical_nav: false)
 
-    it 'renders partials' do
-      expect(rendered).to render_template('search/_category')
-      expect(rendered).to render_template('search/_results')
+      @search_term = search_term
+
+      render
     end
 
-    context 'unfurling support' do
-      let(:group) { build(:group) }
-      let(:search_results) do
-        instance_double(Gitlab::GroupSearchResults).tap do |double|
-          allow(double).to receive(:formatted_count).and_return(0)
-        end
+    context 'when the search page is opened' do
+      it 'displays the title' do
+        expect(rendered).to have_selector('h1.page-title', text: 'Search')
+        expect(rendered).not_to have_selector('h1.page-title code')
       end
 
-      before do
-        assign(:search_results, search_results)
-        assign(:scope, 'issues')
-        assign(:group, group)
+      it 'does not render partials' do
+        expect(rendered).not_to render_template('search/_category')
+        expect(rendered).not_to render_template('search/_results')
       end
+    end
+
+    context 'when search term is supplied' do
+      let(:search_term) { 'Search Foo' }
+
+      it 'renders partials' do
+        expect(rendered).to render_template('search/_category')
+        expect(rendered).to render_template('search/_results')
+      end
+
+      context 'unfurling support' do
+        let(:group) { build(:group) }
+        let(:search_results) do
+          instance_double(Gitlab::GroupSearchResults).tap do |double|
+            allow(double).to receive(:formatted_count).and_return(0)
+          end
+        end
 
-      context 'search with full count' do
         before do
-          assign(:without_count, false)
+          assign(:search_results, search_results)
+          assign(:scope, 'issues')
+          assign(:group, group)
         end
 
-        it 'renders meta tags for a group' do
-          render
+        context 'search with full count' do
+          before do
+            assign(:without_count, false)
+          end
 
-          expect(view.page_description).to match(/\d+ issues for term '#{search_term}'/)
-          expect(view.page_card_attributes).to eq("Namespace" => group.full_path)
-        end
+          it 'renders meta tags for a group' do
+            render
 
-        it 'renders meta tags for both group and project' do
-          project = build(:project, group: group)
-          assign(:project, project)
+            expect(view.page_description).to match(/\d+ issues for term '#{search_term}'/)
+            expect(view.page_card_attributes).to eq("Namespace" => group.full_path)
+          end
 
-          render
+          it 'renders meta tags for both group and project' do
+            project = build(:project, group: group)
+            assign(:project, project)
 
-          expect(view.page_description).to match(/\d+ issues for term '#{search_term}'/)
-          expect(view.page_card_attributes).to eq("Namespace" => group.full_path, "Project" => project.full_path)
-        end
-      end
+            render
 
-      context 'search without full count' do
-        before do
-          assign(:without_count, true)
+            expect(view.page_description).to match(/\d+ issues for term '#{search_term}'/)
+            expect(view.page_card_attributes).to eq("Namespace" => group.full_path, "Project" => project.full_path)
+          end
         end
 
-        it 'renders meta tags for a group' do
-          render
+        context 'search without full count' do
+          before do
+            assign(:without_count, true)
+          end
 
-          expect(view.page_description).to match(/issues results for term '#{search_term}'/)
-          expect(view.page_card_attributes).to eq("Namespace" => group.full_path)
-        end
+          it 'renders meta tags for a group' do
+            render
+
+            expect(view.page_description).to match(/issues results for term '#{search_term}'/)
+            expect(view.page_card_attributes).to eq("Namespace" => group.full_path)
+          end
 
-        it 'renders meta tags for both group and project' do
-          project = build(:project, group: group)
-          assign(:project, project)
+          it 'renders meta tags for both group and project' do
+            project = build(:project, group: group)
+            assign(:project, project)
 
-          render
+            render
 
-          expect(view.page_description).to match(/issues results for term '#{search_term}'/)
-          expect(view.page_card_attributes).to eq("Namespace" => group.full_path, "Project" => project.full_path)
+            expect(view.page_description).to match(/issues results for term '#{search_term}'/)
+            expect(view.page_card_attributes).to eq("Namespace" => group.full_path, "Project" => project.full_path)
+          end
         end
       end
     end

spec/workers/gitlab/github_import/stage/import_attachments_worker_spec.rb

@@ -7,7 +7,12 @@
 
   let(:project) { create(:project) }
   let!(:group) { create(:group, projects: [project]) }
-  let(:feature_flag_state) { [group] }
+  let(:settings) { ::Gitlab::GithubImport::Settings.new(project) }
+  let(:stage_enabled) { true }
+
+  before do
+    settings.write({ attachments_import: stage_enabled })
+  end
 
   describe '#import' do
     let(:releases_importer) { instance_double('Gitlab::GithubImport::Importer::Attachments::ReleasesImporter') }
@@ -16,10 +21,6 @@
     let(:releases_waiter) { Gitlab::JobWaiter.new(2, '123') }
     let(:notes_waiter) { Gitlab::JobWaiter.new(3, '234') }
 
-    before do
-      stub_feature_flags(github_importer_attachments_import: feature_flag_state)
-    end
-
     it 'imports release attachments' do
       expect(Gitlab::GithubImport::Importer::Attachments::ReleasesImporter)
         .to receive(:new)
@@ -40,8 +41,8 @@
       worker.import(client, project)
     end
 
-    context 'when feature flag is disabled' do
-      let(:feature_flag_state) { false }
+    context 'when stage is disabled' do
+      let(:stage_enabled) { false }
 
       it 'skips release attachments import and calls next stage' do
         expect(Gitlab::GithubImport::Importer::Attachments::ReleasesImporter).not_to receive(:new)

spec/workers/gitlab/github_import/stage/import_issue_events_worker_spec.rb

@@ -7,23 +7,21 @@
 
   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 @@
       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)

spec/workers/gitlab/github_import/stage/import_issues_and_diff_notes_worker_spec.rb

@@ -6,6 +6,13 @@
   let(:project) { create(:project) }
   let(:worker) { described_class.new }
 
+  let(:settings) { ::Gitlab::GithubImport::Settings.new(project) }
+  let(:single_endpoint_optional_stage) { true }
+
+  before do
+    settings.write({ single_endpoint_notes_import: single_endpoint_optional_stage })
+  end
+
   describe '#import' do
     it 'imports the issues and diff notes' do
       client = double(:client)
@@ -33,37 +40,18 @@
   end
 
   describe '#importers' do
-    context 'when project group is present' do
-      let_it_be(:project) { create(:project) }
-      let_it_be(:group) { create(:group, projects: [project]) }
-
-      context 'when feature flag github_importer_single_endpoint_notes_import is enabled' do
-        it 'includes single endpoint diff notes importer' do
-          project = create(:project)
-          group = create(:group, projects: [project])
-
-          stub_feature_flags(github_importer_single_endpoint_notes_import: group)
-
-          expect(worker.importers(project)).to contain_exactly(
-            Gitlab::GithubImport::Importer::IssuesImporter,
-            Gitlab::GithubImport::Importer::SingleEndpointDiffNotesImporter
-          )
-        end
-      end
-
-      context 'when feature flag github_importer_single_endpoint_notes_import is disabled' do
-        it 'includes default diff notes importer' do
-          stub_feature_flags(github_importer_single_endpoint_notes_import: false)
-
-          expect(worker.importers(project)).to contain_exactly(
-            Gitlab::GithubImport::Importer::IssuesImporter,
-            Gitlab::GithubImport::Importer::DiffNotesImporter
-          )
-        end
+    context 'when optional stage single_endpoint_notes_import is enabled' do
+      it 'includes single endpoint diff notes importer' do
+        expect(worker.importers(project)).to contain_exactly(
+          Gitlab::GithubImport::Importer::IssuesImporter,
+          Gitlab::GithubImport::Importer::SingleEndpointDiffNotesImporter
+        )
       end
     end
 
-    context 'when project group is missing' do
+    context 'when optional stage single_endpoint_notes_import is disabled' do
+      let(:single_endpoint_optional_stage) { false }
+
       it 'includes default diff notes importer' do
         expect(worker.importers(project)).to contain_exactly(
           Gitlab::GithubImport::Importer::IssuesImporter,

spec/workers/gitlab/github_import/stage/import_notes_worker_spec.rb

@@ -6,6 +6,13 @@
   let(:project) { create(:project) }
   let(:worker) { described_class.new }
 
+  let(:settings) { ::Gitlab::GithubImport::Settings.new(project) }
+  let(:single_endpoint_optional_stage) { true }
+
+  before do
+    settings.write({ single_endpoint_notes_import: single_endpoint_optional_stage })
+  end
+
   describe '#import' do
     it 'imports all the notes' do
       client = double(:client)
@@ -33,37 +40,19 @@
   end
 
   describe '#importers' do
-    context 'when project group is present' do
-      let_it_be(:project) { create(:project) }
-      let_it_be(:group) { create(:group, projects: [project]) }
-
-      context 'when feature flag github_importer_single_endpoint_notes_import is enabled' do
-        it 'includes single endpoint mr and issue notes importers' do
-          project = create(:project)
-          group = create(:group, projects: [project])
-
-          stub_feature_flags(github_importer_single_endpoint_notes_import: group)
-
-          expect(worker.importers(project)).to contain_exactly(
-            Gitlab::GithubImport::Importer::SingleEndpointMergeRequestNotesImporter,
-            Gitlab::GithubImport::Importer::SingleEndpointIssueNotesImporter
-          )
-        end
-      end
-
-      context 'when feature flag github_importer_single_endpoint_notes_import is disabled' do
-        it 'includes default notes importer' do
-          stub_feature_flags(github_importer_single_endpoint_notes_import: false)
-
-          expect(worker.importers(project)).to contain_exactly(
-            Gitlab::GithubImport::Importer::NotesImporter
-          )
-        end
+    context 'when settings single_endpoint_notes_import is enabled' do
+      it 'includes single endpoint mr and issue notes importers' do
+        expect(worker.importers(project)).to contain_exactly(
+          Gitlab::GithubImport::Importer::SingleEndpointMergeRequestNotesImporter,
+          Gitlab::GithubImport::Importer::SingleEndpointIssueNotesImporter
+        )
       end
     end
 
-    context 'when project group is missing' do
-      it 'includes default diff notes importer' do
+    context 'when settings single_endpoint_notes_import is disabled' do
+      let(:single_endpoint_optional_stage) { false }
+
+      it 'includes default notes importer' do
         expect(worker.importers(project)).to contain_exactly(
           Gitlab::GithubImport::Importer::NotesImporter
         )