From b585f77be4ed53a161c8511dcb793da2a3bf9e54 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Fri, 5 May 2023 16:14:21 +1000 Subject: [PATCH] Make enterprise mandatory for a voucher It should have already been the case... --- app/models/voucher.rb | 2 +- spec/models/spree/order_spec.rb | 3 ++- spec/models/voucher_spec.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/voucher.rb b/app/models/voucher.rb index 2f8fd3c137..94743fc731 100644 --- a/app/models/voucher.rb +++ b/app/models/voucher.rb @@ -3,7 +3,7 @@ class Voucher < ApplicationRecord acts_as_paranoid - belongs_to :enterprise + belongs_to :enterprise, optional: false has_many :adjustments, as: :originator, diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index 2ed17bb083..5c250f970e 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -1432,6 +1432,8 @@ describe Spree::Order do end describe "#voucher_adjustments" do + let(:distributor) { create(:distributor_enterprise) } + let(:order) { create(:order, user: user, distributor: distributor) } let(:voucher) { create(:voucher, code: 'new_code', enterprise: order.distributor) } context "when no voucher adjustment" do @@ -1441,7 +1443,6 @@ describe Spree::Order do end it "returns an array of voucher adjusment" do - order.save! expected_adjustments = Array.new(2) { voucher.create_adjustment(voucher.code, order) } expect(order.voucher_adjustments).to eq(expected_adjustments) diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb index d600913964..c5bbcdabe5 100644 --- a/spec/models/voucher_spec.rb +++ b/spec/models/voucher_spec.rb @@ -6,7 +6,7 @@ describe Voucher do let(:enterprise) { build(:enterprise) } describe 'associations' do - it { is_expected.to belong_to(:enterprise) } + it { is_expected.to belong_to(:enterprise).required } it { is_expected.to have_many(:adjustments) } end