Removing obsolete related_enterprises_with permission method

This commit is contained in:
Rob Harrington
2015-05-06 12:09:54 +10:00
parent f0f7e0ee2f
commit 5cd528a87d
2 changed files with 7 additions and 16 deletions

View File

@@ -133,7 +133,7 @@ module OpenFoodNetwork
def managed_and_related_enterprises_granting(permission)
managed_enterprise_ids = managed_enterprises.pluck :id
permitting_enterprise_ids = related_enterprises_with(permission).pluck :id
permitting_enterprise_ids = granting(permission).pluck :id
Enterprise.where('id IN (?)', managed_enterprise_ids + permitting_enterprise_ids)
end
@@ -148,15 +148,6 @@ module OpenFoodNetwork
@coordinated_order_cycles = OrderCycle.managed_by(@user)
end
def related_enterprises_with(permission)
parent_ids = EnterpriseRelationship.
permitting(managed_enterprises).
with_permission(permission).
pluck(:parent_id)
Enterprise.where('id IN (?)', parent_ids)
end
def granting(permission, options={})
parent_ids = EnterpriseRelationship.
permitting(options[:to] || managed_enterprises).
@@ -180,7 +171,7 @@ module OpenFoodNetwork
end
def related_enterprise_products
Spree::Product.where('supplier_id IN (?)', related_enterprises_with(:manage_products))
Spree::Product.where('supplier_id IN (?)', granting(:manage_products))
end
end
end

View File

@@ -154,19 +154,19 @@ module OpenFoodNetwork
it "returns the enterprises" do
permissions.stub(:managed_enterprises) { e2 }
permissions.send(:related_enterprises_with, permission).should == [e1]
permissions.send(:granting, permission).should == [e1]
end
it "returns an empty array when there are none" do
permissions.stub(:managed_enterprises) { e1 }
permissions.send(:related_enterprises_with, permission).should == []
permissions.send(:granting, permission).should == []
end
end
describe "finding enterprises that are managed or with a particular permission" do
before do
permissions.stub(:managed_enterprises) { Enterprise.where('1=0') }
permissions.stub(:related_enterprises_with) { Enterprise.where('1=0') }
permissions.stub(:granting) { Enterprise.where('1=0') }
end
it "returns managed enterprises" do
@@ -175,7 +175,7 @@ module OpenFoodNetwork
end
it "returns permitted enterprises" do
permissions.should_receive(:related_enterprises_with).with(permission).
permissions.should_receive(:granting).with(permission).
and_return(Enterprise.where(id: e2))
permissions.send(:managed_and_related_enterprises_granting, permission).should == [e2]
end
@@ -186,7 +186,7 @@ module OpenFoodNetwork
let!(:p) { create(:simple_product, supplier: e) }
it "returns supplied products" do
permissions.should_receive(:related_enterprises_with).with(:manage_products) { [e] }
permissions.should_receive(:granting).with(:manage_products) { [e] }
permissions.send(:related_enterprise_products).should == [p]
end