From 2539b84b3374f1d0a28739586c53e72a25759d4d Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sun, 6 Oct 2019 22:30:56 +0100
Subject: [PATCH] Fix `product.meta_keywords` not searchable

---
 .../darkswarm/controllers/products_controller.js.coffee       | 4 ++--
 spec/features/consumer/shopping/shopping_spec.rb              | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index 36620b827e..f5ae87dbe4 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -53,7 +53,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
       id: $scope.order_cycle.order_cycle_id,
       page: $scope.page,
       per_page: $scope.per_page,
-      'q[name_or_supplier_name_cont]': $scope.query,
+      'q[name_or_meta_keywords_or_supplier_name_cont]': $scope.query,
       'q[properites_in_any][]': $scope.activeProperties,
       'q[primary_taxon_id_in_any][]': $scope.activeTaxons
     }
@@ -64,7 +64,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
       id: $scope.order_cycle.order_cycle_id,
       page: $scope.page + 1,
       per_page: $scope.per_page,
-      'q[name_or_supplier_name_cont]': $scope.query,
+      'q[name_or_meta_keywords_or_supplier_name_cont]': $scope.query,
       'q[properites_in_any][]': $scope.activeProperties,
       'q[primary_taxon_id_in_any][]': $scope.activeTaxons
     }
diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index 2809d8f187..989eea5e4e 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -214,10 +214,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
         fill_in "search", with: "Meer"           # For product named "Meercats"
         expect(page).to have_content product2.name
         expect(page).not_to have_content product.name
-
-        fill_in "search", with: "Dome"           # For product with meta_keywords "Domestic"
-        expect(page).to have_content product.name
-        expect(page).not_to have_content product2.name
       end
 
       it "returns search results for products where the search term matches one of the product's variant names" do