Use ActiveJob::QueueAdapters::TestAdapter for tests

mayorova · mayorova · commit 7bdf655becef · 2026-03-26T22:00:05.000+01:00
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -69,6 +69,8 @@
 
   config.active_support.test_order = :random
 
+  config.active_job.queue_adapter = :test
+
   config.three_scale.payments.merge!(enabled: true, active_merchant_mode: :test, active_merchant_logging: false)
 
   config.three_scale.rolling_updates.raise_error_unknown_features = true
diff --git a/features/buyers/accounts/bulk_operations.feature b/features/buyers/accounts/bulk_operations.feature
@@ -79,6 +79,7 @@ Feature: Buyer accounts bulk operations
       And press "Send"
       Then "alice@example.com" should receive no emails
 
+    @emails
     Scenario: Send email in bulk
       Given they go to the buyer accounts page
       And "alice@example.com" should receive no emails
diff --git a/features/buyers/service_contracts/bulk_operations.feature b/features/buyers/service_contracts/bulk_operations.feature
@@ -57,6 +57,7 @@ Feature: Audience > Accounts > Service subscriptions bulk operations
     And press "Send"
     Then "jane@example.com" should receive no emails
 
+  @emails
   Scenario: Send email in bulk
     Given "jane@example.com" should receive no emails
     And "bob@example.com" should receive no emails
diff --git a/features/developer_portal/admin/account/invoices.feature b/features/developer_portal/admin/account/invoices.feature
@@ -1,3 +1,4 @@
+@emails
 Feature: Dev Portal Buyer Invoices
   In order not be confused
   As a buyer
diff --git a/features/developer_portal/buyer_password_reset.feature b/features/developer_portal/buyer_password_reset.feature
@@ -29,6 +29,7 @@ Feature: Buyer password reset
       And the current domain is foo.3scale.localhost
       And they go to the login page
 
+    @emails
     Scenario: Reset password of an existing user
       Given they follow "Forgot password?"
       And they fill in "Email" with "zed@3scale.localhost"
@@ -46,6 +47,7 @@ Feature: Buyer password reset
       And they press "Sign in"
       Then they should be logged in as "zed"
 
+    @emails
     Scenario: Invalid email
       Given no user exists with an email of "bob@3scale.localhost"
       And they follow "Forgot password?"
@@ -54,6 +56,7 @@ Feature: Buyer password reset
       Then they should see "A password reset link will be sent to bob@3scale.localhost if a user exists with this email"
       And "bob@3scale.localhost" should receive no emails
 
+    @emails
     Scenario: Wrong confirmation
       Given they follow "Forgot password?"
       And they fill in "Email" with "zed@3scale.localhost"
@@ -65,6 +68,7 @@ Feature: Buyer password reset
       Then they should see the password confirmation error
       And the password of user "zed" should not be "monkey"
 
+    @emails
     Scenario: Blank passwords
       When they follow "Forgot password?"
       And they fill in "Email" with "zed@3scale.localhost"
diff --git a/features/old/buyers/invitations/for_admins.feature b/features/old/buyers/invitations/for_admins.feature
@@ -54,6 +54,7 @@ Feature: Buyer Account Invitations
     And confirm the dialog
     Then I should not see invitation for "alice@lolcats.com"
 
+  @emails
   Scenario: Resending invitations
     Given an invitation sent to "invited@lolcats.com" to join account "lol cats"
     And an invitation sent to "pending@lolcats.com" to join account "lol cats"
diff --git a/features/old/cms/email_templates.feature b/features/old/cms/email_templates.feature
@@ -55,6 +55,7 @@ Feature: Email templates management
     And field "Bcc" should be "bcc@3scale.localhost"
     And field "Cc" should be "cc@3scale.localhost"
 
+  @emails
   Scenario: New signup email template
     Given admin of account "foo.3scale.localhost" has email "foo@3scale.localhost"
       And all the rolling updates features are off
diff --git a/features/old/finance/reporting/buyer.feature b/features/old/finance/reporting/buyer.feature
@@ -1,3 +1,4 @@
+@emails
 Feature: Billing Reporting
   In order to be informed about my spendings
   As a buyer of a provider that has billing enabled
diff --git a/features/old/signup/providers.feature b/features/old/signup/providers.feature
@@ -1,4 +1,4 @@
-@audit @javascript
+@audit @javascript @emails
 Feature: Signup
   In order to use Red Hat 3scale API management infrastructure
   As a wanna-be API provider
diff --git a/features/provider/admin/account/invitations.feature b/features/provider/admin/account/invitations.feature
@@ -76,6 +76,7 @@ Feature: Provider Account Settings User Invitations
       Then field "Send invitation to" has inline error "This invitation has already been sent."
       And no invitation should be sent to "alice@example.org"
 
+    @emails
     Scenario: Accepting an invitation with different email
       Given an invitation sent to "alice@example.org" to join account "foo.3scale.localhost"
       And the invitee follows the link to sign up to the provider in the invitation sent to "alice@example.org"
diff --git a/features/provider/admin/applications/bulk_operations.feature b/features/provider/admin/applications/bulk_operations.feature
@@ -66,6 +66,7 @@ Feature: Audience > Applications > Bulk operations
       | Body    |                   |
     Then the buyer has received no emails
 
+  @emails
   Scenario: Send email in bulk
     Given the buyer has received no emails
     And item "Bob's App" is selected
diff --git a/features/provider/admin/applications/show/change_plan.feature b/features/provider/admin/applications/show/change_plan.feature
@@ -46,6 +46,7 @@ Feature: Application plan change card
       And press "Change" within the change plan card
       Then they should see a toast alert with text "Plan changed to 'Premium'"
 
+    @emails
     Scenario: Buyer is notified if their plan is changed
       Given they go to the application's admin page
       And they select "Premium" from "Change plan" within the change plan card
diff --git a/features/provider/password/reset.feature b/features/provider/password/reset.feature
@@ -48,6 +48,7 @@ Feature: Provider password reset
       Then they should see "We sent an email with password reset instructions to: unknown@not.valid"
       Then the current page is the provider login page
 
+    @emails
     Scenario: Set a new password
       Given the user has requested a new password
       And follow the link found in the provider password reset email send to "pepe@example.com"
@@ -58,6 +59,7 @@ Feature: Provider password reset
       And the current page is the provider login page
       And the user is now able to sign in with password "monkey"
 
+    @emails
     Scenario: New password form validation
       Given the user has requested a new password
       And follow the link found in the provider password reset email send to "pepe@example.com"
@@ -73,13 +75,15 @@ Feature: Provider password reset
       Given they go to the provider password page with invalid password reset token
       Then they should see "The password reset token is invalid"
 
+    @emails
     Scenario: Password reset token expires after 1 day
       Given time flies to 12th June 2009
       And the user has requested a new password
       When time flies to 14th June 2009
       And follow the link found in the provider password reset email send to "pepe@example.com"
       Then they should see "The password reset token is invalid"
 
+    @emails
     Scenario: Reuse a password reset token
       Given the user has requested a new password
       And follow the link found in the provider password reset email send to "pepe@example.com"
diff --git a/features/support/email.rb b/features/support/email.rb
@@ -14,7 +14,12 @@ def find_latest_email(options)
 
 World(EmailSupport)
 
-Before do
-  Sidekiq::Job.clear_all
+Before '@emails' do
   ActionMailer::Base.deliveries.clear
+  @original_queue_adapter = ActiveJob::Base.queue_adapter
+  ActiveJob::Base.queue_adapter = :inline
+end
+
+After '@emails' do
+  ActiveJob::Base.queue_adapter = @original_queue_adapter
 end
diff --git a/features/support/sphinx.rb b/features/support/sphinx.rb
@@ -6,7 +6,9 @@
 end
 
 Before '@search' do
-  Sidekiq::Job.clear_all
+  @original_queue_adapter = ActiveJob::Base.queue_adapter
+  ActiveJob::Base.queue_adapter = :inline
+
   ::ThinkingSphinx::Test.stop
   ::ThinkingSphinx::Test.clear
   ::ThinkingSphinx::Test.init
@@ -19,4 +21,6 @@
 After '@search' do
   ::ThinkingSphinx::Test.disable_search_jobs!
   ::ThinkingSphinx::Test.stop
+
+  ActiveJob::Base.queue_adapter = @original_queue_adapter
 end
diff --git a/test/unit/tasks/multitenant/tenants_test.rb b/test/unit/tasks/multitenant/tenants_test.rb
@@ -167,14 +167,19 @@ class StaleThrottledDeleteTest < ActiveSupport::TestCase
         setup do
           @provider1 = FactoryBot.create(:simple_provider, state: "scheduled_for_deletion", state_changed_at: 7.months.ago)
           @provider2 = FactoryBot.create(:simple_provider, state: "scheduled_for_deletion", state_changed_at: 5.months.ago)
+
+          @original_queue_adapter = ActiveJob::Base.queue_adapter
+          ActiveJob::Base.queue_adapter = :sidekiq
           Sidekiq::Testing.disable!
         end
 
         teardown do
           Sidekiq::ScheduledSet.new.each(&:delete)
           Sidekiq::Queue.new.each(&:delete)
           assert_empty Sidekiq::Workers.new.to_a
+
           Sidekiq::Testing.fake!
+          ActiveJob::Base.queue_adapter = @original_queue_adapter
         end
 
         test "do not schedule more than target concurrency number of jobs" do
diff --git a/test/workers/backend_delete_application_worker_test.rb b/test/workers/backend_delete_application_worker_test.rb
@@ -3,6 +3,8 @@
 require 'test_helper'
 
 class BackendDeleteApplicationWorkerTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
   test 'perform' do
     application = FactoryBot.create(:simple_cinstance, application_id: 'backend-app-id')
     service = application.service
@@ -13,13 +15,13 @@ class BackendDeleteApplicationWorkerTest < ActiveSupport::TestCase
     ThreeScale::Core::Application.expects(:delete).with(service.backend_id, application.application_id).in_sequence(seq)
 
     event = Applications::ApplicationDeletedEvent.create_and_publish!(application)
-    Sidekiq::Testing.inline! { BackendDeleteApplicationWorker.perform_later(event.event_id) }
+    perform_enqueued_jobs { BackendDeleteApplicationWorker.perform_later(event.event_id) }
   end
 
   test 'perform reports error when the event does not exist' do
     System::ErrorReporting.expects(:report_error).once.with do |exception, options|
       exception.is_a?(ActiveRecord::RecordNotFound) && (parameters = options[:parameters]) && parameters[:event_id] == 'fake-id'
     end
-    Sidekiq::Testing.inline! { BackendDeleteApplicationWorker.perform_later('fake-id') }
+    perform_enqueued_jobs { BackendDeleteApplicationWorker.perform_later('fake-id') }
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@emails`
`1`	`2`	`Feature: Dev Portal Buyer Invoices`
`2`	`3`	`In order not be confused`
`3`	`4`	`As a buyer`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@emails`
`1`	`2`	`Feature: Billing Reporting`
`2`	`3`	`In order to be informed about my spendings`
`3`	`4`	`As a buyer of a provider that has billing enabled`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@audit @javascript`
	`1`	`+@audit @javascript @emails`
`2`	`2`	`Feature: Signup`
`3`	`3`	`In order to use Red Hat 3scale API management infrastructure`
`4`	`4`	`As a wanna-be API provider`