diff --git a/app/models/spree/adjustment.rb b/app/models/spree/adjustment.rb index f5e5fe0707..2d5d572110 100644 --- a/app/models/spree/adjustment.rb +++ b/app/models/spree/adjustment.rb @@ -70,7 +70,7 @@ module Spree scope :charge, -> { where('amount >= 0') } scope :credit, -> { where('amount < 0') } scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") } - scope :included, -> { where(included: true) } + scope :inclusive, -> { where(included: true) } scope :additional, -> { where(included: false) } scope :enterprise_fee, -> { where(originator_type: 'EnterpriseFee') } diff --git a/spec/models/spree/adjustment_spec.rb b/spec/models/spree/adjustment_spec.rb index cced77f9e8..bc3acb38ed 100644 --- a/spec/models/spree/adjustment_spec.rb +++ b/spec/models/spree/adjustment_spec.rb @@ -461,7 +461,7 @@ module Spree it_behaves_like "a model using the LocalizedNumber module", [:amount] end - describe "included and additional scopes" do + describe "inclusive and additional scopes" do let!(:zone) { create(:zone_with_member) } let(:order) { create(:order) } let(:included_in_price) { true } @@ -477,7 +477,7 @@ module Spree context "when tax is included in price" do it "is returned by the #included scope" do - expect(Spree::Adjustment.included).to eq [adjustment] + expect(Spree::Adjustment.inclusive).to eq [adjustment] end end