Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Fix broken main examples.

Sebastian Palmaf21cbc996ed0
diff --git a/api/spec/jobs/spree/webhooks/endpoints/make_request_job_spec.rb b/api/spec/jobs/spree/webhooks/endpoints/make_request_job_spec.rb
index e8c9f82be2..b2a4851bf5 100644
--- a/api/spec/jobs/spree/webhooks/endpoints/make_request_job_spec.rb
+++ b/api/spec/jobs/spree/webhooks/endpoints/make_request_job_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Spree::Webhooks::Endpoints::MakeRequestJob, :inline_jobs do
+describe Spree::Webhooks::Endpoints::MakeRequestJob, :job do
let(:url) { 'http://url.com/' }
it 'it enqueues a HTTP request using Spree::Webhooks::Endpoints::MakeRequest' do
diff --git a/api/spec/models/spree/webhooks/endpoint_spec.rb b/api/spec/models/spree/webhooks/endpoint_spec.rb
index dbd68569c9..d686e688c6 100644
--- a/api/spec/models/spree/webhooks/endpoint_spec.rb
+++ b/api/spec/models/spree/webhooks/endpoint_spec.rb
@@ -1,5 +1,10 @@
require 'spec_helper'
+FactoryBot.define do
+ factory :endpoint, class: Spree::Webhooks::Endpoint do
+ end
+end
+
describe Spree::Store do
describe 'validations' do
context 'url presence' do
diff --git a/api/spec/requests/spree/api/v2/storefront/products_spec.rb b/api/spec/requests/spree/api/v2/storefront/products_spec.rb
index 0737c0d07c..e96c85325a 100644
--- a/api/spec/requests/spree/api/v2/storefront/products_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/products_spec.rb
@@ -23,7 +23,10 @@ describe 'API V2 Storefront Products Spec', type: :request do
let!(:product_with_property) { create(:product, properties: [property], stores: [store]) }
let!(:product_property) { create(:product_property, property: new_property, product: product_with_property, value: 'Some Value') }
- before { Spree::Api::Config[:api_v2_per_page_limit] = 4 }
+ before do
+ Spree::Api::Config[:api_v2_per_page_limit] = 4
+ Rails.cache.clear
+ end
describe 'products#index' do
context 'with no params' do
diff --git a/api/spec/serializers/spree/api/v2/platform/wishlist_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/wishlist_serializer_spec.rb
index 80ff048487..cd75f10d3d 100644
--- a/api/spec/serializers/spree/api/v2/platform/wishlist_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/wishlist_serializer_spec.rb
@@ -3,9 +3,14 @@ require 'spec_helper'
describe Spree::Api::V2::Platform::WishlistSerializer do
subject { described_class.new(wishlist) }
- let!(:user) { create(:user) }
- let!(:wishlist) { create(:wishlist, user: user) }
- let!(:wished_item) { create(:wished_item, wishlist: wishlist) }
+ let(:user) { create(:user) }
+ let(:wishlist) { create(:wishlist, user: user) }
+ let(:wished_item) { create(:wished_item, wishlist: wishlist) }
+
+ before do
+ allow_any_instance_of(Spree::Base).to receive(:queue_webhooks_requests!)
+ wished_item
+ end
it { expect(subject.serializable_hash).to be_kind_of(Hash) }
diff --git a/api/spec/serializers/spree/v2/storefront/cms_section_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/cms_section_serializer_spec.rb
index 7e6d6aa491..ff97529f34 100644
--- a/api/spec/serializers/spree/v2/storefront/cms_section_serializer_spec.rb
+++ b/api/spec/serializers/spree/v2/storefront/cms_section_serializer_spec.rb
@@ -5,6 +5,11 @@ describe Spree::V2::Storefront::CmsSectionSerializer do
let(:cms_section) { create(:cms_section) }
+ before do
+ allow_any_instance_of(Spree::Base).to receive(:queue_webhooks_requests!)
+ cms_section
+ end
+
shared_examples 'returns proper hash' do
it { expect(subject.serializable_hash).to be_kind_of(Hash) }
diff --git a/api/spec/serializers/spree/v2/storefront/menu_item_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/menu_item_serializer_spec.rb
index f8ab6ca5eb..93379b3772 100644
--- a/api/spec/serializers/spree/v2/storefront/menu_item_serializer_spec.rb
+++ b/api/spec/serializers/spree/v2/storefront/menu_item_serializer_spec.rb
@@ -5,9 +5,12 @@ describe Spree::V2::Storefront::MenuItemSerializer do
let(:menu) { create(:menu) }
let(:menu_item) { create(:menu_item, menu: menu, linked_resource: create(:taxon)) }
- let!(:children) { create(:menu_item, parent_id: menu_item.id, menu: menu) }
+ let(:children) { create(:menu_item, parent_id: menu_item.id, menu: menu) }
- before { menu_item.reload }
+ before do
+ allow_any_instance_of(Spree::Base).to receive(:queue_webhooks_requests!)
+ children
+ end
it { expect(subject.serializable_hash).to be_kind_of(Hash) }
diff --git a/api/spec/serializers/spree/v2/storefront/wishlist_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/wishlist_serializer_spec.rb
index cad305003d..069e9cc08c 100644
--- a/api/spec/serializers/spree/v2/storefront/wishlist_serializer_spec.rb
+++ b/api/spec/serializers/spree/v2/storefront/wishlist_serializer_spec.rb
@@ -3,8 +3,13 @@ require 'spec_helper'
describe Spree::V2::Storefront::WishlistSerializer do
subject { described_class.new(wishlist) }
- let!(:wishlist) { create(:wishlist) }
- let!(:wished_item) { create(:wished_item, wishlist: wishlist, variant: create(:variant), quantity: 1) }
+ let(:wishlist) { create(:wishlist) }
+ let(:wished_item) { create(:wished_item, wishlist: wishlist, variant: create(:variant), quantity: 1) }
+
+ before do
+ allow_any_instance_of(Spree::Base).to receive(:queue_webhooks_requests!)
+ wished_item
+ end
it { expect(subject.serializable_hash).to be_kind_of(Hash) }
diff --git a/api/spec/services/spree/webhooks/endpoints/queue_request_spec.rb b/api/spec/services/spree/webhooks/endpoints/queue_request_spec.rb
index 7a4dd4dbcc..390d522d67 100644
--- a/api/spec/services/spree/webhooks/endpoints/queue_request_spec.rb
+++ b/api/spec/services/spree/webhooks/endpoints/queue_request_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Spree::Webhooks::Endpoints::QueueRequests do
+describe Spree::Webhooks::Endpoints::QueueRequests, :job do
describe '#call' do
let(:event) { 'order.finalize' }
let(:payload) { {} }
diff --git a/api/spec/spec_helper.rb b/api/spec/spec_helper.rb
index c003672004..3ccfff7f29 100644
--- a/api/spec/spec_helper.rb
+++ b/api/spec/spec_helper.rb
@@ -65,8 +65,6 @@ RSpec.configure do |config|
config.include Spree::TestingSupport::ImageHelpers
config.before do
- Rails.cache.clear
-
reset_spree_preferences
Spree::Api::Config[:requires_authentication] = true
@@ -86,6 +84,14 @@ RSpec.configure do |config|
ActiveJob::Base.queue_adapter = :test
end
+ config.before(:each, :job) do
+ ActiveJob::Base.queue_adapter = :test
+ end
+
+ config.after(:each, :job) do
+ ActiveJob::Base.queue_adapter = :inline
+ end
+
config.order = :random
Kernel.srand config.seed
end
diff --git a/core/app/jobs/spree/base_job.rb b/core/app/jobs/spree/base_job.rb
new file mode 100644
index 0000000000..4e59602156
--- /dev/null
+++ b/core/app/jobs/spree/base_job.rb
@@ -0,0 +1,4 @@
+module Spree
+ class BaseJob < ApplicationJob
+ end
+end
diff --git a/core/lib/spree/testing_support/factories/endpoint_factory.rb b/core/lib/spree/testing_support/factories/endpoint_factory.rb
deleted file mode 100644
index 31951814b8..0000000000
--- a/core/lib/spree/testing_support/factories/endpoint_factory.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-FactoryBot.define do
- factory :endpoint, class: Spree::Webhooks::Endpoint do
- end
-end
diff --git a/core/spec/jobs/spree/stock_locations/stock_items/create_job_spec.rb b/core/spec/jobs/spree/stock_locations/stock_items/create_job_spec.rb
index a19890e8ac..7b424c69cb 100644
--- a/core/spec/jobs/spree/stock_locations/stock_items/create_job_spec.rb
+++ b/core/spec/jobs/spree/stock_locations/stock_items/create_job_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
module Spree
- describe StockLocations::StockItems::CreateJob, :inline_jobs do
+ describe StockLocations::StockItems::CreateJob, :job do
let!(:stock_location) { create :stock_location }
it 'enqueues the creation of the stock location stock items' do
diff --git a/core/spec/spec_helper.rb b/core/spec/spec_helper.rb
index 0623d3f17e..6172e5a809 100644
--- a/core/spec/spec_helper.rb
+++ b/core/spec/spec_helper.rb
@@ -78,11 +78,11 @@ RSpec.configure do |config|
ActiveJob::Base.queue_adapter = :inline
end
- config.before(:each, :inline_jobs) do
+ config.before(:each, :job) do
ActiveJob::Base.queue_adapter = :test
end
- config.after(:each, :inline_jobs) do
+ config.after(:each, :job) do
ActiveJob::Base.queue_adapter = :inline
end