diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee index 930091bec5..59da50958b 100644 --- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee @@ -67,7 +67,7 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $ page: page || $scope.page, per_page: $scope.per_page, 'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_variants_supplier_name_cont]': $scope.query, - 'q[with_properties][]': $scope.activeProperties, + 'q[with_variants_supplier_properties][]': $scope.activeProperties, 'q[variants_primary_taxon_id_in_any][]': $scope.activeTaxons } diff --git a/spec/system/consumer/shopping/products_spec.rb b/spec/system/consumer/shopping/products_spec.rb index 81a21613be..f2ff5b0d5a 100644 --- a/spec/system/consumer/shopping/products_spec.rb +++ b/spec/system/consumer/shopping/products_spec.rb @@ -25,11 +25,11 @@ RSpec.describe "As a consumer I want to view products" do orders_close_at: 2.days.from_now) } let(:product) { - create(:simple_product, supplier:, primary_taxon: taxon, properties: [property], - name: "Beans") + create(:simple_product, supplier_id: supplier.id, primary_taxon: taxon, + properties: [property], name: "Beans") } let(:product2) { - create(:product, supplier:, primary_taxon: taxon2, properties: [property2], + create(:product, supplier_id: supplier.id, primary_taxon: taxon2, properties: [property2], name: "Chickpeas") } let(:variant) { product.variants.first } diff --git a/spec/system/consumer/shopping/shopping_spec.rb b/spec/system/consumer/shopping/shopping_spec.rb index ee988330aa..fcbdbfc890 100644 --- a/spec/system/consumer/shopping/shopping_spec.rb +++ b/spec/system/consumer/shopping/shopping_spec.rb @@ -392,7 +392,6 @@ RSpec.describe "As a consumer I want to shop with a distributor" do create(:simple_product, supplier_id: supplier.id, inherits_properties: false) } - # TODO properties before do add_variant_to_order_cycle(exchange, product3.variants.first) property = create(:property, presentation: 'certified')