Merge pull request #5465 from luisramos0/rename_accessible_by

[Rails 4.1] Rename order_cycle.accessible_by to remove name clash with active record

app/controllers/admin/order_cycles_controller.rb

@@ -145,7 +145,7 @@ module Admin
         preload(:schedules).
         ransack(params[:q]).
         result.
-        accessible_by(spree_current_user)
+        visible_by(spree_current_user)
     end
 
     def load_data_for_index

app/controllers/spree/admin/reports_controller.rb

@@ -255,7 +255,7 @@ module Spree
       def my_order_cycles
         OrderCycle.
           active_or_complete.
-          accessible_by(spree_current_user).
+          visible_by(spree_current_user).
           order('orders_close_at DESC')
       end
 

app/models/order_cycle.rb

@@ -70,7 +70,7 @@ class OrderCycle < ActiveRecord::Base
   }
 
   # Return order cycles that user coordinates, sends to or receives from
-  scope :accessible_by, lambda { |user|
+  scope :visible_by, lambda { |user|
     if user.has_spree_role?('admin')
       scoped
     else

app/models/spree/ability_decorator.rb

@@ -39,7 +39,7 @@ class AbilityDecorator
   # OR if they manage a producer which is included in any order cycles
   def can_manage_order_cycles?(user)
     can_manage_orders?(user) ||
-      OrderCycle.accessible_by(user).any?
+      OrderCycle.visible_by(user).any?
   end
 
   # Users can manage orders if they have a sells own/any enterprise.
@@ -193,7 +193,7 @@ class AbilityDecorator
 
   def add_order_cycle_management_abilities(user)
     can [:admin, :index, :read, :edit, :update, :incoming, :outgoing], OrderCycle do |order_cycle|
-      OrderCycle.accessible_by(user).include? order_cycle
+      OrderCycle.visible_by(user).include? order_cycle
     end
     can [:admin, :index, :create], Schedule
     can [:admin, :update, :destroy], Schedule do |schedule|

engines/order_management/app/services/order_management/reports/enterprise_fee_summary/permissions.rb

@@ -3,7 +3,7 @@ module OrderManagement
     module EnterpriseFeeSummary
       class Permissions < ::Reports::Permissions
         def allowed_order_cycles
-          @allowed_order_cycles ||= OrderCycle.accessible_by(user)
+          @allowed_order_cycles ||= OrderCycle.visible_by(user)
         end
 
         def allowed_distributors

spec/models/order_cycle_spec.rb

@@ -65,8 +65,8 @@ describe OrderCycle do
     oc_received = create(:simple_order_cycle, distributors: [e2])
     oc_not_accessible = create(:simple_order_cycle, coordinator: e1)
 
-    expect(OrderCycle.accessible_by(user)).to include(oc_coordinated, oc_sent, oc_received)
-    expect(OrderCycle.accessible_by(user)).not_to include(oc_not_accessible)
+    expect(OrderCycle.visible_by(user)).to include(oc_coordinated, oc_sent, oc_received)
+    expect(OrderCycle.visible_by(user)).not_to include(oc_not_accessible)
   end
 
   it "finds the most recently closed order cycles" do