From ab53db0c618b6ff0fcfae8bb83245b0411bf1817 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 4 Sep 2020 10:28:28 +0100 Subject: [PATCH] Merge ability and ability decorator --- app/models/spree/ability.rb | 4 ++-- spec/models/spree/ability_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/spree/ability.rb b/app/models/spree/ability.rb index a7d12ce2b6..d3ed85c507 100644 --- a/app/models/spree/ability.rb +++ b/app/models/spree/ability.rb @@ -47,7 +47,7 @@ module Spree end add_shopping_abilities user - add_base_abilities user if new_user? user + add_base_abilities user if is_new_user? user add_enterprise_management_abilities user if can_manage_enterprises? user add_group_management_abilities user if can_manage_groups? user add_product_management_abilities user if can_manage_products? user @@ -57,7 +57,7 @@ module Spree end # New users have no enterprises. - def new_user?(user) + def is_new_user?(user) user.enterprises.blank? end diff --git a/spec/models/spree/ability_spec.rb b/spec/models/spree/ability_spec.rb index 7838b0093d..c20fda569c 100644 --- a/spec/models/spree/ability_spec.rb +++ b/spec/models/spree/ability_spec.rb @@ -306,7 +306,7 @@ describe Spree::Ability do it { expect(subject.can_manage_order_cycles?(user)).to be false } it "can create enterprises straight off the bat" do - expect(subject.new_user?(user)).to be true + expect(subject.is_new_user?(user)).to be true expect(user).to have_ability :create, for: Enterprise end end