raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Style/HashSyntax

Browse Source
This commit is contained in:
Neal Chambers
2023-09-20 23:46:26 +09:00
parent d216b68993
commit 29df80945d
30 changed files with 154 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spec/controllers/payment_gateways/stripe_controller_spec.rb
View File

@@ -8,7 +8,7 @@ module PaymentGateways
let!(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) }
let!(:order_cycle) { create(:simple_order_cycle, distributors: [distributor]) }
let!(:order) { create(:order_with_totals, distributor: distributor, order_cycle: order_cycle) }
let!(:order) { create(:order_with_totals, distributor:, order_cycle:) }
let(:exchange) { order_cycle.exchanges.to_enterprises(distributor).outgoing.first }
let(:order_cycle_distributed_variants) { instance_double(OrderCycleDistributedVariants) }
@@ -27,7 +27,7 @@ module PaymentGateways
:payment,
amount: order.total,
state: "requires_authorization",
payment_method: payment_method,
payment_method:,
response_code: "pi_123"
)
}
@@ -35,7 +35,7 @@ module PaymentGateways
before do
Stripe.api_key = "sk_test_12345"
stub_payment_intent_get_request
stub_successful_capture_request(order: order)
stub_successful_capture_request(order:)
allow(controller).to receive(:spree_current_user).and_return(user)
user.bill_address = create(:address)
@@ -155,9 +155,9 @@ please check the details you entered"
end
context "handling pending payments" do
let!(:payment) { create(:payment, state: "pending", amount: order.total, order: order) }
let!(:payment) { create(:payment, state: "pending", amount: order.total, order:) }
let!(:transaction_fee) {
create(:adjustment, state: "open", amount: 10, order: order, adjustable: payment)
create(:adjustment, state: "open", amount: 10, order:, adjustable: payment)
}
before do
@@ -191,17 +191,17 @@ completed due to stock issues."
describe "#authorize" do
let(:customer) { create(:customer) }
let(:order) {
create(:order_with_totals, customer: customer, distributor: customer.enterprise,
create(:order_with_totals, customer:, distributor: customer.enterprise,
state: "payment")
}
let(:payment_method) { create(:stripe_sca_payment_method) }
let!(:payment) {
create(
:payment,
payment_method: payment_method,
payment_method:,
cvv_response_message: "https://stripe.com/redirect",
response_code: "pi_123",
order: order,
order:,
state: "requires_authorization"
)
}
@@ -230,7 +230,7 @@ completed due to stock issues."
payment.complete!
end
get :authorize, params: { order_number: order.number, payment_intent: payment_intent }
get :authorize, params: { order_number: order.number, payment_intent: }
expect(response).to redirect_to order_path(order)
payment.reload
@@ -243,7 +243,7 @@ completed due to stock issues."
payment.complete!
end
get :authorize, params: { order_number: order.number, payment_intent: payment_intent }
get :authorize, params: { order_number: order.number, payment_intent: }
expect(order.reload.state).to eq "complete"
end
@@ -259,7 +259,7 @@ completed due to stock issues."
payment.complete!
end
get :authorize, params: { order_number: order.number, payment_intent: payment_intent }
get :authorize, params: { order_number: order.number, payment_intent: }
expect(response).to redirect_to order_path(order)
payment.reload
@@ -274,7 +274,7 @@ completed due to stock issues."
payment.complete!
end
get :authorize, params: { order_number: order.number, payment_intent: payment_intent }
get :authorize, params: { order_number: order.number, payment_intent: }
expect(response).to redirect_to order_path(order)
payment.reload
@@ -293,7 +293,7 @@ completed due to stock issues."
end
it "does not complete the payment" do
get :authorize, params: { order_number: order.number, payment_intent: payment_intent }
get :authorize, params: { order_number: order.number, payment_intent: }
expect(response).to redirect_to order_path(order)
expect(flash[:error]).to eq("The payment could not be processed. error message")
@@ -316,7 +316,7 @@ completed due to stock issues."
end
it "does not complete the payment" do
get :authorize, params: { order_number: order.number, payment_intent: payment_intent }
get :authorize, params: { order_number: order.number, payment_intent: }
expect(response).to redirect_to order_path(order)
expect(flash[:error]).to eq("The payment could not be processed. ")

34
spec/controllers/split_checkout_controller_spec.rb
View File

@@ -9,8 +9,8 @@ describe SplitCheckoutController, type: :controller do
let(:order_cycle) { create(:order_cycle, distributors: [distributor]) }
let(:exchange) { order_cycle.exchanges.outgoing.first }
let(:order) {
create(:order_with_line_items, line_items_count: 1, distributor: distributor,
order_cycle: order_cycle)
create(:order_with_line_items, line_items_count: 1, distributor:,
order_cycle:)
}
let(:payment_method) { distributor.payment_methods.first }
let(:shipping_method) { distributor.shipping_methods.first }
@@ -72,7 +72,7 @@ describe SplitCheckoutController, type: :controller do
describe "#update" do
let(:checkout_params) { {} }
let(:params) { { step: step }.merge(checkout_params) }
let(:params) { { step: }.merge(checkout_params) }
context "details step" do
let(:step) { "details" }
@@ -81,7 +81,7 @@ describe SplitCheckoutController, type: :controller do
let(:checkout_params) { { order: { email: user.email } } }
it "returns 422 and some feedback" do
put :update, params: params
put(:update, params:)
expect(response.status).to eq 422
expect(flash[:error]).to match "Saving failed, please update the highlighted fields."
@@ -102,7 +102,7 @@ describe SplitCheckoutController, type: :controller do
end
it "updates and redirects to payment step" do
put :update, params: params
put(:update, params:)
expect(response).to redirect_to checkout_step_path(:payment)
expect(order.reload.state).to eq "payment"
@@ -156,7 +156,7 @@ describe SplitCheckoutController, type: :controller do
let(:checkout_params) { { order: { email: user.email } } }
it "returns 422 and some feedback" do
put :update, params: params
put(:update, params:)
expect(response.status).to eq 422
expect(flash[:error]).to match "Saving failed, please update the highlighted fields."
@@ -176,7 +176,7 @@ describe SplitCheckoutController, type: :controller do
end
it "updates and redirects to payment step" do
put :update, params: params
put(:update, params:)
expect(response).to redirect_to checkout_step_path(:summary)
expect(order.reload.state).to eq "confirmation"
@@ -198,7 +198,7 @@ describe SplitCheckoutController, type: :controller do
end
it "applies the fee and updates the order total" do
put :update, params: params
put(:update, params:)
expect(response).to redirect_to checkout_step_path(:summary)
@@ -223,7 +223,7 @@ describe SplitCheckoutController, type: :controller do
end
it "allows proceeding to confirmation" do
put :update, params: params
put(:update, params:)
expect(response).to redirect_to checkout_step_path(:summary)
expect(order.reload.state).to eq "confirmation"
@@ -233,7 +233,7 @@ describe SplitCheckoutController, type: :controller do
end
context "with a saved credit card" do
let!(:saved_card) { create(:stored_credit_card, user: user) }
let!(:saved_card) { create(:stored_credit_card, user:) }
let(:checkout_params) do
{
order: {
@@ -246,7 +246,7 @@ describe SplitCheckoutController, type: :controller do
end
it "updates and redirects to payment step" do
put :update, params: params
put(:update, params:)
expect(response).to redirect_to checkout_step_path(:summary)
expect(order.reload.state).to eq "confirmation"
@@ -264,13 +264,13 @@ describe SplitCheckoutController, type: :controller do
order.select_shipping_method shipping_method.id
OrderWorkflow.new(order).advance_to_payment
order.payments << build(:payment, amount: order.total, payment_method: payment_method)
order.payments << build(:payment, amount: order.total, payment_method:)
order.next
end
describe "confirming the order" do
it "completes the order and redirects to order confirmation" do
put :update, params: params
put(:update, params:)
expect(response).to redirect_to order_path(order, order_token: order.token)
expect(order.reload.state).to eq "complete"
@@ -286,7 +286,7 @@ describe SplitCheckoutController, type: :controller do
let(:checkout_params) { {} }
it "returns 422 and some feedback" do
put :update, params: params
put(:update, params:)
expect(response.status).to eq 422
expect(flash[:error]).to match "Saving failed, please update the highlighted fields."
@@ -298,7 +298,7 @@ describe SplitCheckoutController, type: :controller do
let(:checkout_params) { { accept_terms: true } }
it "completes the order and redirects to order confirmation" do
put :update, params: params
put(:update, params:)
expect(response).to redirect_to order_path(order, order_token: order.token)
expect(order.reload.state).to eq "complete"
@@ -316,7 +316,7 @@ describe SplitCheckoutController, type: :controller do
describe "confirming the order" do
it "redirects to the payment gateway's URL" do
put :update, params: params
put(:update, params:)
expect(response.body).to match("https://example.com/pay").and match("redirect")
expect(order.reload.state).to eq "confirmation"
@@ -332,7 +332,7 @@ describe SplitCheckoutController, type: :controller do
before do
allow(controller).to receive(:current_order).and_return(order)
allow(order).to receive(:distributor).and_return(distributor)
order.update(order_cycle: order_cycle)
order.update(order_cycle:)
allow(OrderCycleDistributedVariants).to receive(:new).and_return(
order_cycle_distributed_variants

26
spec/controllers/spree/admin/adjustments_controller_spec.rb
View File

@@ -11,17 +11,17 @@ module Spree
describe "index" do
let!(:order) { create(:completed_order_with_totals) }
let!(:adjustment1) {
create(:adjustment, originator_type: "Spree::ShippingMethod", order: order,
create(:adjustment, originator_type: "Spree::ShippingMethod", order:,
adjustable: order.shipment)
}
let!(:adjustment2) {
create(:adjustment, originator_type: "Spree::PaymentMethod", eligible: true, order: order)
create(:adjustment, originator_type: "Spree::PaymentMethod", eligible: true, order:)
}
let!(:adjustment3) {
create(:adjustment, originator_type: "Spree::PaymentMethod", eligible: false, order: order)
create(:adjustment, originator_type: "Spree::PaymentMethod", eligible: false, order:)
}
let!(:adjustment4) { create(:adjustment, originator_type: "EnterpriseFee", order: order) }
let!(:adjustment5) { create(:adjustment, originator: nil, adjustable: order, order: order) }
let!(:adjustment4) { create(:adjustment, originator_type: "EnterpriseFee", order:) }
let!(:adjustment5) { create(:adjustment, originator: nil, adjustable: order, order:) }
it "displays eligible adjustments" do
spree_get :index, order_id: order.number
@@ -46,7 +46,7 @@ module Spree
describe "setting the adjustment's tax" do
let(:order) { create(:order) }
let(:zone) { create(:zone_with_member) }
let(:tax_rate) { create(:tax_rate, amount: 0.1, zone: zone, included_in_price: true ) }
let(:tax_rate) { create(:tax_rate, amount: 0.1, zone:, included_in_price: true ) }
describe "creating an adjustment" do
let(:tax_category_param) { '' }
@@ -98,12 +98,12 @@ module Spree
context "when the tax category has multiple rates for the same tax zone" do
let(:tax_category) { create(:tax_category) }
let!(:tax_rate1) {
create(:tax_rate, amount: 0.1, zone: zone, included_in_price: false,
tax_category: tax_category )
create(:tax_rate, amount: 0.1, zone:, included_in_price: false,
tax_category: )
}
let!(:tax_rate2) {
create(:tax_rate, amount: 0.2, zone: zone, included_in_price: false,
tax_category: tax_category )
create(:tax_rate, amount: 0.2, zone:, included_in_price: false,
tax_category: )
}
let(:tax_category_param) { tax_category.id.to_s }
let(:params) {
@@ -145,7 +145,7 @@ module Spree
}
}
let(:adjustment) {
create(:adjustment, adjustable: order, order: order,
create(:adjustment, adjustable: order, order:,
amount: 1100, tax_category: old_tax_category)
}
@@ -190,7 +190,7 @@ module Spree
describe "#delete" do
let!(:order) { create(:completed_order_with_totals) }
let(:payment_fee) {
create(:adjustment, amount: 0.50, order: order, adjustable: order.payments.first)
create(:adjustment, amount: 0.50, order:, adjustable: order.payments.first)
}
context "as an enterprise user with edit permissions on the order" do
@@ -226,7 +226,7 @@ module Spree
let(:order) { create(:completed_order_with_totals) }
let(:tax_rate) { create(:tax_rate, amount: 0.1, calculator: ::Calculator::DefaultTax.new) }
let(:adjustment) {
create(:adjustment, adjustable: order, order: order, amount: 1100)
create(:adjustment, adjustable: order, order:, amount: 1100)
}
before do

2
spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
View File

@@ -16,7 +16,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
:order_with_totals_and_distribution,
state: 'cart',
shipments: [shipment],
distributor: distributor,
distributor:,
user: nil,
email: nil,
bill_address: nil,

6
spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
View File

@@ -9,7 +9,7 @@ describe Spree::Admin::PaymentsController, type: :controller do
let!(:shop) { create(:enterprise) }
let!(:user) { shop.owner }
let!(:order) { create(:completed_order_with_totals, distributor: shop) }
let!(:line_item) { create(:line_item, order: order, price: 5.0) }
let!(:line_item) { create(:line_item, order:, price: 5.0) }
before do
allow(controller).to receive(:spree_current_user) { user }
@@ -26,7 +26,7 @@ describe Spree::Admin::PaymentsController, type: :controller do
context "that was processed by stripe" do
let!(:payment_method) { create(:stripe_sca_payment_method, distributors: [shop]) }
let!(:payment) do
create(:payment, :completed, order: order, payment_method: payment_method,
create(:payment, :completed, order:, payment_method:,
response_code: 'pi_123', amount: order.total)
end
let(:stripe_account) { create(:stripe_account, enterprise: shop) }
@@ -136,7 +136,7 @@ describe Spree::Admin::PaymentsController, type: :controller do
context "that was processed by stripe" do
let!(:payment_method) { create(:stripe_sca_payment_method, distributors: [shop]) }
let!(:payment) do
create(:payment, :completed, order: order, payment_method: payment_method,
create(:payment, :completed, order:, payment_method:,
response_code: 'pi_123', amount: order.total + 5)
end

8
spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb
View File

@@ -6,7 +6,7 @@ describe Spree::Admin::PaymentsController, type: :controller do
let!(:shop) { create(:enterprise) }
let!(:user) { shop.owner }
let!(:order) { create(:order, distributor: shop, state: 'complete') }
let!(:line_item) { create(:line_item, order: order, price: 5.0) }
let!(:line_item) { create(:line_item, order:, price: 5.0) }
before do
allow(controller).to receive(:spree_current_user) { user }
@@ -106,7 +106,7 @@ describe Spree::Admin::PaymentsController, type: :controller do
year: "2100"
}
spree_post :create, payment: params.merge({ source_attributes: source_attributes }),
spree_post :create, payment: params.merge({ source_attributes: }),
order_id: order.number
payment = order.reload.payments.last
@@ -149,7 +149,7 @@ describe Spree::Admin::PaymentsController, type: :controller do
end
let(:order) { create(:order, state: 'complete') }
let(:payment) do
create(:payment, order: order, payment_method: payment_method, amount: order.total)
create(:payment, order:, payment_method:, amount: order.total)
end
let(:successful_response) { ActiveMerchant::Billing::Response.new(true, "Yay!") }
@@ -275,7 +275,7 @@ describe Spree::Admin::PaymentsController, type: :controller do
end
let!(:order) { create(:order, state: 'canceled') }
let!(:payment) do
create(:payment, order: order, payment_method: payment_method, amount: order.total)
create(:payment, order:, payment_method:, amount: order.total)
end
it "renders the payments tab" do

10
spec/controllers/spree/admin/orders_controller_spec.rb
View File

@@ -18,7 +18,7 @@ describe Spree::Admin::OrdersController, type: :controller do
originator_type: "Spree::PaymentMethod",
label: "invalid adjustment",
eligible: false,
order: order,
order:,
amount: 0
)
@@ -81,8 +81,8 @@ describe Spree::Admin::OrdersController, type: :controller do
}
let!(:order) do
order = create(:completed_order_with_totals, line_items_count: 2,
distributor: distributor,
order_cycle: order_cycle)
distributor:,
order_cycle:)
order.reload.line_items.first.update(variant_id: variant1.id)
order.line_items.last.update(variant_id: variant2.id)
break unless order.next! while !order.completed?
@@ -147,7 +147,7 @@ describe Spree::Admin::OrdersController, type: :controller do
let(:zone) { create(:zone_with_member) }
let(:tax_included) { true }
let(:tax_rate) {
create(:tax_rate, amount: 0.25, included_in_price: tax_included, zone: zone)
create(:tax_rate, amount: 0.25, included_in_price: tax_included, zone:)
}
let!(:enterprise_fee) {
create(:enterprise_fee, tax_category: tax_rate.tax_category, amount: 1)
@@ -187,7 +187,7 @@ describe Spree::Admin::OrdersController, type: :controller do
context "when the order has legacy taxes" do
let(:legacy_tax_adjustment) {
create(:adjustment, amount: 0.5, included: false, originator: tax_rate,
order: order, adjustable: order, state: "closed")
order:, adjustable: order, state: "closed")
}
before do

2
spec/controllers/spree/admin/payment_methods_controller_spec.rb
View File

@@ -239,7 +239,7 @@ module Spree
password_confirmation: 'blahblah', )
# for some reason unbeknown to me, this new user gets admin permissions by default.
new_user.spree_roles = []
new_user.enterprise_roles.build(enterprise: enterprise).save
new_user.enterprise_roles.build(enterprise:).save
new_user.save
new_user
end

6
spec/controllers/spree/admin/search_controller_spec.rb
View File

@@ -7,7 +7,7 @@ describe Spree::Admin::SearchController, type: :controller do
let!(:owner) { create(:user, email: "test1@email.com" ) }
let!(:manager) { create(:user, email: "test2@email.com" ) }
let!(:random) { create(:user, email: "test3@email.com" ) }
let!(:enterprise) { create(:enterprise, owner: owner, users: [owner, manager]) }
let!(:enterprise) { create(:enterprise, owner:, users: [owner, manager]) }
before { controller_login_as_enterprise_user [enterprise] }
describe 'searching for known users' do
@@ -34,8 +34,8 @@ describe Spree::Admin::SearchController, type: :controller do
end
describe 'searching for customers' do
let!(:customer_1) { create(:customer, enterprise: enterprise, email: 'test1@email.com') }
let!(:customer_2) { create(:customer, enterprise: enterprise, first_name: 'test2') }
let!(:customer_1) { create(:customer, enterprise:, email: 'test1@email.com') }
let!(:customer_2) { create(:customer, enterprise:, first_name: 'test2') }
let!(:customer_3) { create(:customer, email: 'test3@email.com') }
describe 'when search owned enterprises' do

4
spec/controllers/spree/admin/taxons_controller_spec.rb
View File

@@ -6,8 +6,8 @@ describe Spree::Admin::TaxonsController do
render_views
let(:taxonomy) { create(:taxonomy) }
let(:taxon) { create(:taxon, name: "Ruby", taxonomy: taxonomy) }
let(:taxon2) { create(:taxon, name: "Rails", taxonomy: taxonomy) }
let(:taxon) { create(:taxon, name: "Ruby", taxonomy:) }
let(:taxon2) { create(:taxon, name: "Rails", taxonomy:) }
before do
allow(controller).to receive(:spree_current_user) { current_api_user }

2
spec/controllers/spree/credit_cards_controller_spec.rb
View File

@@ -80,7 +80,7 @@ describe Spree::CreditCardsController, type: :controller do
exp_month: 12,
exp_year: Time.now.year.next,
last4: 4242,
token: token,
token:,
cc_type: "visa"
}
end

20
spec/controllers/spree/orders_controller_spec.rb
View File

@@ -13,7 +13,7 @@ describe Spree::OrdersController, type: :controller do
describe "viewing an order" do
let(:customer) { create(:customer) }
let(:order) {
create(:order_with_credit_payment, customer: customer, distributor: customer.enterprise)
create(:order_with_credit_payment, customer:, distributor: customer.enterprise)
}
before do
@@ -115,7 +115,7 @@ describe Spree::OrdersController, type: :controller do
order = subject.current_order(true)
allow(distributor).to receive(:ready_for_checkout?) { false }
allow(order).to receive_messages(distributor: distributor, order_cycle: order_cycle)
allow(order).to receive_messages(distributor:, order_cycle:)
expect(order).to receive(:empty!)
expect(order).to receive(:set_distribution!).with(nil, nil)
@@ -234,9 +234,9 @@ describe Spree::OrdersController, type: :controller do
}
let(:shipping_tax_category) { create(:tax_category, tax_rates: [shipping_tax_rate]) }
let(:order) {
create(:completed_order_with_fees, distributor: distributor, shipping_fee: shipping_fee,
payment_fee: payment_fee,
shipping_tax_category: shipping_tax_category)
create(:completed_order_with_fees, distributor:, shipping_fee:,
payment_fee:,
shipping_tax_category:)
}
let(:line_item1) { order.line_items.first }
let(:line_item2) { order.line_items.second }
@@ -288,9 +288,9 @@ describe Spree::OrdersController, type: :controller do
enterprise_fees: [enterprise_fee])
}
let!(:order) do
order = create(:completed_order_with_totals, line_items_count: 2, user: user,
distributor: distributor,
order_cycle: order_cycle)
order = create(:completed_order_with_totals, line_items_count: 2, user:,
distributor:,
order_cycle:)
order.reload.line_items.first.update(variant_id: variant1.id)
order.reload.line_items.last.update(variant_id: variant2.id)
break unless order.next! while !order.completed?
@@ -451,7 +451,7 @@ describe Spree::OrdersController, type: :controller do
describe "cancelling an order" do
let(:user) { create(:user) }
let(:order) { create(:order, user: user) }
let(:order) { create(:order, user:) }
let(:params) { { id: order.number } }
context "when the user does not have permission to cancel the order" do
@@ -478,7 +478,7 @@ describe Spree::OrdersController, type: :controller do
context "when the order is complete" do
let(:order) {
create(:completed_order_with_totals, user: user,
create(:completed_order_with_totals, user:,
distributor: create(:distributor_enterprise))
}

12
spec/controllers/stripe/webhooks_controller_spec.rb
View File

@@ -22,7 +22,7 @@ describe Stripe::WebhooksController, type: :controller do
end
it "responds with a 400" do
post 'create', params: params
post('create', params:)
expect(response.status).to eq 400
end
end
@@ -36,7 +36,7 @@ describe Stripe::WebhooksController, type: :controller do
end
it "responds with a 401" do
post 'create', params: params
post('create', params:)
expect(response.status).to eq 401
end
end
@@ -54,7 +54,7 @@ describe Stripe::WebhooksController, type: :controller do
before { allow(handler).to receive(:handle) { :garbage } }
it "falls back to 200" do
post 'create', params: params
post('create', params:)
expect(response.status).to eq 200
end
end
@@ -63,7 +63,7 @@ describe Stripe::WebhooksController, type: :controller do
before { allow(handler).to receive(:handle) { :unknown } }
it "responds with 202" do
post 'create', params: params
post('create', params:)
expect(response.status).to eq 202
end
end
@@ -77,7 +77,7 @@ describe Stripe::WebhooksController, type: :controller do
context "when the stripe_account id on the event does not match any known accounts" do
it "doesn't delete any Stripe accounts, responds with 204" do
post 'create', params: params
post('create', params:)
expect(response.status).to eq 204
expect(StripeAccount.all).to include stripe_account
end
@@ -87,7 +87,7 @@ describe Stripe::WebhooksController, type: :controller do
before { params["account"] = "webhook_id" }
it "deletes Stripe accounts in response to a webhook" do
post 'create', params: params
post('create', params:)
expect(response.status).to eq 200
expect(StripeAccount.all).not_to include stripe_account
end

2
spec/factories/line_item_factory.rb
View File

@@ -23,7 +23,7 @@ FactoryBot.define do
shipping_fee: evaluator.shipping_fee)
shipping_method.distributors << line_item.order.distributor if line_item.order.distributor
end
shipment = create(:shipment_with, :shipping_method, shipping_method: shipping_method,
shipment = create(:shipment_with, :shipping_method, shipping_method:,
order: line_item.order)
end
line_item.target_shipment = shipment

6
spec/factories/order_cycle_factory.rb
View File

@@ -16,14 +16,14 @@ FactoryBot.define do
after(:create) do |_oc, proxy|
proxy.exchanges.incoming.each do |exchange|
ExchangeFee.create!(
exchange: exchange,
exchange:,
enterprise_fee: create(:enterprise_fee, enterprise: exchange.sender)
)
end
proxy.exchanges.outgoing.each do |exchange|
ExchangeFee.create!(
exchange: exchange,
exchange:,
enterprise_fee: create(:enterprise_fee, enterprise: exchange.receiver)
)
end
@@ -52,7 +52,7 @@ FactoryBot.define do
factory :order_cycle_with_overrides, parent: :order_cycle do
after(:create) do |oc|
oc.variants.each do |variant|
create(:variant_override, variant: variant,
create(:variant_override, variant:,
hub: oc.distributors.first,
price: variant.price + 100)
end

34
spec/factories/order_factory.rb
View File

@@ -16,7 +16,7 @@ FactoryBot.define do
order_cycle { create(:order_cycle, distributors: [distributor]) }
after(:create) do |order|
order.line_items << build(:line_item, order: order)
order.line_items << build(:line_item, order:)
order.update_totals_and_states
order.order_cycle.exchanges.outgoing.first.variants << order.line_items.first.variant
@@ -47,7 +47,7 @@ FactoryBot.define do
factory :order_with_totals do
after(:create) do |order|
create(:line_item, order: order)
create(:line_item, order:)
order.line_items.reload # to ensure order.line_items is accessible after
order.update_totals_and_states
end
@@ -62,10 +62,10 @@ FactoryBot.define do
end
after(:create) do |order, evaluator|
create(:shipment, order: order)
create(:shipment, order:)
order.shipments.reload
create_list(:line_item, evaluator.line_items_count, order: order)
create_list(:line_item, evaluator.line_items_count, order:)
order.line_items.reload
order.update_order!
end
@@ -82,7 +82,7 @@ FactoryBot.define do
payment_state { 'paid' }
shipment_state { 'ready' }
after(:create) do |order|
create(:payment, :completed, amount: order.total, order: order)
create(:payment, :completed, amount: order.total, order:)
order.shipments.each do |shipment|
shipment.inventory_units.each { |u| u.update_column('state', 'on_hand') }
@@ -110,7 +110,7 @@ FactoryBot.define do
end
after(:create) do |order, evaluator|
line_item = create(:line_item_with_shipment, order: order,
line_item = create(:line_item_with_shipment, order:,
variant: evaluator.variant,
shipping_method: evaluator.shipping_method)
order.shipments << line_item.target_shipment
@@ -124,7 +124,7 @@ FactoryBot.define do
end
after(:create) do |order, evaluator|
create(:payment, state: "checkout", order: order, amount: order.total,
create(:payment, state: "checkout", order:, amount: order.total,
payment_method: evaluator.payment_method)
order.recreate_all_fees!
order.ship_address = evaluator.ship_address
@@ -146,8 +146,8 @@ FactoryBot.define do
after(:create) do |order, proxy|
product = create(:simple_product)
create(:line_item_with_shipment, shipping_fee: proxy.shipping_fee,
order: order,
product: product)
order:,
product:)
order.reload
end
@@ -161,7 +161,7 @@ FactoryBot.define do
after(:create) do |order, evaluator|
# Ensure order is valid and passes through necessary checkout steps
create(:payment, state: "checkout", order: order, amount: order.total,
create(:payment, state: "checkout", order:, amount: order.total,
payment_method: evaluator.payment_method)
order.ship_address = evaluator.ship_address
break unless order.next! while !order.completed?
@@ -198,7 +198,7 @@ FactoryBot.define do
tax_rate_name: proxy.tax_rate_name,
included_in_price: proxy.included_in_price)
create(:line_item, order: order, variant: product.variants.first, price: product.price)
create(:line_item, order:, variant: product.variants.first, price: product.price)
order.reload
end
end
@@ -212,7 +212,7 @@ FactoryBot.define do
end
after(:create) do |order, evaluator|
create(:payment, :completed, amount: order.total + evaluator.credit_amount, order: order)
create(:payment, :completed, amount: order.total + evaluator.credit_amount, order:)
order.reload
end
@@ -227,7 +227,7 @@ FactoryBot.define do
end
after(:create) do |order, evaluator|
create(:payment, amount: order.total - evaluator.unpaid_amount, order: order,
create(:payment, amount: order.total - evaluator.unpaid_amount, order:,
state: "completed")
order.reload
end
@@ -244,15 +244,15 @@ FactoryBot.define do
order_cycle { create(:simple_order_cycle) }
after(:create) do |order, evaluator|
create(:line_item, order: order)
create(:line_item, order:)
product = create(:simple_product)
create(:line_item, order: order, product: product)
create(:line_item, order:, product:)
payment_calculator = build(:calculator_per_item, preferred_amount: evaluator.payment_fee)
payment_method = create(:payment_method, calculator: payment_calculator)
create(:payment, order: order,
create(:payment, order:,
amount: order.total,
payment_method: payment_method,
payment_method:,
state: 'checkout')
create(:shipping_method_with, :shipping_fee, shipping_fee: evaluator.shipping_fee,

2
spec/factories/shipment_factory.rb
View File

@@ -39,7 +39,7 @@ FactoryBot.define do
end
shipping_rates {
[Spree::ShippingRate.create(shipping_method: shipping_method, selected: true)]
[Spree::ShippingRate.create(shipping_method:, selected: true)]
}
after(:create) do |shipment, _evaluator|

4
spec/factories/subscription_factory.rb
View File

@@ -20,7 +20,7 @@ FactoryBot.define do
if proxy.with_items
subscription.subscription_line_items = build_list(:subscription_line_item,
3,
subscription: subscription)
subscription:)
subscription.order_cycles.each do |oc|
ex = oc.exchanges.outgoing.find_by(sender_id: subscription.shop_id,
receiver_id: subscription.shop_id)
@@ -36,7 +36,7 @@ FactoryBot.define do
if proxy.with_proxy_orders
subscription.order_cycles.each do |oc|
subscription.proxy_orders << create(:proxy_order, subscription: subscription,
subscription.proxy_orders << create(:proxy_order, subscription:,
order_cycle: oc)
end
end

8
spec/helpers/admin/orders_helper_spec.rb
View File

@@ -7,13 +7,13 @@ describe Admin::OrdersHelper, type: :helper do
let(:order) { create(:order) }
it "selects eligible adjustments" do
adjustment = create(:adjustment, order: order, adjustable: order, amount: 1)
adjustment = create(:adjustment, order:, adjustable: order, amount: 1)
expect(helper.order_adjustments_for_display(order)).to eq [adjustment]
end
it "filters shipping method adjustments" do
create(:adjustment, order: order, adjustable: build(:shipment), amount: 1,
create(:adjustment, order:, adjustable: build(:shipment), amount: 1,
originator_type: "Spree::ShippingMethod")
expect(helper.order_adjustments_for_display(order)).to eq []
@@ -21,14 +21,14 @@ describe Admin::OrdersHelper, type: :helper do
it "filters ineligible payment adjustments" do
create(:adjustment, adjustable: build(:payment), amount: 0, eligible: false,
originator_type: "Spree::PaymentMethod", order: order)
originator_type: "Spree::PaymentMethod", order:)
expect(helper.order_adjustments_for_display(order)).to eq []
end
it "filters out line item adjustments" do
create(:adjustment, adjustable: build(:line_item), amount: 0, eligible: false,
originator_type: "EnterpriseFee", order: order)
originator_type: "EnterpriseFee", order:)
expect(helper.order_adjustments_for_display(order)).to eq []
end

12
spec/helpers/checkout_helper_spec.rb
View File

@@ -118,7 +118,7 @@ describe CheckoutHelper, type: :helper do
it "knows if guests can checkout" do
distributor = create(:distributor_enterprise)
order = create(:order, distributor: distributor)
order = create(:order, distributor:)
allow(helper).to receive(:current_order) { order }
expect(helper.guest_checkout_allowed?).to be true
@@ -131,7 +131,7 @@ describe CheckoutHelper, type: :helper do
let(:enterprise_fee) { create(:enterprise_fee, amount: 123) }
let!(:fee_adjustment) {
create(:adjustment, originator: enterprise_fee, adjustable: order,
order: order, label: "Enterprise Fee")
order:, label: "Enterprise Fee")
}
before do
@@ -153,19 +153,19 @@ describe CheckoutHelper, type: :helper do
let!(:tax_rate) { create(:tax_rate, amount: 0.1, calculator: ::Calculator::DefaultTax.new) }
let!(:line_item_fee_adjustment) {
create(:adjustment, originator: enterprise_fee, adjustable: order.line_items.first,
order: order)
order:)
}
let!(:order_tax_adjustment) {
create(:adjustment,
originator: tax_rate,
adjustable: fee_adjustment,
order: order)
order:)
}
let!(:line_item_fee_adjustment_tax_adjustment) {
create(:adjustment,
originator: tax_rate,
adjustable: line_item_fee_adjustment,
order: order)
order:)
}
it "removes tax rate adjustments" do
@@ -180,7 +180,7 @@ describe CheckoutHelper, type: :helper do
context "with return authorization adjustments" do
let!(:return_adjustment) {
create(:adjustment, originator_type: 'Spree::ReturnAuthorization', adjustable: order,
order: order)
order:)
}
it "includes return adjustments" do

2
spec/helpers/spree/base_helper_spec.rb
View File

@@ -38,7 +38,7 @@ describe Spree::BaseHelper do
context "checkout zone is of type state" do
before do
state_zone = create(:zone, name: "StateZone")
state = create(:state, country: country)
state = create(:state, country:)
state_zone.members.create(zoneable: state)
Spree::Config[:checkout_zone] = state_zone.name
end

6
spec/jobs/report_job_spec.rb
View File

@@ -4,8 +4,8 @@ require 'spec_helper'
describe ReportJob do
let(:report_args) {
{ report_class: report_class, user: user, params: params, format: format,
blob: blob }
{ report_class:, user:, params:, format:,
blob: }
}
let(:report_class) { Reporting::Reports::UsersAndEnterprises::Base }
let(:user) { enterprise.owner }
@@ -46,7 +46,7 @@ describe ReportJob do
}.to enqueue_mail(ReportMailer, :report_ready).with(
params: {
to: user.email,
blob: blob,
blob:,
},
args: [],
)

6
spec/jobs/subscription_confirm_job_spec.rb
View File

@@ -16,9 +16,9 @@ describe SubscriptionConfirmJob do
updated_at: 1.day.ago)
}
let(:schedule) { create(:schedule, order_cycles: [order_cycle1, order_cycle2]) }
let(:subscription) { create(:subscription, with_items: true, shop: shop, schedule: schedule) }
let(:subscription) { create(:subscription, with_items: true, shop:, schedule:) }
let!(:proxy_order) do
create(:proxy_order, subscription: subscription, order_cycle: order_cycle1,
create(:proxy_order, subscription:, order_cycle: order_cycle1,
placed_at: 5.minutes.ago)
end
let!(:order) { proxy_order.initialise_order! }
@@ -135,7 +135,7 @@ describe SubscriptionConfirmJob do
let(:order_cycle1) { create(:simple_order_cycle, coordinator: shop) }
let(:order_cycle2) { create(:simple_order_cycle, coordinator: shop) }
let(:schedule1) { create(:schedule, order_cycles: [order_cycle1, order_cycle2]) }
let(:subscription1) { create(:subscription, shop: shop, schedule: schedule1, with_items: true) }
let(:subscription1) { create(:subscription, shop:, schedule: schedule1, with_items: true) }
let(:proxy_order) { create(:proxy_order, subscription: subscription1) }
let(:order) { proxy_order.initialise_order! }

4
spec/jobs/webhook_delivery_job_spec.rb
View File

@@ -26,8 +26,8 @@ describe WebhookDeliveryJob do
expected_body = {
id: /.+/,
at: Time.zone.now.to_s,
event: event,
data: data,
event:,
data:,
}
subject.perform_now

8
spec/lib/open_food_network/address_finder_spec.rb
View File

@@ -89,7 +89,7 @@ module OpenFoodNetwork
let(:distributor) { create(:distributor_enterprise) }
let(:address) { create(:address) }
let(:order) {
create(:completed_order_with_totals, user: nil, email: email, distributor: distributor,
create(:completed_order_with_totals, user: nil, email:, distributor:,
bill_address: nil)
}
let(:finder) { AddressFinder.new(email) }
@@ -151,7 +151,7 @@ module OpenFoodNetwork
context "and an order with a required ship address exists" do
let(:order) {
create(:shipped_order, user: nil, email: email, distributor: distributor, shipments: [],
create(:shipped_order, user: nil, email:, distributor:, shipments: [],
ship_address: address)
}
@@ -172,7 +172,7 @@ module OpenFoodNetwork
context "and an order with a ship address exists" do
let(:order) {
create(:shipped_order, user: nil, email: email, distributor: distributor, shipments: [],
create(:shipped_order, user: nil, email:, distributor:, shipments: [],
ship_address: address)
}
@@ -195,7 +195,7 @@ module OpenFoodNetwork
context "and an order without a ship address exists" do
let!(:order) {
create(:shipped_order, user: nil, email: email, distributor: distributor, shipments: [],
create(:shipped_order, user: nil, email:, distributor:, shipments: [],
ship_address: nil)
}

2
spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
View File

@@ -12,7 +12,7 @@ module OpenFoodNetwork
}
let(:fee_tax_category) { nil }
let(:tax_category) { create(:tax_category) }
let!(:target_variant) { create(:variant, tax_category: tax_category) }
let!(:target_variant) { create(:variant, tax_category:) }
let(:product) { variant.product }
let(:applicator) { EnterpriseFeeApplicator.new(enterprise_fee, target_variant, 'role') }

28
spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
View File

@@ -24,12 +24,12 @@ module OpenFoodNetwork
describe "supplier fees" do
let!(:exchange1) {
create(:exchange, order_cycle: order_cycle, sender: supplier1, receiver: coordinator,
create(:exchange, order_cycle:, sender: supplier1, receiver: coordinator,
incoming: true, enterprise_fees: [enterprise_fee1],
variants: [product1.variants.first])
}
let!(:exchange2) {
create(:exchange, order_cycle: order_cycle, sender: supplier2, receiver: coordinator,
create(:exchange, order_cycle:, sender: supplier2, receiver: coordinator,
incoming: true, enterprise_fees: [enterprise_fee2],
variants: [product2.variants.first])
}
@@ -51,7 +51,7 @@ module OpenFoodNetwork
describe "coordinator fees" do
let!(:exchange) {
create(:exchange, order_cycle: order_cycle, sender: coordinator,
create(:exchange, order_cycle:, sender: coordinator,
receiver: distributor, incoming: false, enterprise_fees: [],
variants: [product1.variants.first])
}
@@ -73,7 +73,7 @@ module OpenFoodNetwork
describe "distributor fees" do
let!(:exchange) {
create(:exchange, order_cycle: order_cycle, sender: coordinator,
create(:exchange, order_cycle:, sender: coordinator,
receiver: distributor, incoming: false,
enterprise_fees: [enterprise_fee1,
enterprise_fee2,
@@ -103,7 +103,7 @@ module OpenFoodNetwork
)
}
let!(:exchange) {
create(:exchange, order_cycle: order_cycle, sender: coordinator, receiver: distributor,
create(:exchange, order_cycle:, sender: coordinator, receiver: distributor,
incoming: false, enterprise_fees: [enterprise_fee1],
variants: [product1.variants.first])
}
@@ -133,7 +133,7 @@ module OpenFoodNetwork
create(:enterprise_fee, fee_type: 'fundraising', amount: 3.45, name: "Fundraising")
}
let!(:exchange) {
create(:exchange, order_cycle: order_cycle,
create(:exchange, order_cycle:,
sender: coordinator, receiver: distributor, incoming: false,
enterprise_fees: [
ef_admin, ef_sales, ef_packing, ef_transport, ef_fundraising
@@ -180,14 +180,14 @@ module OpenFoodNetwork
end
describe "creating adjustments" do
let(:order) { create(:order, distributor: distributor, order_cycle: order_cycle) }
let!(:line_item) { create(:line_item, order: order, variant: product1.variants.first) }
let(:order) { create(:order, distributor:, order_cycle:) }
let!(:line_item) { create(:line_item, order:, variant: product1.variants.first) }
let(:enterprise_fee_line_item) { create(:enterprise_fee) }
let(:enterprise_fee_order) {
create(:enterprise_fee, calculator: Calculator::FlatRate.new(preferred_amount: 2))
}
let!(:exchange) {
create(:exchange, order_cycle: order_cycle, sender: coordinator, receiver: distributor,
create(:exchange, order_cycle:, sender: coordinator, receiver: distributor,
incoming: false, variants: [product1.variants.first])
}
@@ -225,7 +225,7 @@ module OpenFoodNetwork
let!(:ef_other_distributor) { create(:enterprise_fee) }
let!(:exchange) {
create(:exchange, sender: order_cycle.coordinator, receiver: distributor,
order_cycle: order_cycle, enterprise_fees: [ef_exchange], variants: [v])
order_cycle:, enterprise_fees: [ef_exchange], variants: [v])
}
let(:v) { create(:variant) }
let(:indexed_variants) { { v.id => v } }
@@ -244,7 +244,7 @@ module OpenFoodNetwork
end
it "does not include outgoing exchanges to other distributors" do
create(:exchange, order_cycle: order_cycle, sender: order_cycle.coordinator,
create(:exchange, order_cycle:, sender: order_cycle.coordinator,
receiver: distributor_other, enterprise_fees: [ef_other_distributor],
variants: [v])
@@ -281,7 +281,7 @@ module OpenFoodNetwork
describe "for a line item" do
let(:variant) { double(:variant) }
let(:line_item) { double(:line_item, variant: variant, order: order) }
let(:line_item) { double(:line_item, variant:, order:) }
before do
allow(incoming_exchange).to receive(:enterprise_fees) {
@@ -296,7 +296,7 @@ module OpenFoodNetwork
context "with order_cycle and distributor set" do
let(:efc) { EnterpriseFeeCalculator.new(distributor, oc) }
let(:order) { double(:order, distributor: distributor, order_cycle: oc) }
let(:order) { double(:order, distributor:, order_cycle: oc) }
it "creates an adjustment for each fee" do
expect(efc).to receive(:per_item_enterprise_fee_applicators_for).with(variant) {
@@ -341,7 +341,7 @@ module OpenFoodNetwork
context "with order_cycle and distributor set" do
let(:efc) { EnterpriseFeeCalculator.new(distributor, oc) }
let(:order) { double(:order, distributor: distributor, order_cycle: oc) }
let(:order) { double(:order, distributor:, order_cycle: oc) }
it "creates an adjustment for each fee" do
expect(efc).to receive(:per_order_enterprise_fee_applicators_for).with(order) {

16
spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
View File

@@ -18,7 +18,7 @@ module OpenFoodNetwork
enterprise_fee_ids: [1, 2],
receival_instructions: 'receival instructions' }
oc = double(:order_cycle, coordinator_id: coordinator_id, exchanges: [],
oc = double(:order_cycle, coordinator_id:, exchanges: [],
incoming_exchanges: [incoming_exchange], outgoing_exchanges: [])
applicator = OrderCycleFormApplicator.new(oc, user)
@@ -46,7 +46,7 @@ module OpenFoodNetwork
enterprise_fee_ids: [1, 2], pickup_time: 'pickup time',
pickup_instructions: 'pickup instructions', tag_list: 'wholesale' }
oc = double(:order_cycle, coordinator_id: coordinator_id, exchanges: [],
oc = double(:order_cycle, coordinator_id:, exchanges: [],
incoming_exchanges: [], outgoing_exchanges: [outgoing_exchange])
applicator = OrderCycleFormApplicator.new(oc, user)
@@ -77,7 +77,7 @@ module OpenFoodNetwork
receival_instructions: 'receival instructions' }
oc = double(:order_cycle,
coordinator_id: coordinator_id,
coordinator_id:,
exchanges: [double(:exchange, sender_id: supplier_id,
receiver_id: coordinator_id, incoming: true)],
incoming_exchanges: [incoming_exchange],
@@ -109,7 +109,7 @@ module OpenFoodNetwork
pickup_instructions: 'pickup instructions', tag_list: 'wholesale' }
oc = double(:order_cycle,
coordinator_id: coordinator_id,
coordinator_id:,
exchanges: [double(:exchange, sender_id: coordinator_id,
receiver_id: distributor_id, incoming: false)],
incoming_exchanges: [],
@@ -141,7 +141,7 @@ module OpenFoodNetwork
incoming: true)
oc = double(:order_cycle,
coordinator_id: coordinator_id,
coordinator_id:,
exchanges: [exchange],
incoming_exchanges: [],
outgoing_exchanges: [])
@@ -427,7 +427,7 @@ module OpenFoodNetwork
let!(:enterprise_fee3) { create(:enterprise_fee) }
let!(:exchange) {
create(:exchange, order_cycle: oc, sender: sender, receiver: receiver, incoming: incoming,
create(:exchange, order_cycle: oc, sender:, receiver:, incoming:,
variant_ids: [variant1.id, variant2.id],
enterprise_fee_ids: [enterprise_fee1.id, enterprise_fee2.id])
}
@@ -527,8 +527,8 @@ module OpenFoodNetwork
oc = FactoryBot.create(:simple_order_cycle)
applicator = OrderCycleFormApplicator.new(oc, user)
incoming = true
exchange = FactoryBot.create(:exchange, order_cycle: oc, sender: sender,
receiver: receiver, incoming: incoming)
exchange = FactoryBot.create(:exchange, order_cycle: oc, sender:,
receiver:, incoming:)
variant1 = FactoryBot.create(:variant)
applicator.send(:touched_exchanges=, [])

6
spec/lib/open_food_network/order_cycle_permissions_spec.rb
View File

@@ -9,7 +9,7 @@ module OpenFoodNetwork
let(:hub) { create(:distributor_enterprise) }
let(:producer) { create(:supplier_enterprise) }
let(:user) { double(:user) }
let(:oc) { create(:simple_order_cycle, coordinator: coordinator) }
let(:oc) { create(:simple_order_cycle, coordinator:) }
let(:permissions) { OrderCyclePermissions.new(user, oc) }
describe "finding enterprises that can be viewed in the order cycle interface" do
@@ -424,7 +424,7 @@ module OpenFoodNetwork
context "where my hub's outgoing exchange contains variants of a producer " \
"I don't manage and has not given my hub P-OC" do
let!(:product) { create(:product, supplier: producer) }
let!(:variant) { create(:variant, product: product) }
let!(:variant) { create(:variant, product:) }
let!(:ex_out) {
create(:exchange, order_cycle: oc, sender: coordinator, receiver: hub, incoming: true)
}
@@ -485,7 +485,7 @@ module OpenFoodNetwork
describe "legacy compatability" do
context "where an outgoing exchange contains variants of a producer I manage" do
let!(:product) { create(:product, supplier: producer) }
let!(:variant) { create(:variant, product: product) }
let!(:variant) { create(:variant, product:) }
before { ex_out.variants << variant }
context "where my producer supplies to the order cycle" do

2
spec/lib/open_food_network/property_merge_spec.rb
View File

@@ -19,7 +19,7 @@ module OpenFoodNetwork
end
describe "merging ProducerProperties and Spree::ProductProperties" do
let(:product_property) { create(:product_property, property: property) }
let(:product_property) { create(:product_property, property:) }
let(:duplicate_product_property) { create(:producer_property, property: duplicate_property) }
let(:producer_property) { create(:producer_property, property: different_property) }