Fix recaptcha feature flag gating for Primo articles

Author: cdoyle-temple

app/controllers/primo_central_controller.rb

@@ -11,12 +11,8 @@ class PrimoCentralController < CatalogController
   helper_method :tags_strip
   helper_method :solr_range_queries_to_a
 
-  def self.recaptcha_on?
-    Proc.new { |context| ::FeatureFlags.recaptcha_on?(context.params) }
-  end
-
   def recaptcha
-    ::FeatureFlags.recaptcha?(params)
+    return unless ::FeatureFlags.recaptcha?(params)
     # Do not enable for logged in users.
     return if current_user
 

app/lib/feature_flags.rb

@@ -27,6 +27,6 @@ def self.recaptcha?(params = nil)
     if !params.nil? && params.has_key?("recaptcha")
       return (params["recaptcha"] == "false") ? false : true
     end
-    !!Rails.configuration.features.fetch(:recaptcha, false)
+    !!Rails.configuration.features.fetch(:recaptcha_on, false)
   end
 end

spec/controllers/primo_central_controller_spec.rb

@@ -53,6 +53,14 @@
   end
 
   describe "recaptcha enabled" do
+    around do |example|
+      original = Rails.configuration.features[:recaptcha_on]
+      Rails.configuration.features[:recaptcha_on] = true
+      example.run
+    ensure
+      Rails.configuration.features[:recaptcha_on] = original
+    end
+
     before do
       stub_const("ENV", ENV.to_h.merge("RECAPTCHA_SITE_KEY" => "foo"))
       allow(controller).to receive(:verify_recaptcha).and_return(false)
@@ -70,4 +78,26 @@
       end
     end
   end
+
+  describe "recaptcha disabled" do
+    around do |example|
+      original = Rails.configuration.features[:recaptcha_on]
+      Rails.configuration.features[:recaptcha_on] = false
+      example.run
+    ensure
+      Rails.configuration.features[:recaptcha_on] = original
+    end
+
+    before do
+      stub_const("ENV", ENV.to_h.merge("RECAPTCHA_SITE_KEY" => "foo"))
+    end
+
+    it "skips recaptcha checks" do
+      expect(controller).not_to receive(:verify_recaptcha)
+
+      get :index, params: { q: "foo" }
+
+      expect(response).to have_http_status(:ok)
+    end
+  end
 end