From 01d4cf6ecf7dc607bd568ee7c51370a1e6115b3a Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 20 May 2015 15:02:36 +1000 Subject: [PATCH] Renaming managed_products permissions method to editable_products --- lib/open_food_network/permissions.rb | 2 +- spec/lib/open_food_network/permissions_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/open_food_network/permissions.rb b/lib/open_food_network/permissions.rb index 4da645582d..e207eea797 100644 --- a/lib/open_food_network/permissions.rb +++ b/lib/open_food_network/permissions.rb @@ -106,7 +106,7 @@ module OpenFoodNetwork Spree::LineItem.where(order_id: editable_orders) end - def managed_products + def editable_products managed_enterprise_products_ids = managed_enterprise_products.pluck :id permitted_enterprise_products_ids = related_enterprise_products.pluck :id Spree::Product.where('id IN (?)', managed_enterprise_products_ids + permitted_enterprise_products_ids) diff --git a/spec/lib/open_food_network/permissions_spec.rb b/spec/lib/open_food_network/permissions_spec.rb index 10552572f0..2f19a7a404 100644 --- a/spec/lib/open_food_network/permissions_spec.rb +++ b/spec/lib/open_food_network/permissions_spec.rb @@ -164,7 +164,7 @@ module OpenFoodNetwork end end - describe "finding managed products" do + describe "finding editable products" do let!(:p1) { create(:simple_product) } let!(:p2) { create(:simple_product) } @@ -175,12 +175,12 @@ module OpenFoodNetwork it "returns products produced by managed enterprises" do permissions.stub(:managed_enterprise_products) { Spree::Product.where(id: p1) } - permissions.managed_products.should == [p1] + permissions.editable_products.should == [p1] end it "returns products produced by permitted enterprises" do permissions.stub(:related_enterprise_products) { Spree::Product.where(id: p2) } - permissions.managed_products.should == [p2] + permissions.editable_products.should == [p2] end end