From b42cba8c37ea88445d2dd8d07773c4871fa5f807 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Mon, 4 Nov 2024 14:47:00 +1100 Subject: [PATCH] Add vine_voucher factory --- spec/controllers/checkout_controller_spec.rb | 3 +-- spec/factories/voucher_factory.rb | 6 ++++++ spec/requests/spree/admin/payments_spec.rb | 6 ++---- spec/services/vine/voucher_redeemer_service_spec.rb | 6 +++--- spec/services/vine/voucher_validator_service_spec.rb | 3 +-- spec/system/consumer/checkout/summary_spec.rb | 3 +-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/spec/controllers/checkout_controller_spec.rb b/spec/controllers/checkout_controller_spec.rb index 2b29e58250..71d3a3d91c 100644 --- a/spec/controllers/checkout_controller_spec.rb +++ b/spec/controllers/checkout_controller_spec.rb @@ -499,8 +499,7 @@ RSpec.describe CheckoutController, type: :controller do context "with a VINE voucher", feature: :connected_apps do let(:vine_voucher) { - create(:voucher_flat_rate, voucher_type: "VINE", code: 'some_code', - enterprise: distributor, amount: 6) + create(:vine_voucher, code: 'some_code', enterprise: distributor, amount: 6) } let(:vine_voucher_redeemer) { instance_double(Vine::VoucherRedeemerService) } diff --git a/spec/factories/voucher_factory.rb b/spec/factories/voucher_factory.rb index 821728b09f..034fae6b77 100644 --- a/spec/factories/voucher_factory.rb +++ b/spec/factories/voucher_factory.rb @@ -14,4 +14,10 @@ FactoryBot.define do factory :voucher_percentage_rate, parent: :voucher, class: Vouchers::PercentageRate do amount { rand(1..100) } end + + factory :vine_voucher, parent: :voucher_flat_rate do + voucher_type { Voucher::VINE_TYPE } + external_voucher_id { SecureRandom.uuid } + external_voucher_set_id { SecureRandom.uuid } + end end diff --git a/spec/requests/spree/admin/payments_spec.rb b/spec/requests/spree/admin/payments_spec.rb index 195611995a..7992064410 100644 --- a/spec/requests/spree/admin/payments_spec.rb +++ b/spec/requests/spree/admin/payments_spec.rb @@ -73,8 +73,7 @@ RSpec.describe Spree::Admin::PaymentsController, type: :request do context "with a VINE voucher", feature: :connected_apps do let(:vine_voucher) { - create(:voucher_flat_rate, voucher_type: "VINE", code: 'some_code', - enterprise: order.distributor, amount: 6) + create(:vine_voucher, code: 'some_code', enterprise: order.distributor, amount: 6) } let(:vine_voucher_redeemer) { instance_double(Vine::VoucherRedeemerService) } @@ -264,8 +263,7 @@ RSpec.describe Spree::Admin::PaymentsController, type: :request do context "with a VINE voucher", feature: :connected_apps do let(:vine_voucher) { - create(:voucher_flat_rate, voucher_type: "VINE", code: 'some_code', - enterprise: order.distributor, amount: 6) + create(:vine_voucher, code: 'some_code', enterprise: order.distributor, amount: 6) } let(:vine_voucher_redeemer) { instance_double(Vine::VoucherRedeemerService) } diff --git a/spec/services/vine/voucher_redeemer_service_spec.rb b/spec/services/vine/voucher_redeemer_service_spec.rb index fbfc4c3df1..50c73f2a1c 100644 --- a/spec/services/vine/voucher_redeemer_service_spec.rb +++ b/spec/services/vine/voucher_redeemer_service_spec.rb @@ -11,9 +11,9 @@ RSpec.describe Vine::VoucherRedeemerService, feature: :connected_apps do let(:order) { create(:order_with_line_items, line_items_count: 1, distributor:, order_cycle:) } let(:vine_voucher) { - create(:voucher_flat_rate, voucher_type: "VINE", code: 'some_code', enterprise: distributor, - amount: 6, external_voucher_id: voucher_id, - external_voucher_set_id: voucher_set_id ) + create(:vine_voucher, code: 'some_code', enterprise: distributor, + amount: 6, external_voucher_id: voucher_id, + external_voucher_set_id: voucher_set_id ) } let(:voucher_id) { "9d316d27-0dad-411a-8953-316a1aaf7742" } let(:voucher_set_id) { "9d314daa-0878-4b73-922d-698047640cf4" } diff --git a/spec/services/vine/voucher_validator_service_spec.rb b/spec/services/vine/voucher_validator_service_spec.rb index a3175e24e9..5e46df2b2e 100644 --- a/spec/services/vine/voucher_validator_service_spec.rb +++ b/spec/services/vine/voucher_validator_service_spec.rb @@ -275,8 +275,7 @@ RSpec.describe Vine::VoucherValidatorService, feature: :connected_apps do ) } let!(:voucher) { - create(:voucher_flat_rate, enterprise: distributor, code: voucher_code, - amount: 500, voucher_type: "VINE" ) + create(:vine_voucher, enterprise: distributor, code: voucher_code, amount: 500) } let(:data) { diff --git a/spec/system/consumer/checkout/summary_spec.rb b/spec/system/consumer/checkout/summary_spec.rb index bd9192d4ad..4ad66f422e 100644 --- a/spec/system/consumer/checkout/summary_spec.rb +++ b/spec/system/consumer/checkout/summary_spec.rb @@ -352,8 +352,7 @@ RSpec.describe "As a consumer, I want to checkout my order" do ) } let(:vine_voucher) { - create(:voucher_flat_rate, voucher_type: "VINE", code: 'some_vine_code', - enterprise: distributor, amount: 0.01) + create(:vine_voucher, code: 'some_vine_code', enterprise: distributor, amount: 0.01) } before do