diff --git a/app/models/spree/property.rb b/app/models/spree/property.rb index 792b39e5b5..92c053f65b 100644 --- a/app/models/spree/property.rb +++ b/app/models/spree/property.rb @@ -10,12 +10,6 @@ module Spree scope :sorted, -> { order(:name) } - scope :applied_by, ->(enterprise) { - select('DISTINCT spree_properties.*'). - joins(:product_properties). - where('spree_product_properties.product_id IN (?)', enterprise.supplied_product_ids) - } - scope :ever_sold_by, ->(shop) { joins(products: { variants: { exchanges: :order_cycle } }). merge(Exchange.outgoing). diff --git a/spec/models/spree/property_spec.rb b/spec/models/spree/property_spec.rb index a155cbfa45..acbd22ca27 100644 --- a/spec/models/spree/property_spec.rb +++ b/spec/models/spree/property_spec.rb @@ -3,34 +3,6 @@ require 'spec_helper' module Spree describe Property do describe "scopes" do - describe ".applied_by" do - let(:producer) { create(:supplier_enterprise) } - let(:producer_other) { create(:supplier_enterprise) } - let(:product) { create(:simple_product, supplier: producer) } - let(:product_other_producer) { create(:simple_product, supplier: producer_other) } - let(:product_other_property) { create(:simple_product, supplier: producer) } - let(:property) { product.properties.last } - let(:property_other) { product_other_producer.properties.last } - - before do - product.set_property 'Organic', 'NASAA 12345' - product_other_property.set_property 'Organic', 'NASAA 12345' - product_other_producer.set_property 'Biodynamic', 'ASDF 1234' - end - - it "returns properties applied to supplied products" do - expect(Spree::Property.applied_by(producer)).to eq [property] - end - - it "doesn't return properties not applied" do - expect(Spree::Property.applied_by(producer)).not_to include property_other - end - - it "doesn't return duplicates" do - expect(Spree::Property.applied_by(producer).to_a.size).to eq 1 - end - end - describe ".currently_sold_by and .ever_sold_by" do let!(:shop) { create(:distributor_enterprise) } let!(:shop_other) { create(:distributor_enterprise) }