Merge ability and ability decorator

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
 

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