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 merge conflicts.

Sebastian Palmad5e4d8323843
diff --cc api/spec/spec_helper.rb
index 6e9cc381c3,d4d2cc1fd5..e6f9b52d37
--- a/api/spec/spec_helper.rb
+++ b/api/spec/spec_helper.rb
@@@ -27,7 -27,7 +27,8 @@@ en
require 'rspec/rails'
require 'ffaker'
+require 'webmock/rspec'
+ require 'i18n/tasks'
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.