From dfe8ed26d92bc9463a8fff95bd57224dbdec5189 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Wed, 2 Feb 2022 09:57:23 +0100 Subject: [PATCH] Update tests and use ransack to search with the new scope: with_properties --- app/controllers/api/v0/order_cycles_controller.rb | 2 +- spec/controllers/api/v0/order_cycles_controller_spec.rb | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v0/order_cycles_controller.rb b/app/controllers/api/v0/order_cycles_controller.rb index 110edc7920..50ec014f97 100644 --- a/app/controllers/api/v0/order_cycles_controller.rb +++ b/app/controllers/api/v0/order_cycles_controller.rb @@ -81,7 +81,7 @@ module Api def permitted_ransack_params [:name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont, - :properties_id_or_supplier_properties_id_in_any, + :properties_id_or_supplier_properties_id_in_any, :with_properties, :primary_taxon_id_in_any] end diff --git a/spec/controllers/api/v0/order_cycles_controller_spec.rb b/spec/controllers/api/v0/order_cycles_controller_spec.rb index e646bf3f3e..8faac2bd71 100644 --- a/spec/controllers/api/v0/order_cycles_controller_spec.rb +++ b/spec/controllers/api/v0/order_cycles_controller_spec.rb @@ -65,8 +65,9 @@ module Api context "with property filters" do it "filters by product property" do api_get :products, id: order_cycle.id, distributor: distributor.id, - q: { properties_id_or_supplier_properties_id_in_any: [property1.id, property2.id] } + q: { with_properties: [property1.id, property2.id] } + expect(response.status).to eq 200 expect(product_ids).to include product1.id, product2.id expect(product_ids).to_not include product3.id end @@ -83,8 +84,9 @@ module Api it "filter out the product that don't inherits from supplier properties" do api_get :products, id: order_cycle.id, distributor: distributor.id, - q: { properties_id_or_supplier_properties_id_in_any: [supplier_property.id] } + q: { with_properties: [supplier_property.id] } + expect(response.status).to eq 200 expect(product_ids).to include product1.id, product2.id expect(product_ids).to_not include product3.id end