Use Sidekiq `fake` mode (its default) in the test environment22992-default-to-sidekiq-testing-fake

Signed-off-by: Rémy Coutable <remy@rymai.me>

15 files changed, 34 insertions, 41 deletions

diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index a9530becb65..f7a5c8b912f 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -139,7 +139,7 @@ feature 'Contributions Calendar', :js do
       end
     end
 
-    describe '1 issue creation calendar activity' do
+    describe '1 issue creation calendar activity', :sidekiq do
       before do
         Issues::CreateService.new(contributed_project, user, issue_params).execute
       end
@@ -171,7 +171,7 @@ feature 'Contributions Calendar', :js do
       it_behaves_like 'a day with activity', contribution_count: 10
     end
 
-    describe 'calendar activity on two days' do
+    describe 'calendar activity on two days', :sidekiq do
       before do
         push_code_contribution
 
@@ -181,16 +181,12 @@ feature 'Contributions Calendar', :js do
       end
       include_context 'visit user page'
 
-      it 'displays calendar activity squares for both days' do
+      it 'displays calendar activity squares' do
         expect(page).to have_selector(get_cell_color_selector(1), count: 2)
-      end
 
-      it 'displays calendar activity square for yesterday' do
         yesterday = Date.yesterday.strftime(date_format)
         expect(page).to have_selector(get_cell_date_selector(1, yesterday), count: 1)
-      end
 
-      it 'displays calendar activity square for today' do
         today = Date.today.strftime(date_format)
         expect(page).to have_selector(get_cell_date_selector(1, today), count: 1)
       end
diff --git a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
index 539d7e9ff01..6f1f0125c0a 100644
--- a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
+++ b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
@@ -63,16 +63,14 @@ describe 'User creates branch and merge request on issue page', :js do
         expect(page).to have_button('Create branch', disabled: true)
       end
 
-      context 'when branch name is auto-generated' do
+      context 'when branch name is auto-generated', :sidekiq do
         it 'creates a merge request' do
-          perform_enqueued_jobs do
-            select_dropdown_option('create-mr')
+          select_dropdown_option('create-mr')
 
-            expect(page).to have_content('WIP: Resolve "Cherry-Coloured Funk"')
-            expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
+          expect(page).to have_content('WIP: Resolve "Cherry-Coloured Funk"')
+          expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
 
-            wait_for_requests
-          end
+          wait_for_requests
 
           visit project_issue_path(project, issue)
 
@@ -93,16 +91,14 @@ describe 'User creates branch and merge request on issue page', :js do
       context 'when branch name is custom' do
         let(:branch_name) { 'custom-branch-name' }
 
-        it 'creates a merge request' do
-          perform_enqueued_jobs do
-            select_dropdown_option('create-mr', branch_name)
+        it 'creates a merge request', :sidekiq do
+          select_dropdown_option('create-mr', branch_name)
 
-            expect(page).to have_content('WIP: Resolve "Cherry-Coloured Funk"')
-            expect(page).to have_content('Request to merge custom-branch-name into')
-            expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
+          expect(page).to have_content('WIP: Resolve "Cherry-Coloured Funk"')
+          expect(page).to have_content('Request to merge custom-branch-name into')
+          expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
 
-            wait_for_requests
-          end
+          wait_for_requests
 
           visit project_issue_path(project, issue)
 
diff --git a/spec/features/merge_requests/form_spec.rb b/spec/features/merge_requests/form_spec.rb
index 1dcc1e139a0..b92860dc72b 100644
--- a/spec/features/merge_requests/form_spec.rb
+++ b/spec/features/merge_requests/form_spec.rb
@@ -188,7 +188,7 @@ describe 'New/edit merge request', :js do
           })
       end
 
-      it 'creates new merge request' do
+      it 'creates new merge request', :sidekiq do
         click_button 'Assignee'
         page.within '.dropdown-menu-user' do
           click_link user.name
diff --git a/spec/features/merge_requests/user_uses_slash_commands_spec.rb b/spec/features/merge_requests/user_uses_slash_commands_spec.rb
index ee0766f1192..982bb2c7e88 100644
--- a/spec/features/merge_requests/user_uses_slash_commands_spec.rb
+++ b/spec/features/merge_requests/user_uses_slash_commands_spec.rb
@@ -77,11 +77,10 @@ feature 'Merge Requests > User uses quick actions', :js do
 
     describe 'merging the MR from the note' do
       context 'when the current user can merge the MR' do
-        it 'merges the MR' do
+        it 'merges the MR', :sidekiq do
           write_note("/merge")
 
           expect(page).to have_content 'Commands applied'
-
           expect(merge_request.reload).to be_merged
         end
       end
diff --git a/spec/features/projects/badges/pipeline_badge_spec.rb b/spec/features/projects/badges/pipeline_badge_spec.rb
index b83ea8f4eaa..9f310cd3864 100644
--- a/spec/features/projects/badges/pipeline_badge_spec.rb
+++ b/spec/features/projects/badges/pipeline_badge_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Pipeline Badge' do
+feature 'Pipeline Badge', :sidekiq do
   set(:project) { create(:project, :repository, :public) }
   let(:ref) { project.default_branch }
 
diff --git a/spec/features/projects/deploy_keys_spec.rb b/spec/features/projects/deploy_keys_spec.rb
index e445758cb5e..97d8c9c66db 100644
--- a/spec/features/projects/deploy_keys_spec.rb
+++ b/spec/features/projects/deploy_keys_spec.rb
@@ -14,7 +14,7 @@ describe 'Project deploy keys', :js do
       create(:deploy_keys_project, project: project)
     end
 
-    it 'removes association between project and deploy key' do
+    it 'removes association between project and deploy key', :sidekiq do
       visit project_settings_repository_path(project)
 
       page.within(find('.deploy-keys')) do
diff --git a/spec/models/cycle_analytics/plan_spec.rb b/spec/models/cycle_analytics/plan_spec.rb
index 6fbb2a2d102..cb814414a43 100644
--- a/spec/models/cycle_analytics/plan_spec.rb
+++ b/spec/models/cycle_analytics/plan_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'CycleAnalytics#plan' do
+describe 'CycleAnalytics#plan', :sidekiq do
   extend CycleAnalyticsHelpers::TestGeneration
 
   let(:project) { create(:project, :repository) }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index dd9e8498519..a3cbe1d3c80 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1594,7 +1594,7 @@ describe Project do
         .and_call_original
     end
 
-    it 'imports a project' do
+    it 'imports a project', :sidekiq do
       expect_any_instance_of(RepositoryImportWorker).to receive(:perform).and_call_original
 
       expect { project.import_schedule }.to change { project.import_jid }
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index cc3d4e7da49..51c5286359d 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GitPushService, services: true do
+describe GitPushService, :sidekiq do
   include RepoHelpers
 
   let(:user)     { create(:user) }
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index a047f891ab2..2188e560710 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -52,7 +52,7 @@ describe MergeRequests::CreateService do
         expect(Todo.where(attributes).count).to be_zero
       end
 
-      it 'creates exactly 1 create MR event' do
+      it 'creates exactly 1 create MR event', :sidekiq do
         attributes = {
           action: Event::CREATED,
           target_id: merge_request.id,
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 47412110b4b..271caf85638 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -602,7 +602,7 @@ describe SystemNoteService do
       end
     end
 
-    context 'commit with cross-reference from fork' do
+    context 'commit with cross-reference from fork', :sidekiq do
       let(:author2) { create(:project_member, :reporter, user: create(:user), project: project).user }
       let(:forked_project) { Projects::ForkService.new(project, author2).execute }
       let(:commit2) { forked_project.commit }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f94fb8733d5..83384790548 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -106,6 +106,8 @@ RSpec.configure do |config|
     allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([true, nil])
     # Enable all features by default for testing
     allow(Feature).to receive(:enabled?) { true }
+
+    Sidekiq::Worker.clear_all
   end
 
   config.before(:example, :request_store) do
diff --git a/spec/support/quick_actions_helpers.rb b/spec/support/quick_actions_helpers.rb
index 361190aa352..5af13260c78 100644
--- a/spec/support/quick_actions_helpers.rb
+++ b/spec/support/quick_actions_helpers.rb
@@ -1,10 +1,8 @@
 module QuickActionsHelpers
   def write_note(text)
-    Sidekiq::Testing.fake! do
-      page.within('.js-main-target-form') do
-        fill_in 'note[note]', with: text
-        find('.js-comment-submit-button').click
-      end
+    page.within('.js-main-target-form') do
+      fill_in 'note[note]', with: text
+      find('.js-comment-submit-button').click
     end
   end
 end
diff --git a/spec/support/sidekiq.rb b/spec/support/sidekiq.rb
index d143014692d..f6e7ede2483 100644
--- a/spec/support/sidekiq.rb
+++ b/spec/support/sidekiq.rb
@@ -1,12 +1,14 @@
-require 'sidekiq/testing/inline'
+require 'sidekiq/testing'
 
 Sidekiq::Testing.server_middleware do |chain|
   chain.add Gitlab::SidekiqStatus::ServerMiddleware
 end
 
 RSpec.configure do |config|
-  config.after(:each, :sidekiq) do
-    Sidekiq::Worker.clear_all
+  config.around(:each, :sidekiq) do |example|
+    Sidekiq::Testing.inline! do
+      example.run
+    end
   end
 
   config.after(:each, :sidekiq, :redis) do
diff --git a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb
index 3ca67114558..1ae58f6b152 100644
--- a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb
@@ -22,7 +22,7 @@ describe 'projects/merge_requests/_commits.html.haml' do
     assign(:commits, merge_request.commits)
   end
 
-  it 'shows commits from source project' do
+  it 'shows commits from source project', :sidekiq do
     render
 
     commit = merge_request.commits.first # HEAD