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
drop shoulda-matchers gem (#14464)
Damian Legawiec963a0a2d9906
diff --git a/spree/common_spree_dependencies.rb b/spree/common_spree_dependencies.rbindex 1913049264..9d5a8d44db 100644--- a/spree/common_spree_dependencies.rb+++ b/spree/common_spree_dependencies.rb@@ -34,7 +34,6 @@ group :test dogem 'webmock'gem 'timecop'gem 'rails-controller-testing'- gem 'shoulda-matchers', '~> 6.0'endgroup :test, :development dodiff --git a/spree/core/spec/models/spree/allowed_origin_spec.rb b/spree/core/spec/models/spree/allowed_origin_spec.rbindex d654c9e396..50057a9203 100644--- a/spree/core/spec/models/spree/allowed_origin_spec.rb+++ b/spree/core/spec/models/spree/allowed_origin_spec.rb@@ -5,15 +5,9 @@ require 'spec_helper'RSpec.describe Spree::AllowedOrigin, type: :model dolet(:store) { create(:store) }- describe 'associations' do- it { is_expected.to belong_to(:store).class_name('Spree::Store').without_validating_presence }- end-describe 'validations' dosubject { build(:allowed_origin, store: store) }- it { is_expected.to validate_presence_of(:origin) }-it 'validates uniqueness of origin scoped to store' docreate(:allowed_origin, store: store, origin: 'https://example.com')duplicate = build(:allowed_origin, store: store, origin: 'https://example.com')diff --git a/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb b/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rbindex a3776bc089..401a6db48b 100644--- a/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb+++ b/spree/core/spec/models/spree/concerns/admin_user_methods_spec.rb@@ -4,22 +4,6 @@ describe Spree::AdminUserMethods dolet(:admin_user) { create(:admin_user) }let(:current_store) { @default_store }- describe 'associations' do- it { expect(admin_user).to have_many(:identities).dependent(:destroy) }- it { expect(admin_user).to have_many(:canceled_orders) }- it { expect(admin_user).to have_many(:created_orders) }- it { expect(admin_user).to have_many(:approved_orders) }- it { expect(admin_user).to have_many(:created_gift_cards) }- it { expect(admin_user).to have_many(:created_gift_card_batches) }- it { expect(admin_user).to have_many(:refunded_refunds) }- it { expect(admin_user).to have_many(:created_returns) }- it { expect(admin_user).to have_many(:created_exchanges) }- it { expect(admin_user).to have_many(:created_claims) }- it { expect(admin_user).to have_many(:created_store_credits) }- it { expect(admin_user).to have_many(:reports) }- it { expect(admin_user).to have_many(:exports) }- end-describe 'prefixed_id' doit 'generates a prefixed_id starting with adm_' doexpect(admin_user.prefixed_id).to start_with('adm_')diff --git a/spree/core/spec/models/spree/customer_group_spec.rb b/spree/core/spec/models/spree/customer_group_spec.rbindex f628607748..6250e98e92 100644--- a/spree/core/spec/models/spree/customer_group_spec.rb+++ b/spree/core/spec/models/spree/customer_group_spec.rb@@ -5,8 +5,6 @@ RSpec.describe Spree::CustomerGroup, type: :model dolet(:customer_group) { create(:customer_group, store: store) }describe 'validations' do- it { is_expected.to validate_presence_of(:name) }-context 'uniqueness' dolet!(:existing_group) { create(:customer_group, name: 'VIP', store: store) }diff --git a/spree/core/spec/models/spree/customer_group_user_spec.rb b/spree/core/spec/models/spree/customer_group_user_spec.rbindex c40e2d9ef4..cc01155fdd 100644--- a/spree/core/spec/models/spree/customer_group_user_spec.rb+++ b/spree/core/spec/models/spree/customer_group_user_spec.rb@@ -4,15 +4,7 @@ RSpec.describe Spree::CustomerGroupUser, type: :model dolet(:customer_group) { create(:customer_group) }let(:user) { create(:user) }- describe 'associations' do- it { is_expected.to belong_to(:customer_group).optional(false) }- it { is_expected.to belong_to(:customer).optional(false) }- end-describe 'validations' do- it { is_expected.to validate_presence_of(:customer_group) }- it { is_expected.to validate_presence_of(:customer) }-context 'uniqueness' dolet!(:existing) { create(:customer_group_user, customer_group: customer_group, customer: user) }diff --git a/spree/core/spec/models/spree/import_mapping_spec.rb b/spree/core/spec/models/spree/import_mapping_spec.rbindex f10d2a48bd..1069a1213b 100644--- a/spree/core/spec/models/spree/import_mapping_spec.rb+++ b/spree/core/spec/models/spree/import_mapping_spec.rb@@ -5,10 +5,6 @@ RSpec.describe Spree::ImportMapping, type: :model dolet(:user) { create(:admin_user) }let(:import) { create(:product_import, owner: store, user: user) }- describe 'Associations' do- it { is_expected.to belong_to(:import) }- end-describe 'Validations' dodescribe 'presence validations' doit 'validates presence of import' dodiff --git a/spree/core/spec/models/spree/market_spec.rb b/spree/core/spec/models/spree/market_spec.rbindex f73f3059ce..bfdd057e60 100644--- a/spree/core/spec/models/spree/market_spec.rb+++ b/spree/core/spec/models/spree/market_spec.rb@@ -6,10 +6,6 @@ RSpec.describe Spree::Market, type: :model dodescribe 'validations' dosubject { build(:market, store: store) }- it { is_expected.to validate_presence_of(:name) }- it { is_expected.to validate_presence_of(:currency) }- it { is_expected.to validate_presence_of(:default_locale) }-it 'validates presence of countries' domarket = build(:market, store: store, countries: [])expect(market).not_to be_validdiff --git a/spree/core/spec/models/spree/newsletter_subscriber_spec.rb b/spree/core/spec/models/spree/newsletter_subscriber_spec.rbindex 5ed404839d..dde9766e71 100644--- a/spree/core/spec/models/spree/newsletter_subscriber_spec.rb+++ b/spree/core/spec/models/spree/newsletter_subscriber_spec.rb@@ -8,16 +8,17 @@ describe Spree::NewsletterSubscriber, type: :model, newsletter: true doit_behaves_like 'lifecycle events'describe 'normalizations' do- it { is_expected.to normalize(:email).from(" [email protected]\n").to('[email protected]') }- it { is_expected.to normalize(:email).from('').to(nil) }- it { is_expected.to normalize(:email).from(nil).to(nil) }- end+ it 'strips whitespace and downcases the email' do+ expect(described_class.new(email: " [email protected]\n").email).to eq('[email protected]')+ end- describe 'validations' do- it { is_expected.to validate_presence_of(:email) }- it { is_expected.to validate_uniqueness_of(:email).scoped_to(:store_id).ignoring_case_sensitivity }- it { is_expected.to allow_value('[email protected]').for(:email) }- it { is_expected.not_to allow_value('test@').for(:email) }+ it 'normalizes a blank email to nil' do+ expect(described_class.new(email: '').email).to be_nil+ end++ it 'normalizes a nil email to nil' do+ expect(described_class.new(email: nil).email).to be_nil+ endenddescribe 'callbacks' dodiff --git a/spree/core/spec/models/spree/stock_reservation_spec.rb b/spree/core/spec/models/spree/stock_reservation_spec.rbindex f9b842a80f..a854e32c88 100644--- a/spree/core/spec/models/spree/stock_reservation_spec.rb+++ b/spree/core/spec/models/spree/stock_reservation_spec.rb@@ -1,18 +1,9 @@require 'spec_helper'describe Spree::StockReservation, type: :model do- describe 'associations' do- it { is_expected.to belong_to(:stock_item).class_name('Spree::StockItem').without_validating_presence }- it { is_expected.to belong_to(:line_item).class_name('Spree::LineItem').without_validating_presence }- it { is_expected.to belong_to(:order).class_name('Spree::Order').without_validating_presence }- end-describe 'validations' dolet(:reservation) { build(:stock_reservation) }- it { is_expected.to validate_presence_of(:quantity) }- it { is_expected.to validate_presence_of(:expires_at) }-it 'requires positive integer quantity' doreservation.quantity = 0expect(reservation).to be_invaliddiff --git a/spree/core/spec/models/spree/user_identity_spec.rb b/spree/core/spec/models/spree/user_identity_spec.rbindex c47a9a30b6..4afe40f8e9 100644--- a/spree/core/spec/models/spree/user_identity_spec.rb+++ b/spree/core/spec/models/spree/user_identity_spec.rb@@ -1,16 +1,9 @@require 'spec_helper'describe Spree::UserIdentity, type: :model do- describe 'associations' do- it { is_expected.to belong_to(:user).required }- end-describe 'validations' dosubject { build(:user_identity) }- it { is_expected.to validate_presence_of(:provider) }- it { is_expected.to validate_presence_of(:uid) }-it 'validates provider is a registered authentication strategy' doidentity = build(:user_identity, provider: 'unsupported')expect(identity).not_to be_validdiff --git a/spree/core/spec/spec_helper.rb b/spree/core/spec/spec_helper.rbindex cf5f00f83f..d1c5b80e46 100644--- a/spree/core/spec/spec_helper.rb+++ b/spree/core/spec/spec_helper.rb@@ -49,7 +49,6 @@ endrequire 'rspec/rails'require 'database_cleaner/active_record'require 'ffaker'-require 'shoulda-matchers'Dir['./spec/support/**/*.rb'].sort.each { |f| require f }@@ -107,10 +106,3 @@ RSpec.configure do |config|config.order = :randomKernel.srand config.seedend--Shoulda::Matchers.configure do |config|- config.integrate do |with|- with.test_framework :rspec- with.library :rails- end-end