Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Simplify testing events
Damian Legawiecf199a17cb341
diff --git a/admin/spec/controllers/spree/admin/invitations_controller_spec.rb b/admin/spec/controllers/spree/admin/invitations_controller_spec.rbindex 5be612767e..6ea89e50a9 100644--- a/admin/spec/controllers/spree/admin/invitations_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/invitations_controller_spec.rb@@ -252,13 +252,10 @@ RSpec.describe Spree::Admin::InvitationsController, type: :controller dodescribe 'PUT #resend' dostub_authorization!- before { Spree::Events.activate! }- after { Spree::Events.reset! }-- it 'publishes invitation.resend event' do+ it 'calls resend! on the invitation' doinvitation- clear_enqueued_jobs- expect { put :resend, params: { id: invitation.id } }.to have_enqueued_job(Spree::Events::SubscriberJob)+ expect_any_instance_of(Spree::Invitation).to receive(:resend!)+ put :resend, params: { id: invitation.id }endit 'redirects to invitations path' dodiff --git a/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rb b/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rbindex 2fced5c138..b8d192edbe 100644--- a/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rb+++ b/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rb@@ -3,26 +3,23 @@require 'spec_helper'RSpec.describe Spree::Admin::ImportRowSubscriber do- before { Spree::Events.activate! }- after { Spree::Events.reset! }-describe '.subscription_patterns' do- it 'subscribes to import_row.complete event' do- expect(described_class.subscription_patterns).to include('import_row.complete')+ it 'subscribes to import_row.completed event' do+ expect(described_class.subscription_patterns).to include('import_row.completed')end- it 'subscribes to import_row.fail event' do- expect(described_class.subscription_patterns).to include('import_row.fail')+ it 'subscribes to import_row.failed event' do+ expect(described_class.subscription_patterns).to include('import_row.failed')endenddescribe '.event_handlers' do- it 'routes import_row.complete to update_import_view' do- expect(described_class.event_handlers['import_row.complete']).to eq(:update_import_view)+ it 'routes import_row.completed to update_import_view' do+ expect(described_class.event_handlers['import_row.completed']).to eq(:update_import_view)end- it 'routes import_row.fail to update_import_view' do- expect(described_class.event_handlers['import_row.fail']).to eq(:update_import_view)+ it 'routes import_row.failed to update_import_view' do+ expect(described_class.event_handlers['import_row.failed']).to eq(:update_import_view)endend@@ -36,7 +33,7 @@ RSpec.describe Spree::Admin::ImportRowSubscriber doit 'updates the import view' dosubscriber = described_class.newevent = Spree::Event.new(- name: 'import_row.complete',+ name: 'import_row.completed',payload: { 'id' => import_row.id })@@ -51,7 +48,7 @@ RSpec.describe Spree::Admin::ImportRowSubscriber doit 'does nothing' dosubscriber = described_class.newevent = Spree::Event.new(- name: 'import_row.complete',+ name: 'import_row.completed',payload: {})@@ -66,7 +63,7 @@ RSpec.describe Spree::Admin::ImportRowSubscriber doit 'does nothing' dosubscriber = described_class.newevent = Spree::Event.new(- name: 'import_row.complete',+ name: 'import_row.completed',payload: { 'id' => -999 })diff --git a/admin/spec/subscribers/spree/admin/import_subscriber_spec.rb b/admin/spec/subscribers/spree/admin/import_subscriber_spec.rbindex db1040db4a..e3ea5c58fd 100644--- a/admin/spec/subscribers/spree/admin/import_subscriber_spec.rb+++ b/admin/spec/subscribers/spree/admin/import_subscriber_spec.rb@@ -3,18 +3,15 @@require 'spec_helper'RSpec.describe Spree::Admin::ImportSubscriber do- before { Spree::Events.activate! }- after { Spree::Events.reset! }-describe '.subscription_patterns' do- it 'subscribes to import.complete event' do- expect(described_class.subscription_patterns).to include('import.complete')+ it 'subscribes to import.completed event' do+ expect(described_class.subscription_patterns).to include('import.completed')endenddescribe '.event_handlers' do- it 'routes import.complete to update_loader_in_import_view' do- expect(described_class.event_handlers['import.complete']).to eq(:update_loader_in_import_view)+ it 'routes import.completed to update_loader_in_import_view' do+ expect(described_class.event_handlers['import.completed']).to eq(:update_loader_in_import_view)endend@@ -27,7 +24,7 @@ RSpec.describe Spree::Admin::ImportSubscriber doit 'broadcasts update to import loader' dosubscriber = described_class.newevent = Spree::Event.new(- name: 'import.complete',+ name: 'import.completed',payload: { 'id' => import.id })@@ -50,7 +47,7 @@ RSpec.describe Spree::Admin::ImportSubscriber doit 'does nothing' dosubscriber = described_class.newevent = Spree::Event.new(- name: 'import.complete',+ name: 'import.completed',payload: {})@@ -64,7 +61,7 @@ RSpec.describe Spree::Admin::ImportSubscriber doit 'does nothing' dosubscriber = described_class.newevent = Spree::Event.new(- name: 'import.complete',+ name: 'import.completed',payload: { 'id' => -999 })diff --git a/api/spec/serializers/spree/v2/storefront/taxon_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/taxon_serializer_spec.rbindex 254ff4c4ed..8183daaa6c 100644--- a/api/spec/serializers/spree/v2/storefront/taxon_serializer_spec.rb+++ b/api/spec/serializers/spree/v2/storefront/taxon_serializer_spec.rb@@ -160,10 +160,7 @@ describe Spree::V2::Storefront::TaxonSerializer do]},image: {- data: {- id: taxon.icon.id.to_s,- type: :taxon_image- }+ data: nil},metafields: {data: [diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 7c7b2391ad..43e0e2221a 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -202,8 +202,8 @@ module Spreejoins(:refunds).group(:id).having("sum(#{Spree::Refund.table_name}.amount) = #{Spree::Order.table_name}.total")}scope :partially_refunded, lambda {- joins(:refunds).group(:id).having("sum(#{Spree::Refund.table_name}.amount) < #{Spree::Order.table_name}.total")- }+ joins(:refunds).group(:id).having("sum(#{Spree::Refund.table_name}.amount) < #{Spree::Order.table_name}.total")+ }scope :with_deleted_bill_address, -> { joins(:bill_address).where.not(Address.table_name => { deleted_at: nil }) }scope :with_deleted_ship_address, -> { joins(:ship_address).where.not(Address.table_name => { deleted_at: nil }) }@@ -523,9 +523,6 @@ module Spreetouch :completed_at- deliver_order_confirmation_email unless confirmation_delivered?- deliver_store_owner_order_notification_email if deliver_store_owner_order_notification_email?-send_order_placed_webhookconsider_riskdiff --git a/core/app/models/spree/order/checkout.rb b/core/app/models/spree/order/checkout.rbindex f4043f9b80..0baf28c504 100644--- a/core/app/models/spree/order/checkout.rb+++ b/core/app/models/spree/order/checkout.rb@@ -118,11 +118,12 @@ module Spreebefore_transition to: :resumed, do: proc { |order| order.state_machine_resumed = true }after_transition to: :complete, do: :finalize!- after_transition to: :complete, do: :use_all_coupon_codes- after_transition to: :complete, do: :redeem_gift_cardafter_transition to: :resumed, do: :after_resumeafter_transition to: :canceled, do: :after_cancel+ after_transition to: :complete, do: :use_all_coupon_codes+ after_transition to: :complete, do: :redeem_gift_cardafter_transition to: :complete, do: :subscribe_to_newsletter+ after_transition to: :complete, do: :publish_order_completed_eventafter_transition from: any - :cart, to: any - [:confirm, :complete] do |order|order.update_totals@@ -133,6 +134,10 @@ module Spreealias_method :save_state, :saveend+ def publish_order_completed_event+ publish_event('order.completed')+ end+def subscribe_to_newsletterreturn unless accept_marketing?diff --git a/core/app/models/spree/order/emails.rb b/core/app/models/spree/order/emails.rbindex 02eef8419f..60e3202251 100644--- a/core/app/models/spree/order/emails.rb+++ b/core/app/models/spree/order/emails.rb@@ -4,10 +4,7 @@ module Spreeextend ActiveSupport::Concerndef deliver_order_confirmation_email- # you can overwrite this method in your application / extension to send out the confirmation email- # or use `spree_emails` gem- # YourEmailVendor.deliver_order_confirmation_email(id) # `id` = ID of the Order being sent, you can also pass the entire Order object using `self`- # update_column(:confirmation_delivered, true) # if you would like to mark that the email was sent+ Spree::Deprecation.warn('Spree::Order#deliver_order_confirmation_email is deprecated and will be removed in Spree 6.0. Please create a Subscriber for order.completed event.')end# If you would like to also send confirmation email to store owner(s)@@ -16,16 +13,11 @@ module Spreeenddef deliver_store_owner_order_notification_email- # you can overwrite this method in your application / extension to send out the confirmation email- # or use `spree_emails` gem- # YourEmailVendor.deliver_store_owner_notification_email(id) # `id` = ID of the Order being sent, you can also pass the entire Order object using `self`- # update_column(:store_owner_notification_delivered, true) # if you would like to mark that the email was sent+ Spree::Deprecation.warn('Spree::Order#deliver_store_owner_order_notification_email is deprecated and will be removed in Spree 6.0. Please create a Subscriber for order.completed event.')enddef send_cancel_email- # you can overwrite this method in your application / extension to send out the confirmation email- # or use `spree_emails` gem- # YourEmailVendor.deliver_cancel_email(id) # `id` = ID of the Order being sent, you can also pass the entire Order object using `self`+ Spree::Deprecation.warn('Spree::Order#send_cancel_email is deprecated and will be removed in Spree 6.0. Please create a Subscriber for order.canceled event.')endendenddiff --git a/core/app/services/spree/newsletter/verify.rb b/core/app/services/spree/newsletter/verify.rbindex 10db8a1a88..14244117c4 100644--- a/core/app/services/spree/newsletter/verify.rb+++ b/core/app/services/spree/newsletter/verify.rb@@ -28,7 +28,7 @@ module Spreeenddef publish_event- subscriber.publish_event('newsletter_subscriber.verify')+ subscriber.publish_event('newsletter_subscriber.verified')endendenddiff --git a/core/spec/models/spree/export_spec.rb b/core/spec/models/spree/export_spec.rbindex b82c9a049c..5bb87bf1fa 100644--- a/core/spec/models/spree/export_spec.rb+++ b/core/spec/models/spree/export_spec.rb@@ -7,13 +7,13 @@ RSpec.describe Spree::Export, :job, type: :model dolet(:search_params) { nil }let(:export) { build(:product_export, store: store, user: user, format: 'csv', search_params: search_params) }- context 'Event subscriber' do- before { Spree::Events.activate! }- after { Spree::Events.reset! }+ describe 'custom events' do+ describe 'export.created' do+ it 'publishes export.created event when saved' do+ expect(export).to receive(:publish_event).with('export.created')+ allow(export).to receive(:publish_event).with(anything)- describe 'on export.create' do- it 'enqueues the export generation job via subscriber' do- expect { export.save! }.to have_enqueued_job(Spree::Exports::GenerateJob).with(export.id)+ export.save!endendenddiff --git a/core/spec/models/spree/gift_card_spec.rb b/core/spec/models/spree/gift_card_spec.rbindex 3794482f84..0ecf1f65bb 100644--- a/core/spec/models/spree/gift_card_spec.rb+++ b/core/spec/models/spree/gift_card_spec.rb@@ -196,47 +196,25 @@ RSpec.describe Spree::GiftCard, type: :model dodescribe 'custom events' dolet(:store) { Spree::Store.default }- describe 'gift_card.redeem' do+ describe 'gift_card.redeemed' dolet(:gift_card) { create(:gift_card, state: :active, amount: 100, amount_used: 0, store: store) }- it 'publishes gift_card.redeem event when fully redeemed' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('gift_card.redeem') do |event|- received_event = event- end+ it 'publishes gift_card.redeemed event when fully redeemed' do+ expect(gift_card).to receive(:publish_event).with('gift_card.redeemed')+ allow(gift_card).to receive(:publish_event).with(anything)gift_card.redeem!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::GiftCard')- expect(received_event.metadata['model_id']).to eq(gift_card.id.to_s)-- Spree::Events.unsubscribe('gift_card.redeem', subscriber)- Spree::Events.reset!endend- describe 'gift_card.partial_redeem' do+ describe 'gift_card.partially_redeemed' dolet(:gift_card) { create(:gift_card, state: :active, amount: 100, amount_used: 0, store: store) }- it 'publishes gift_card.partial_redeem event when partially redeemed' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('gift_card.partial_redeem') do |event|- received_event = event- end+ it 'publishes gift_card.partially_redeemed event when partially redeemed' do+ expect(gift_card).to receive(:publish_event).with('gift_card.partially_redeemed')+ allow(gift_card).to receive(:publish_event).with(anything)gift_card.partial_redeem!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::GiftCard')- expect(received_event.metadata['model_id']).to eq(gift_card.id.to_s)-- Spree::Events.unsubscribe('gift_card.partial_redeem', subscriber)- Spree::Events.reset!endendenddiff --git a/core/spec/models/spree/import_spec.rb b/core/spec/models/spree/import_spec.rbindex 1e21e12544..89b75d5c78 100644--- a/core/spec/models/spree/import_spec.rb+++ b/core/spec/models/spree/import_spec.rb@@ -93,8 +93,8 @@ RSpec.describe Spree::Import, :job, type: :model doexpect { import.complete! }.to change(import, :status).from('processing').to('completed')end- it 'publishes import.complete event' do- expect(import).to receive(:send_import_completed_event)+ it 'publishes import.completed event' do+ expect(import).to receive(:publish_import_completed_event)import.complete!end@@ -382,7 +382,7 @@ RSpec.describe Spree::Import, :job, type: :model doenddescribe 'custom events' do- describe 'import.complete' do+ describe 'import.completed' dobefore doimport.save!import.start_mapping!@@ -390,22 +390,11 @@ RSpec.describe Spree::Import, :job, type: :model doimport.start_processing!end- it 'publishes import.complete event when completed' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('import.complete') do |event|- received_event = event- end+ it 'publishes import.completed event when completed' do+ expect(import).to receive(:publish_event).with('import.completed')+ allow(import).to receive(:publish_event).with(anything)import.complete!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::Imports::Products')- expect(received_event.metadata['model_id']).to eq(import.id.to_s)-- Spree::Events.unsubscribe('import.complete', subscriber)- Spree::Events.reset!endendenddiff --git a/core/spec/models/spree/invitation_spec.rb b/core/spec/models/spree/invitation_spec.rbindex d1897797dc..15339ada16 100644--- a/core/spec/models/spree/invitation_spec.rb+++ b/core/spec/models/spree/invitation_spec.rb@@ -49,24 +49,6 @@ RSpec.describe Spree::Invitation, type: :model doexpect(invitation.role).to eq(Spree::Role.default_admin_role)end- it 'publishes invitation.create event after create' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('invitation.create') do |event|- received_event = event- end-- invitation = build(:invitation)- invitation.save-- expect(received_event).to be_present- expect(received_event.payload['id']).to eq(invitation.id)-- Spree::Events.unsubscribe('invitation.create', subscriber)- Spree::Events.reset!- end-it 'sets invitee from email before validation' docreate(:admin_user, :without_admin_role, email: '[email protected]')@@ -99,20 +81,8 @@ RSpec.describe Spree::Invitation, type: :model doit 'publishes invitation.accept event' doinvitation.invitee = create(:admin_user, :without_admin_role)- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('invitation.accept') do |event|- received_event = event- end-+ expect(invitation).to receive(:publish_event).with('invitation.accepted')invitation.accept-- expect(received_event).to be_present- expect(received_event.payload['id']).to eq(invitation.id)-- Spree::Events.unsubscribe('invitation.accept', subscriber)- Spree::Events.reset!endit 'creates a resource user' do@@ -139,57 +109,24 @@ RSpec.describe Spree::Invitation, type: :model doenddescribe '#resend!' do- it 'publishes invitation.resend event if invitation is pending and not expired' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('invitation.resend') do |event|- received_event = event- end-+ it 'publishes invitation.resent event if invitation is pending and not expired' do+ expect(invitation).to receive(:publish_event).with('invitation.resent')invitation.resend!-- expect(received_event).to be_present- expect(received_event.payload['id']).to eq(invitation.id)-- Spree::Events.unsubscribe('invitation.resend', subscriber)- Spree::Events.reset!endit 'does not publish event if invitation is expired' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('invitation.resend') do |event|- received_event = event- end-allow(invitation).to receive(:expired?).and_return(true)+ expect(invitation).not_to receive(:publish_event)invitation.resend!-- expect(received_event).to be_nil-- Spree::Events.unsubscribe('invitation.resend', subscriber)- Spree::Events.reset!endit 'does not publish event if invitation is accepted' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('invitation.resend') do |event|- received_event = event- end-- invitation.invitee = create(:admin_user, spree_roles: [])+ invitation.invitee = create(:admin_user, :without_admin_role)+ expect(invitation).to receive(:publish_event).with('invitation.accepted')invitation.accept- invitation.resend!- expect(received_event).to be_nil-- Spree::Events.unsubscribe('invitation.resend', subscriber)- Spree::Events.reset!+ expect(invitation).not_to receive(:publish_event)+ invitation.resend!endend-enddiff --git a/core/spec/models/spree/payment_spec.rb b/core/spec/models/spree/payment_spec.rbindex 674b458d56..40739217fb 100644--- a/core/spec/models/spree/payment_spec.rb+++ b/core/spec/models/spree/payment_spec.rb@@ -1293,41 +1293,27 @@ describe Spree::Payment, type: :model doenddescribe 'events' do- let(:received_events) { [] }-- before do- Spree::Events.reset!- Spree::Events.activate!- end-- after { Spree::Events.reset! }-describe 'completed state transition' do- before do- Spree::Events.subscribe('payment.complete', async: false) { |e| received_events << e }- end-- it 'publishes payment.complete event' do+ it 'publishes payment.completed event' dopayment.started_processing!- payment.complete!+ expect(payment).to receive(:publish_event).with('payment.completed')+ allow(payment).to receive(:publish_event).with(anything)- expect(received_events.size).to eq(1)- expect(received_events.first.payload['id']).to eq(payment.id)+ payment.complete!endend- describe 'void state transition' do+ describe 'voided state transition' dobefore do- Spree::Events.subscribe('payment.void', async: false) { |e| received_events << e }payment.started_processing!payment.pend!end- it 'publishes payment.void event' do- payment.void!+ it 'publishes payment.voided event' do+ expect(payment).to receive(:publish_event).with('payment.voided')+ allow(payment).to receive(:publish_event).with(anything)- expect(received_events.size).to eq(1)- expect(received_events.first.payload['id']).to eq(payment.id)+ payment.void!endendenddiff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rbindex 263c693f3b..4389158437 100644--- a/core/spec/models/spree/product_spec.rb+++ b/core/spec/models/spree/product_spec.rb@@ -1656,126 +1656,59 @@ describe Spree::Product, type: :model doenddescribe 'custom events' do- describe 'product.activate' do+ describe 'product.activated' dolet(:product) { create(:product, status: 'draft', stores: [store]) }- it 'publishes product.activate event when activated' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('product.activate') do |event|- received_event = event- end+ it 'publishes product.activated event when activated' do+ expect(product).to receive(:publish_event).with('product.activated')+ allow(product).to receive(:publish_event).with(anything)product.activate!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::Product')- expect(received_event.metadata['model_id']).to eq(product.id.to_s)-- Spree::Events.unsubscribe('product.activate', subscriber)- Spree::Events.reset!endend- describe 'product.archive' do+ describe 'product.archived' dolet(:product) { create(:product, status: 'active', stores: [store]) }- it 'publishes product.archive event when archived' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('product.archive') do |event|- received_event = event- end+ it 'publishes product.archived event when archived' do+ expect(product).to receive(:publish_event).with('product.archived')+ allow(product).to receive(:publish_event).with(anything)product.archive!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::Product')- expect(received_event.metadata['model_id']).to eq(product.id.to_s)-- Spree::Events.unsubscribe('product.archive', subscriber)- Spree::Events.reset!endendenddescribe 'lifecycle events' do- before { Spree::Events.activate! }-- after { Spree::Events.reset! }-- describe 'product.create' do- it 'publishes product.create event when product is created' do- received_event = nil- Spree::Events.subscribe('product.create', async: false) do |event|- received_event = event- end+ describe 'product.created' do+ it 'publishes product.created event when product is created' do+ product = build(:product, stores: [store])+ expect(product).to receive(:publish_event).with('product.created')+ allow(product).to receive(:publish_event).with(anything)- product = create(:product, name: 'Test Product', stores: [store])-- expect(received_event).to be_present- expect(received_event.name).to eq('product.create')- expect(received_event.payload['id']).to eq(product.id)- expect(received_event.payload['name']).to eq('Test Product')- expect(received_event.metadata['model_class']).to eq('Spree::Product')- expect(received_event.metadata['model_id']).to eq(product.id.to_s)- end-- it 'includes serialized product data in the payload' do- received_event = nil- Spree::Events.subscribe('product.create', async: false) do |event|- received_event = event- end-- product = create(:product, stores: [store])-- expect(received_event.payload).to have_key('slug')- expect(received_event.payload).to have_key('status')- expect(received_event.payload).to have_key('created_at')- expect(received_event.payload).to have_key('updated_at')+ product.save!endend- describe 'product.update' do+ describe 'product.updated' dolet!(:product) { create(:product, name: 'Original Name', stores: [store]) }- it 'publishes product.update event when product is updated' do- received_event = nil- Spree::Events.subscribe('product.update', async: false) do |event|- received_event = event- end+ it 'publishes product.updated event when product is updated' do+ expect(product).to receive(:publish_event).with('product.updated')+ allow(product).to receive(:publish_event).with(anything)product.update!(name: 'Updated Name')-- expect(received_event).to be_present- expect(received_event.name).to eq('product.update')- expect(received_event.payload['id']).to eq(product.id)- expect(received_event.payload['name']).to eq('Updated Name')- expect(received_event.metadata['model_class']).to eq('Spree::Product')- expect(received_event.metadata['model_id']).to eq(product.id.to_s)endend- describe 'product.destroy' do+ describe 'product.destroyed' dolet!(:product) { create(:product, name: 'To Be Destroyed', stores: [store]) }- it 'publishes product.destroy event when product is destroyed' do- received_event = nil- product_id = product.id- Spree::Events.subscribe('product.destroy', async: false) do |event|- received_event = event- end+ it 'publishes product.destroyed event when product is destroyed' do+ expect(product).to receive(:publish_event).with('product.destroyed', kind_of(Hash))+ allow(product).to receive(:publish_event).with(anything)product.destroy!-- expect(received_event).to be_present- expect(received_event.name).to eq('product.destroy')- expect(received_event.payload['id']).to eq(product_id)- expect(received_event.payload['name']).to eq('To Be Destroyed')- expect(received_event.metadata['model_class']).to eq('Spree::Product')- expect(received_event.metadata['model_id']).to eq(product_id.to_s)endendenddiff --git a/core/spec/models/spree/reimbursement_spec.rb b/core/spec/models/spree/reimbursement_spec.rbindex 7b4d36f6c0..9f31939961 100644--- a/core/spec/models/spree/reimbursement_spec.rb+++ b/core/spec/models/spree/reimbursement_spec.rb@@ -230,21 +230,10 @@ describe Spree::Reimbursement, type: :model doendit 'publishes reimbursement.reimbursed event when performed' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('reimbursement.reimbursed') do |event|- received_event = event- end+ expect(reimbursement).to receive(:publish_event).with('reimbursement.reimbursed')+ allow(reimbursement).to receive(:publish_event).with(anything)reimbursement.perform!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::Reimbursement')- expect(received_event.metadata['model_id']).to eq(reimbursement.id.to_s)-- Spree::Events.unsubscribe('reimbursement.reimbursed', subscriber)- Spree::Events.reset!endendenddiff --git a/core/spec/models/spree/report_spec.rb b/core/spec/models/spree/report_spec.rbindex 2a3c6c9cf7..019a7282bf 100644--- a/core/spec/models/spree/report_spec.rb+++ b/core/spec/models/spree/report_spec.rb@@ -48,13 +48,13 @@ RSpec.describe Spree::Report, type: :model doendend- describe 'event subscriber' do- before { Spree::Events.activate! }- after { Spree::Events.reset! }+ describe 'custom events' do+ describe 'report.created' do+ it 'publishes report.created event when saved' do+ expect(report).to receive(:publish_event).with('report.created')+ allow(report).to receive(:publish_event).with(anything)- describe 'on report.create' do- it 'enqueues generate job via subscriber' do- expect { report.save! }.to have_enqueued_job(Spree::Reports::GenerateJob).with(report.id)+ report.save!endendenddiff --git a/core/spec/models/spree/return_authorization_spec.rb b/core/spec/models/spree/return_authorization_spec.rbindex ecef33e79e..889e5eb222 100644--- a/core/spec/models/spree/return_authorization_spec.rb+++ b/core/spec/models/spree/return_authorization_spec.rb@@ -237,25 +237,14 @@ describe Spree::ReturnAuthorization, type: :model doenddescribe 'custom events' do- describe 'return_authorization.cancel' do+ describe 'return_authorization.canceled' dolet(:return_authorization) { create(:return_authorization) }- it 'publishes return_authorization.cancel event when canceled' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('return_authorization.cancel') do |event|- received_event = event- end+ it 'publishes return_authorization.canceled event when canceled' do+ expect(return_authorization).to receive(:publish_event).with('return_authorization.canceled')+ allow(return_authorization).to receive(:publish_event).with(anything)return_authorization.cancel!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::ReturnAuthorization')- expect(received_event.metadata['model_id']).to eq(return_authorization.id.to_s)-- Spree::Events.unsubscribe('return_authorization.cancel', subscriber)- Spree::Events.reset!endendenddiff --git a/core/spec/models/spree/return_item_spec.rb b/core/spec/models/spree/return_item_spec.rbindex 70459f4b58..efff072d5a 100644--- a/core/spec/models/spree/return_item_spec.rb+++ b/core/spec/models/spree/return_item_spec.rb@@ -770,7 +770,7 @@ describe Spree::ReturnItem, type: :model doenddescribe 'custom events' do- describe 'return_item.receive' do+ describe 'return_item.received' dolet(:inventory_unit) { create(:inventory_unit, state: 'shipped') }let(:return_item) { create(:return_item, inventory_unit: inventory_unit, reception_status: 'awaiting') }@@ -778,66 +778,33 @@ describe Spree::ReturnItem, type: :model doallow(return_item).to receive(:eligible_for_return?).and_return(true)end- it 'publishes return_item.receive event when received' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('return_item.receive') do |event|- received_event = event- end+ it 'publishes return_item.received event when received' do+ expect(return_item).to receive(:publish_event).with('return_item.received')+ allow(return_item).to receive(:publish_event).with(anything)return_item.receive!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::ReturnItem')- expect(received_event.metadata['model_id']).to eq(return_item.id.to_s)-- Spree::Events.unsubscribe('return_item.receive', subscriber)- Spree::Events.reset!endend- describe 'return_item.cancel' do+ describe 'return_item.canceled' dolet(:return_item) { create(:return_item, reception_status: 'awaiting') }- it 'publishes return_item.cancel event when canceled' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('return_item.cancel') do |event|- received_event = event- end+ it 'publishes return_item.canceled event when canceled' do+ expect(return_item).to receive(:publish_event).with('return_item.canceled')+ allow(return_item).to receive(:publish_event).with(anything)return_item.cancel!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::ReturnItem')- expect(received_event.metadata['model_id']).to eq(return_item.id.to_s)-- Spree::Events.unsubscribe('return_item.cancel', subscriber)- Spree::Events.reset!endend- describe 'return_item.give' do+ describe 'return_item.given' dolet(:return_item) { create(:return_item, reception_status: 'awaiting') }- it 'publishes return_item.give event when given to customer' do- Spree::Events.activate!-- received_event = nil- subscriber = Spree::Events.subscribe('return_item.give') do |event|- received_event = event- end+ it 'publishes return_item.given event when given to customer' do+ expect(return_item).to receive(:publish_event).with('return_item.given')+ allow(return_item).to receive(:publish_event).with(anything)return_item.give!-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::ReturnItem')- expect(received_event.metadata['model_id']).to eq(return_item.id.to_s)-- Spree::Events.unsubscribe('return_item.give', subscriber)- Spree::Events.reset!endendenddiff --git a/core/spec/models/spree/shipment_spec.rb b/core/spec/models/spree/shipment_spec.rbindex ecdecd05d3..776ffc74b5 100644--- a/core/spec/models/spree/shipment_spec.rb+++ b/core/spec/models/spree/shipment_spec.rb@@ -1042,56 +1042,35 @@ describe Spree::Shipment, type: :model dodescribe 'events' dolet(:order) { create(:order_ready_to_ship) }let(:shipment) { order.shipments.first }- let(:received_events) { [] }-- before do- Spree::Events.reset!- Spree::Events.activate!- end-- after { Spree::Events.reset! }describe 'shipped state transition' do- before do- Spree::Events.subscribe('shipment.ship', async: false) { |e| received_events << e }- shipment.update_column(:tracking, 'TRACK123')- end+ before { shipment.update_column(:tracking, 'TRACK123') }- it 'publishes shipment.ship event' do- shipment.ship!+ it 'publishes shipment.shipped event' do+ expect(shipment).to receive(:publish_event).with('shipment.shipped')+ allow(shipment).to receive(:publish_event).with(anything)- expect(received_events.size).to eq(1)- expect(received_events.first.payload['id']).to eq(shipment.id)- expect(received_events.first.payload['number']).to eq(shipment.number)+ shipment.ship!endenddescribe 'canceled state transition' do- before do- Spree::Events.subscribe('shipment.cancel', async: false) { |e| received_events << e }- end+ it 'publishes shipment.canceled event' do+ expect(shipment).to receive(:publish_event).with('shipment.canceled')+ allow(shipment).to receive(:publish_event).with(anything)- it 'publishes shipment.cancel event' doshipment.cancel!-- expect(received_events.size).to eq(1)- expect(received_events.first.payload['id']).to eq(shipment.id)- expect(received_events.first.payload['number']).to eq(shipment.number)endend- describe 'resume state transition' do- before do- Spree::Events.subscribe('shipment.resume', async: false) { |e| received_events << e }- shipment.cancel!- end+ describe 'resumed state transition' do+ before { shipment.cancel! }- it 'publishes shipment.resume event' do- shipment.resume!+ it 'publishes shipment.resumed event' do+ expect(shipment).to receive(:publish_event).with('shipment.resumed')+ allow(shipment).to receive(:publish_event).with(anything)- expect(received_events.size).to eq(1)- expect(received_events.first.payload['id']).to eq(shipment.id)- expect(received_events.first.payload['number']).to eq(shipment.number)+ shipment.resume!endendenddiff --git a/core/spec/services/spree/newsletter/verify_spec.rb b/core/spec/services/spree/newsletter/verify_spec.rbindex fa2baffca5..e49fb2c098 100644--- a/core/spec/services/spree/newsletter/verify_spec.rb+++ b/core/spec/services/spree/newsletter/verify_spec.rb@@ -41,22 +41,11 @@ module Spreedescribe 'custom events' dolet(:user) { nil }- it 'publishes newsletter_subscriber.verify event when verified' do- Spree::Events.activate!-- received_event = nil- event_subscriber = Spree::Events.subscribe('newsletter_subscriber.verify') do |event|- received_event = event- end+ it 'publishes newsletter_subscriber.verified event when verified' do+ expect(subscriber).to receive(:publish_event).with('newsletter_subscriber.verified')+ allow(subscriber).to receive(:publish_event).with(anything)service-- expect(received_event).to be_present- expect(received_event.metadata['model_class']).to eq('Spree::NewsletterSubscriber')- expect(received_event.metadata['model_id']).to eq(subscriber.id.to_s)-- Spree::Events.unsubscribe('newsletter_subscriber.verify', event_subscriber)- Spree::Events.reset!endendenddiff --git a/core/spec/subscribers/spree/export_subscriber_spec.rb b/core/spec/subscribers/spree/export_subscriber_spec.rbindex 00531c4015..27788b8227 100644--- a/core/spec/subscribers/spree/export_subscriber_spec.rb+++ b/core/spec/subscribers/spree/export_subscriber_spec.rb@@ -3,60 +3,44 @@require 'spec_helper'RSpec.describe Spree::ExportSubscriber do- before { Spree::Events.activate! }- after { Spree::Events.reset! }-describe '.subscription_patterns' do- it 'subscribes to export.create event' do- expect(described_class.subscription_patterns).to include('export.create')+ it 'subscribes to export.created event' do+ expect(described_class.subscription_patterns).to include('export.created')endenddescribe '.event_handlers' do- it 'routes export.create to generate_export_async' do- expect(described_class.event_handlers['export.create']).to eq(:generate_export_async)+ it 'routes export.created to generate_export_async' do+ expect(described_class.event_handlers['export.created']).to eq(:generate_export_async)endenddescribe '#generate_export_async' dolet(:store) { create(:store) }let(:user) { create(:admin_user) }+ let(:subscriber) { described_class.new }+ let(:export) { create(:export, store: store, user: user) }- it 'triggers export generation job when export is created' do- expect(Spree::Exports::GenerateJob).to receive(:perform_later).with(kind_of(Integer))-- Spree::Exports::Products.create!(- store: store,- user: user+ it 'extracts export_id from event payload' do+ event = Spree::Event.new(+ name: 'export.created',+ payload: { 'id' => export.id })- end-- context 'with event payload' do- let(:export) { create(:export, store: store, user: user) }- it 'extracts export_id from event payload' do- subscriber = described_class.new- event = Spree::Event.new(- name: 'export.create',- payload: { 'id' => export.id }- )+ expect(Spree::Exports::GenerateJob).to receive(:perform_later).with(export.id)- expect(Spree::Exports::GenerateJob).to receive(:perform_later).with(export.id)-- subscriber.generate_export_async(event)- end+ subscriber.generate_export_async(event)+ end- it 'does not call job if export_id is missing' do- subscriber = described_class.new- event = Spree::Event.new(- name: 'export.create',- payload: {}- )+ it 'does not call job if export_id is missing' do+ event = Spree::Event.new(+ name: 'export.created',+ payload: {}+ )- expect(Spree::Exports::GenerateJob).not_to receive(:perform_later)+ expect(Spree::Exports::GenerateJob).not_to receive(:perform_later)- subscriber.generate_export_async(event)- end+ subscriber.generate_export_async(event)endendenddiff --git a/core/spec/subscribers/spree/invitation_email_subscriber_spec.rb b/core/spec/subscribers/spree/invitation_email_subscriber_spec.rbindex 3a86133f02..0b49735840 100644--- a/core/spec/subscribers/spree/invitation_email_subscriber_spec.rb+++ b/core/spec/subscribers/spree/invitation_email_subscriber_spec.rb@@ -3,30 +3,22 @@require 'spec_helper'RSpec.describe Spree::InvitationEmailSubscriber do- include ActiveJob::TestHelper-let(:store) { @default_store }let(:inviter) { create(:admin_user) }let(:invitee) { create(:admin_user) }let(:invitation) { create(:invitation, email: '[email protected]', inviter: inviter, resource: store, skip_email: true) }- def publish_event(event_name, invitation)- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- Spree::Events.publish(- event_name,- { 'id' => invitation.id }- )- end- end+ let(:subscriber) { described_class.new }- before { Spree::Events.activate! }- after { Spree::Events.reset! }+ def mock_event(invitation)+ double('Event', payload: { 'id' => invitation.id })+ end- describe 'invitation.create event' do+ describe 'invitation.created event' doit 'sends invitation email' doexpect(Spree::InvitationMailer).to receive(:invitation_email).with(kind_of(Spree::Invitation)).and_return(double(deliver_later: true))- publish_event('invitation.create', invitation)+ subscriber.send(:send_invitation_email, mock_event(invitation))endcontext 'when invitation not found' do@@ -34,12 +26,12 @@ RSpec.describe Spree::InvitationEmailSubscriber doinvitation_id = invitation.idinvitation.destroy- expect { publish_event('invitation.create', OpenStruct.new(id: invitation_id)) }.not_to raise_error+ expect { subscriber.send(:send_invitation_email, mock_event(OpenStruct.new(id: invitation_id))) }.not_to raise_errorendendend- describe 'invitation.accept event' do+ describe 'invitation.accepted event' dobefore doinvitation.update!(invitee: invitee)end@@ -47,7 +39,7 @@ RSpec.describe Spree::InvitationEmailSubscriber doit 'sends acceptance notification email' doexpect(Spree::InvitationMailer).to receive(:invitation_accepted).with(kind_of(Spree::Invitation)).and_return(double(deliver_later: true))- publish_event('invitation.accept', invitation)+ subscriber.send(:send_acceptance_notification, mock_event(invitation))endcontext 'when invitation not found' do@@ -55,16 +47,16 @@ RSpec.describe Spree::InvitationEmailSubscriber doinvitation_id = invitation.idinvitation.destroy- expect { publish_event('invitation.accept', OpenStruct.new(id: invitation_id)) }.not_to raise_error+ expect { subscriber.send(:send_acceptance_notification, mock_event(OpenStruct.new(id: invitation_id))) }.not_to raise_errorendendend- describe 'invitation.resend event' do+ describe 'invitation.resent event' doit 'resends invitation email' doexpect(Spree::InvitationMailer).to receive(:invitation_email).with(kind_of(Spree::Invitation)).and_return(double(deliver_later: true))- publish_event('invitation.resend', invitation)+ subscriber.send(:resend_invitation_email, mock_event(invitation))endcontext 'when invitation is expired' do@@ -75,7 +67,7 @@ RSpec.describe Spree::InvitationEmailSubscriber doit 'does not send invitation email' doexpect(Spree::InvitationMailer).not_to receive(:invitation_email)- publish_event('invitation.resend', invitation)+ subscriber.send(:resend_invitation_email, mock_event(invitation))endend@@ -88,7 +80,7 @@ RSpec.describe Spree::InvitationEmailSubscriber doit 'does not send invitation email' doexpect(Spree::InvitationMailer).not_to receive(:invitation_email)- publish_event('invitation.resend', invitation)+ subscriber.send(:resend_invitation_email, mock_event(invitation))endend@@ -100,7 +92,7 @@ RSpec.describe Spree::InvitationEmailSubscriber doit 'does not send invitation email' doexpect(Spree::InvitationMailer).not_to receive(:invitation_email)- publish_event('invitation.resend', invitation)+ subscriber.send(:resend_invitation_email, mock_event(invitation))endend@@ -109,7 +101,7 @@ RSpec.describe Spree::InvitationEmailSubscriber doinvitation_id = invitation.idinvitation.destroy!- expect { publish_event('invitation.resend', OpenStruct.new(id: invitation_id)) }.not_to raise_error+ expect { subscriber.send(:resend_invitation_email, mock_event(OpenStruct.new(id: invitation_id))) }.not_to raise_errorendendenddiff --git a/core/spec/subscribers/spree/report_subscriber_spec.rb b/core/spec/subscribers/spree/report_subscriber_spec.rbindex eb8338f510..9bc22a8e8c 100644--- a/core/spec/subscribers/spree/report_subscriber_spec.rb+++ b/core/spec/subscribers/spree/report_subscriber_spec.rb@@ -3,29 +3,25 @@require 'spec_helper'RSpec.describe Spree::ReportSubscriber do- before { Spree::Events.activate! }- after { Spree::Events.reset! }-describe '.subscription_patterns' do- it 'subscribes to report.create event' do- expect(described_class.subscription_patterns).to include('report.create')+ it 'subscribes to report.created event' do+ expect(described_class.subscription_patterns).to include('report.created')endenddescribe '.event_handlers' do- it 'routes report.create to generate_report_async' do- expect(described_class.event_handlers['report.create']).to eq(:generate_report_async)+ it 'routes report.created to generate_report_async' do+ expect(described_class.event_handlers['report.created']).to eq(:generate_report_async)endenddescribe '#generate_report_async' dolet(:store) { create(:store) }let(:user) { create(:admin_user) }+ let(:subscriber) { described_class.new }- it 'triggers report generation job when report is created' do- expect(Spree::Reports::GenerateJob).to receive(:perform_later).with(kind_of(Integer))-- Spree::Reports::SalesTotal.create!(+ let(:report) do+ create(:report,store: store,user: user,date_from: 1.month.ago,@@ -34,40 +30,26 @@ RSpec.describe Spree::ReportSubscriber do)end- context 'with event payload' do- let(:report) do- create(:report,- store: store,- user: user,- date_from: 1.month.ago,- date_to: Time.current,- currency: store.default_currency- )- end-- it 'extracts report_id from event payload' do- subscriber = described_class.new- event = Spree::Event.new(- name: 'report.create',- payload: { 'id' => report.id }- )+ it 'extracts report_id from event payload' do+ event = Spree::Event.new(+ name: 'report.created',+ payload: { 'id' => report.id }+ )- expect(Spree::Reports::GenerateJob).to receive(:perform_later).with(report.id)+ expect(Spree::Reports::GenerateJob).to receive(:perform_later).with(report.id)- subscriber.generate_report_async(event)- end+ subscriber.generate_report_async(event)+ end- it 'does not call job if report_id is missing' do- subscriber = described_class.new- event = Spree::Event.new(- name: 'report.create',- payload: {}- )+ it 'does not call job if report_id is missing' do+ event = Spree::Event.new(+ name: 'report.created',+ payload: {}+ )- expect(Spree::Reports::GenerateJob).not_to receive(:perform_later)+ expect(Spree::Reports::GenerateJob).not_to receive(:perform_later)- subscriber.generate_report_async(event)- end+ subscriber.generate_report_async(event)endendenddiff --git a/emails/spec/models/spree/order_spec.rb b/emails/spec/models/spree/order_spec.rbindex ffa4541a87..ae90f66a8e 100644--- a/emails/spec/models/spree/order_spec.rb+++ b/emails/spec/models/spree/order_spec.rb@@ -1,15 +1,10 @@require 'spec_helper'describe Spree::Order, type: :model do- include ActiveJob::TestHelper-let(:store) { @default_store }let(:user) { create(:user) }let(:order) { create(:order, user: user, store: store) }- before { Spree::Events.activate! }- after { Spree::Events.reset! }-context '#finalize!' dolet(:order) { create(:order, email: '[email protected]', store: store) }@@ -17,78 +12,11 @@ describe Spree::Order, type: :model doorder.update_column :state, 'complete'end- it 'sends an order confirmation email to customer via subscriber' do- mail_message = double 'Mail::Message'- expect(Spree::OrderMailer).to receive(:confirm_email).with(order.id).and_return mail_message- expect(mail_message).to receive :deliver_later-- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- order.finalize!- end- end-- context 'when send_consumer_transactional_emails store setting is set to false' do- before do- # Update store preferences in DB since subscriber reloads order- order.store.update!(preferences: order.store.preferences.merge(send_consumer_transactional_emails: false))- end-- it 'does not send order confirmation email to customer' do- expect(Spree::OrderMailer).not_to receive(:confirm_email)-- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- order.finalize!- end- end- end-- it 'sets confirmation delivered when finalizing via subscriber' do- allow(Spree::OrderMailer).to receive(:confirm_email).and_return(double(deliver_later: true))- allow(Spree::OrderMailer).to receive(:store_owner_notification_email).and_return(double(deliver_later: true))-- expect(order.confirmation_delivered?).to be false-- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- order.finalize!- end-- expect(order.reload.confirmation_delivered?).to be true- end-- it 'does not send duplicate confirmation emails' do- order.update_column(:confirmation_delivered, true)- expect(Spree::OrderMailer).not_to receive(:confirm_email)-- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- order.finalize!- end- end-- context 'new order notifications' do- it 'sends a new order notification email to store owner when notification email address is set' do- mail_message = double 'Mail::Message'- allow(Spree::OrderMailer).to receive(:confirm_email).and_return(double(deliver_later: true))- # Update store in DB since subscriber reloads order- store.update!(new_order_notifications_email: '[email protected]')- expect(Spree::OrderMailer).to receive(:store_owner_notification_email).with(order.id).and_return mail_message- expect(mail_message).to receive :deliver_later-- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- order.finalize!- end- end-- it 'does not send a new order notification email to store owner when notification email address is blank' do- allow(Spree::OrderMailer).to receive(:confirm_email).and_return(double(deliver_later: true))- # Update store in DB since subscriber reloads order- store.update!(new_order_notifications_email: nil)-- expect(Spree::OrderMailer).to_not receive(:store_owner_notification_email)+ it 'publishes order.completed event when finalizing' do+ expect(order).to receive(:publish_event).with('order.completed')+ allow(order).to receive(:publish_event).with(anything)- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- order.finalize!- end- end+ order.finalize!endend@@ -119,23 +47,14 @@ describe Spree::Order, type: :model doallow_any_instance_of(Spree::OrderUpdater).to receive(:update_adjustment_total).and_return(10)end- it 'sends a cancel email via subscriber' do- # Stub methods that cause side-effects in this test+ it 'publishes order.canceled event when canceling' doallow(shipment).to receive(:cancel!)allow(order).to receive :restock_items!- mail_message = double 'Mail::Message'- order_id = nil- expect(Spree::OrderMailer).to receive(:cancel_email) { |*args|- order_id = args[0]- mail_message- }- expect(mail_message).to receive :deliver_later- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- order.cancel!- end+ expect(order).to receive(:publish_event).with('order.canceled')+ allow(order).to receive(:publish_event).with(anything)- expect(order_id).to eq(order.id)+ order.cancel!endendenddiff --git a/emails/spec/models/spree/reimbursement_spec.rb b/emails/spec/models/spree/reimbursement_spec.rbindex bff25f28e6..1804e02687 100644--- a/emails/spec/models/spree/reimbursement_spec.rb+++ b/emails/spec/models/spree/reimbursement_spec.rb@@ -1,15 +1,7 @@require 'spec_helper'describe Spree::Reimbursement, type: :model do- include ActiveJob::TestHelper-describe '#perform!' do- subject do- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- reimbursement.perform!- end- end-let!(:adjustments) { [] } # placeholder to ensure it gets run prior the "before" at this levellet!(:tax_rate) { nil }@@ -34,25 +26,13 @@ describe Spree::Reimbursement, type: :model dobefore docustomer_return.save!return_item.accept!- Spree::Events.activate!- end-- after { Spree::Events.reset! }-- it 'triggers the reimbursement mailer to be sent via subscriber' do- expect(Spree::ReimbursementMailer).to receive(:reimbursement_email).with(reimbursement.id) { double(deliver_later: true) }- subjectend- context 'when send_consumer_transactional_emails store setting is set to false' do- before do- allow_any_instance_of(Spree::Store).to receive(:prefers_send_consumer_transactional_emails?).and_return(false)- end+ it 'publishes reimbursement.reimbursed event when performing' do+ expect(reimbursement).to receive(:publish_event).with('reimbursement.reimbursed')+ allow(reimbursement).to receive(:publish_event).with(anything)- it 'does not trigger the reimbursement mailer to be sent' do- expect(Spree::ReimbursementMailer).not_to receive(:reimbursement_email)- subject- end+ reimbursement.perform!endendenddiff --git a/emails/spec/models/spree/shipment_spec.rb b/emails/spec/models/spree/shipment_spec.rbindex 350e96147d..cd3306984f 100644--- a/emails/spec/models/spree/shipment_spec.rb+++ b/emails/spec/models/spree/shipment_spec.rb@@ -1,8 +1,6 @@require 'spec_helper'describe Spree::Shipment, type: :model do- include ActiveJob::TestHelper-let(:order) { create(:order) }let(:shipping_method) { create(:shipping_method, name: 'UPS') }let(:shipment) { create(:shipment, cost: 1, state: 'pending', stock_location: create(:stock_location), order: order) }@@ -15,12 +13,8 @@ describe Spree::Shipment, type: :model dotouch_later: falseallow(shipment).to receive_messages shipping_method: shipping_method-- Spree::Events.activate!end- after { Spree::Events.reset! }-['ready', 'canceled'].each do |state|context "from #{state}" dobefore do@@ -28,37 +22,13 @@ describe Spree::Shipment, type: :model doallow(shipment).to receive_messages(require_inventory: false, update_order: true, state: state)end- it 'sends a shipment email via subscriber' do- mail_message = double 'Mail::Message'- shipment_id = nil- expect(Spree::ShipmentMailer).to receive(:shipped_email) { |*args|- shipment_id = args[0]- mail_message- }- expect(mail_message).to receive :deliver_later+ it 'publishes shipment.shipped event when shipping' doallow_any_instance_of(Spree::ShipmentHandler).to receive(:update_order_shipment_state)- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- shipment.ship!- end-- expect(shipment_id).to eq(shipment.id)- end-- context 'when send_consumer_transactional_emails store setting is set to false' do- before do- # Update store preferences in DB since subscriber reloads shipment- shipment.store.update!(preferences: shipment.store.preferences.merge(send_consumer_transactional_emails: false))- end-- it 'does not trigger the shipment mailer to be sent' do- allow_any_instance_of(Spree::ShipmentHandler).to receive(:update_order_shipment_state)- expect(Spree::ShipmentMailer).not_to receive(:shipped_email)+ expect(shipment).to receive(:publish_event).with('shipment.shipped')+ allow(shipment).to receive(:publish_event).with(anything)- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- shipment.ship!- end- end+ shipment.ship!endendenddiff --git a/emails/spec/subscribers/spree/order_email_subscriber_spec.rb b/emails/spec/subscribers/spree/order_email_subscriber_spec.rbindex a52257e085..bdcbdd3287 100644--- a/emails/spec/subscribers/spree/order_email_subscriber_spec.rb+++ b/emails/spec/subscribers/spree/order_email_subscriber_spec.rb@@ -3,47 +3,38 @@require 'spec_helper'RSpec.describe Spree::OrderEmailSubscriber do- include ActiveJob::TestHelper-let(:store) { create(:store, new_order_notifications_email: '[email protected]') }let(:order) { create(:completed_order_with_totals, store: store) }+ let(:subscriber) { described_class.new }- def publish_event(event_name)- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- Spree::Events.publish(- event_name,- { 'id' => order.id }- )- end+ def mock_event(order)+ double('Event', payload: { 'id' => order.id })endbefore dostore.update!(preferences: store.preferences.merge(send_consumer_transactional_emails: true))- Spree::Events.activate!end- after { Spree::Events.reset! }-- describe 'order.complete event' do+ describe 'order.completed event' doit 'sends confirmation email' doexpect(Spree::OrderMailer).to receive(:confirm_email).with(order.id).and_return(double(deliver_later: true))allow(Spree::OrderMailer).to receive(:store_owner_notification_email).and_return(double(deliver_later: true))- publish_event('order.complete')+ subscriber.send(:send_confirmation_email, mock_event(order))endit 'marks confirmation as delivered' doallow(Spree::OrderMailer).to receive(:confirm_email).and_return(double(deliver_later: true))allow(Spree::OrderMailer).to receive(:store_owner_notification_email).and_return(double(deliver_later: true))- expect { publish_event('order.complete') }.to change { order.reload.confirmation_delivered }.from(false).to(true)+ expect { subscriber.send(:send_confirmation_email, mock_event(order)) }.to change { order.reload.confirmation_delivered }.from(false).to(true)endit 'sends store owner notification email' doallow(Spree::OrderMailer).to receive(:confirm_email).and_return(double(deliver_later: true))expect(Spree::OrderMailer).to receive(:store_owner_notification_email).with(order.id).and_return(double(deliver_later: true))- publish_event('order.complete')+ subscriber.send(:send_confirmation_email, mock_event(order))endit 'marks store owner notification as delivered' do@@ -51,7 +42,7 @@ RSpec.describe Spree::OrderEmailSubscriber doallow(Spree::OrderMailer).to receive(:store_owner_notification_email).and_return(double(deliver_later: true))order.update_column(:store_owner_notification_delivered, false)- expect { publish_event('order.complete') }.to change { order.reload.store_owner_notification_delivered }.from(false).to(true)+ expect { subscriber.send(:send_confirmation_email, mock_event(order)) }.to change { order.reload.store_owner_notification_delivered }.from(false).to(true)endcontext 'when confirmation already delivered' do@@ -60,7 +51,7 @@ RSpec.describe Spree::OrderEmailSubscriber doit 'does not send confirmation email again' doexpect(Spree::OrderMailer).not_to receive(:confirm_email)- publish_event('order.complete')+ subscriber.send(:send_confirmation_email, mock_event(order))endend@@ -72,7 +63,7 @@ RSpec.describe Spree::OrderEmailSubscriber doit 'does not send confirmation email' doexpect(Spree::OrderMailer).not_to receive(:confirm_email)- publish_event('order.complete')+ subscriber.send(:send_confirmation_email, mock_event(order))endend@@ -83,7 +74,7 @@ RSpec.describe Spree::OrderEmailSubscriber doallow(Spree::OrderMailer).to receive(:confirm_email).and_return(double(deliver_later: true))expect(Spree::OrderMailer).not_to receive(:store_owner_notification_email)- publish_event('order.complete')+ subscriber.send(:send_confirmation_email, mock_event(order))endend@@ -91,23 +82,23 @@ RSpec.describe Spree::OrderEmailSubscriber doit 'does not raise an error' doorder.destroy- expect { publish_event('order.complete') }.not_to raise_error+ expect { subscriber.send(:send_confirmation_email, mock_event(order)) }.not_to raise_errorendendend- describe 'order.cancel event' do+ describe 'order.canceled event' doit 'sends cancel email' doexpect(Spree::OrderMailer).to receive(:cancel_email).with(order.id).and_return(double(deliver_later: true))- publish_event('order.cancel')+ subscriber.send(:send_cancel_email, mock_event(order))endcontext 'when order not found' doit 'does not raise an error' doorder.destroy- expect { publish_event('order.cancel') }.not_to raise_error+ expect { subscriber.send(:send_cancel_email, mock_event(order)) }.not_to raise_errorendendenddiff --git a/emails/spec/subscribers/spree/reimbursement_email_subscriber_spec.rb b/emails/spec/subscribers/spree/reimbursement_email_subscriber_spec.rbindex d316292d92..d03d0692f7 100644--- a/emails/spec/subscribers/spree/reimbursement_email_subscriber_spec.rb+++ b/emails/spec/subscribers/spree/reimbursement_email_subscriber_spec.rb@@ -3,32 +3,23 @@require 'spec_helper'RSpec.describe Spree::ReimbursementEmailSubscriber do- include ActiveJob::TestHelper-let(:reimbursement) { create(:reimbursement) }let(:store) { reimbursement.store }+ let(:subscriber) { described_class.new }- def publish_event(event_name, reimbursement_id = reimbursement.id)- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- Spree::Events.publish(- event_name,- { 'id' => reimbursement_id }- )- end+ def mock_event(reimbursement_id)+ double('Event', payload: { 'id' => reimbursement_id })endbefore dostore.update!(preferences: store.preferences.merge(send_consumer_transactional_emails: true))- Spree::Events.activate!end- after { Spree::Events.reset! }-describe 'reimbursement.reimbursed event' doit 'sends reimbursement email' doexpect(Spree::ReimbursementMailer).to receive(:reimbursement_email).with(reimbursement.id).and_return(double(deliver_later: true))- publish_event('reimbursement.reimbursed')+ subscriber.handle(mock_event(reimbursement.id))endcontext 'when store does not prefer transactional emails' do@@ -39,13 +30,13 @@ RSpec.describe Spree::ReimbursementEmailSubscriber doit 'does not send reimbursement email' doexpect(Spree::ReimbursementMailer).not_to receive(:reimbursement_email)- publish_event('reimbursement.reimbursed')+ subscriber.handle(mock_event(reimbursement.id))endendcontext 'when reimbursement not found' doit 'does not raise an error' do- expect { publish_event('reimbursement.reimbursed', -1) }.not_to raise_error+ expect { subscriber.handle(mock_event(-1)) }.not_to raise_errorendendenddiff --git a/emails/spec/subscribers/spree/shipment_email_subscriber_spec.rb b/emails/spec/subscribers/spree/shipment_email_subscriber_spec.rbindex 731003b415..2b420a8a8e 100644--- a/emails/spec/subscribers/spree/shipment_email_subscriber_spec.rb+++ b/emails/spec/subscribers/spree/shipment_email_subscriber_spec.rb@@ -3,33 +3,24 @@require 'spec_helper'RSpec.describe Spree::ShipmentEmailSubscriber do- include ActiveJob::TestHelper-let(:store) { create(:store) }let(:order) { create(:completed_order_with_totals, store: store) }let(:shipment) { order.shipments.first }+ let(:subscriber) { described_class.new }- def publish_event(event_name)- perform_enqueued_jobs(only: Spree::Events::SubscriberJob) do- Spree::Events.publish(- event_name,- { 'id' => shipment.id }- )- end+ def mock_event(shipment)+ double('Event', payload: { 'id' => shipment.id })endbefore dostore.update!(preferences: store.preferences.merge(send_consumer_transactional_emails: true))- Spree::Events.activate!end- after { Spree::Events.reset! }-- describe 'shipment.ship event' do+ describe 'shipment.shipped event' doit 'sends shipped email' doexpect(Spree::ShipmentMailer).to receive(:shipped_email).with(shipment.id).and_return(double(deliver_later: true))- publish_event('shipment.ship')+ subscriber.handle(mock_event(shipment))endcontext 'when store does not prefer transactional emails' do@@ -40,7 +31,7 @@ RSpec.describe Spree::ShipmentEmailSubscriber doit 'does not send shipped email' doexpect(Spree::ShipmentMailer).not_to receive(:shipped_email)- publish_event('shipment.ship')+ subscriber.handle(mock_event(shipment))endend@@ -48,7 +39,7 @@ RSpec.describe Spree::ShipmentEmailSubscriber doit 'does not raise an error' doshipment.destroy- expect { publish_event('shipment.ship') }.not_to raise_error+ expect { subscriber.handle(mock_event(shipment)) }.not_to raise_errorendendend