diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index bcf0ef608b..97a9c2cfac 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1096,7 +1096,6 @@ Style/HashSyntax: - 'spec/helpers/spree/base_helper_spec.rb' - 'spec/jobs/report_job_spec.rb' - 'spec/jobs/subscription_confirm_job_spec.rb' - - 'spec/jobs/subscription_placement_job_spec.rb' - 'spec/jobs/webhook_delivery_job_spec.rb' - 'spec/lib/open_food_network/address_finder_spec.rb' - 'spec/lib/open_food_network/enterprise_fee_applicator_spec.rb' diff --git a/spec/jobs/subscription_placement_job_spec.rb b/spec/jobs/subscription_placement_job_spec.rb index 2876947b74..db71c53c14 100644 --- a/spec/jobs/subscription_placement_job_spec.rb +++ b/spec/jobs/subscription_placement_job_spec.rb @@ -19,9 +19,9 @@ describe SubscriptionPlacementJob do orders_close_at: 1.minute.ago) } let(:schedule) { create(:schedule, order_cycles: [order_cycle1, order_cycle2]) } - let(:subscription) { create(:subscription, shop: shop, schedule: schedule) } + let(:subscription) { create(:subscription, shop:, schedule:) } let!(:proxy_order) { - create(:proxy_order, subscription: subscription, order_cycle: order_cycle1) + create(:proxy_order, subscription:, order_cycle: order_cycle1) } # OK it "ignores proxy orders where the OC has closed" do @@ -58,12 +58,11 @@ describe SubscriptionPlacementJob do let(:shop) { order_cycle.coordinator } let(:order_cycle) { create(:simple_order_cycle) } let(:exchange) { - create( - :exchange, order_cycle: order_cycle, - sender: shop, receiver: shop, incoming: false - ) + create(:exchange, order_cycle:, sender: shop, receiver: shop, incoming: false) + } + let!(:proxy_order) { + create(:proxy_order, subscription:, order_cycle:, order:) } - let!(:proxy_order) { create(:proxy_order, subscription: subscription, order_cycle: order_cycle, order: order) } before do allow(job).to receive(:proxy_orders) { ProxyOrder.where(id: proxy_order.id) } @@ -101,8 +100,8 @@ describe SubscriptionPlacementJob do let!(:shipping_method_created_later) { create(:shipping_method, distributors: [shop]) } let(:shop) { create(:enterprise) } - let(:subscription) { create(:subscription, shop: shop, with_items: true) } - let(:proxy_order) { create(:proxy_order, subscription: subscription) } + let(:subscription) { create(:subscription, shop:, with_items: true) } + let(:proxy_order) { create(:proxy_order, subscription:) } let(:oc) { proxy_order.order_cycle } let(:ex) { oc.exchanges.outgoing.find_by(sender_id: shop.id, receiver_id: shop.id) } let(:fee) { create(:enterprise_fee, enterprise: shop, fee_type: 'sales', amount: 10) } @@ -192,9 +191,9 @@ describe SubscriptionPlacementJob do ) } let(:schedule) { create(:schedule, order_cycles: [order_cycle]) } - let(:subscription) { create(:subscription, shop: shop, schedule: schedule) } + let(:subscription) { create(:subscription, shop:, schedule:) } let!(:proxy_order) { - create(:proxy_order, subscription: subscription, order_cycle: order_cycle) + create(:proxy_order, subscription:, order_cycle:) } let(:breakpoint) { Mutex.new }