Skip to content

Commit 1f9a039

Browse files
committed
Autocorrect rubocop offences
1 parent 4bd0a95 commit 1f9a039

File tree

16 files changed

+21
-21
lines changed

16 files changed

+21
-21
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# frozen_string_literal: true
22

3-
json.attributes(([*line_item_attributes] - [:id]))
3+
json.attributes([*line_item_attributes] - [:id])
44
json.required_attributes([:variant_id, :quantity])

core/app/models/spree/classification.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ class Classification < Spree::Base
88
belongs_to :taxon, class_name: "Spree::Taxon", inverse_of: :classifications, touch: true, optional: true
99

1010
# For https://github.com/spree/spree/issues/3494
11-
validates_uniqueness_of :taxon_id, scope: :product_id, message: :already_linked
11+
validates :taxon_id, uniqueness: { scope: :product_id, message: :already_linked }
1212
end
1313
end

core/app/models/spree/inventory_unit.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def order=(_)
2424
raise "The order association has been removed from InventoryUnit. The order is now determined from the shipment."
2525
end
2626

27-
validates_presence_of :shipment, :line_item, :variant
27+
validates :shipment, :line_item, :variant, presence: true
2828

2929
before_destroy :ensure_can_destroy
3030

core/app/models/spree/role_user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class RoleUser < Spree::Base
88

99
after_create :auto_generate_spree_api_key
1010

11-
validates_uniqueness_of :role_id, scope: :user_id
11+
validates :role_id, uniqueness: { scope: :user_id }
1212

1313
private
1414

core/app/models/spree/stock_location.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class InvalidMovementError < StandardError; end
2222
has_many :shipping_method_stock_locations, dependent: :destroy
2323
has_many :shipping_methods, through: :shipping_method_stock_locations
2424

25-
validates_presence_of :name
26-
validates_uniqueness_of :code, allow_blank: true, case_sensitive: false
25+
validates :name, presence: true
26+
validates :code, uniqueness: { allow_blank: true, case_sensitive: false }
2727

2828
scope :active, -> { where(active: true) }
2929
scope :order_default, -> { order(default: :desc, position: :asc) }

core/app/models/spree/store_credit.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ class Spree::StoreCredit < Spree::PaymentSource
1818
belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id', optional: true
1919
has_many :store_credit_events
2020

21-
validates_presence_of :user_id, :category_id, :type_id, :created_by_id, :currency
22-
validates_numericality_of :amount, { greater_than: 0 }
23-
validates_numericality_of :amount_used, { greater_than_or_equal_to: 0 }
21+
validates :user_id, :category_id, :type_id, :created_by_id, :currency, presence: true
22+
validates :amount, numericality: { greater_than: 0 }
23+
validates :amount_used, numericality: { greater_than_or_equal_to: 0 }
2424
validate :amount_used_less_than_or_equal_to_amount
2525
validate :amount_authorized_less_than_or_equal_to_amount
2626

core/app/models/spree/store_credit_event.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class StoreCreditEvent < Spree::Base
99
belongs_to :originator, polymorphic: true, optional: true
1010
belongs_to :store_credit_reason, class_name: 'Spree::StoreCreditReason', inverse_of: :store_credit_events, optional: true
1111

12-
validates_presence_of :store_credit_reason, if: :action_requires_reason?
12+
validates :store_credit_reason, presence: { if: :action_requires_reason? }
1313

1414
NON_EXPOSED_ACTIONS = [Spree::StoreCredit::ELIGIBLE_ACTION, Spree::StoreCredit::AUTHORIZE_ACTION]
1515

core/app/models/spree/tax_category.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class TaxCategory < Spree::Base
1111
end
1212

1313
validates :name, presence: true
14-
validates_uniqueness_of :name, case_sensitive: true, unless: :deleted_at
14+
validates :name, uniqueness: { case_sensitive: true, unless: :deleted_at }
1515

1616
has_many :tax_rate_tax_categories,
1717
class_name: 'Spree::TaxRateTaxCategory',

core/app/models/spree/user_address.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ class UserAddress < Spree::Base
55
belongs_to :user, class_name: UserClassHandle.new, foreign_key: "user_id", inverse_of: :user_addresses
66
belongs_to :address, class_name: "Spree::Address"
77

8-
validates_uniqueness_of :address_id, scope: :user_id
9-
validates_uniqueness_of :user_id, conditions: -> { default_shipping }, message: :default_address_exists, if: :default?
8+
validates :address_id, uniqueness: { scope: :user_id }
9+
validates :user_id, uniqueness: { conditions: -> { default_shipping }, message: :default_address_exists, if: :default? }
1010

1111
scope :with_address_values, ->(address_attributes) do
1212
joins(:address).merge(

core/app/models/spree/variant.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class Variant < Spree::Base
7474

7575
validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
7676
validates :price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
77-
validates_uniqueness_of :sku, allow_blank: true, case_sensitive: true, conditions: -> { where(deleted_at: nil) }, if: :enforce_unique_sku?
77+
validates :sku, uniqueness: { allow_blank: true, case_sensitive: true, conditions: -> { where(deleted_at: nil) }, if: :enforce_unique_sku? }
7878

7979
after_create :create_stock_items
8080
after_create :set_master_out_of_stock, unless: :is_master?

0 commit comments

Comments
 (0)