From 3b91dd9dea93cc3433419034febd20026eed38cc Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Mon, 22 Jun 2020 12:51:47 +0100 Subject: [PATCH] Use rubocop auto-correct to fix more issues --- app/controllers/spree/admin/orders_controller.rb | 2 +- app/controllers/spree/admin/payments_controller.rb | 2 +- app/controllers/spree/admin/products_controller.rb | 2 +- spec/controllers/checkout_controller_spec.rb | 2 +- spec/support/request/web_helper.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb index 9625ebe29d..960db7f638 100644 --- a/app/controllers/spree/admin/orders_controller.rb +++ b/app/controllers/spree/admin/orders_controller.rb @@ -117,7 +117,7 @@ module Spree def load_order if params[:id] @order = Order.includes(:adjustments, :shipments, line_items: :adjustments). - find_by_number!(params[:id]) + find_by!(number: params[:id]) end authorize! action, @order end diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb index ae73760d8d..02c777fb51 100644 --- a/app/controllers/spree/admin/payments_controller.rb +++ b/app/controllers/spree/admin/payments_controller.rb @@ -122,7 +122,7 @@ module Spree end def load_order - @order = Order.find_by_number!(params[:order_id]) + @order = Order.find_by!(number: params[:order_id]) authorize! action, @order @order end diff --git a/app/controllers/spree/admin/products_controller.rb b/app/controllers/spree/admin/products_controller.rb index a6099cf021..d3011d94a0 100644 --- a/app/controllers/spree/admin/products_controller.rb +++ b/app/controllers/spree/admin/products_controller.rb @@ -96,7 +96,7 @@ module Spree protected def find_resource - Product.find_by_permalink!(params[:id]) + Product.find_by!(permalink: params[:id]) end def location_after_save diff --git a/spec/controllers/checkout_controller_spec.rb b/spec/controllers/checkout_controller_spec.rb index a07f37ff3d..8cb2c73945 100644 --- a/spec/controllers/checkout_controller_spec.rb +++ b/spec/controllers/checkout_controller_spec.rb @@ -227,7 +227,7 @@ describe CheckoutController, type: :controller do spree_post :update, format: :json, order: {} expect(response.status).to eq(400) - expect(response.body).to eq({ errors: {}, flash: {error: I18n.t("checkout.failed")} }.to_json) + expect(response.body).to eq({ errors: {}, flash: { error: I18n.t("checkout.failed") } }.to_json) end describe "stale object handling" do diff --git a/spec/support/request/web_helper.rb b/spec/support/request/web_helper.rb index b03f7d9d39..732e306a29 100644 --- a/spec/support/request/web_helper.rb +++ b/spec/support/request/web_helper.rb @@ -38,7 +38,7 @@ module WebHelper def select_by_value(value, options = {}) from = options.delete :from - page.find_by_id(from).find("option[value='#{value}']").select_option + page.find_by(id: from).find("option[value='#{value}']").select_option end def flash_message