Merge pull request #476 from duncantmiller/fix/skip-env-reliability-in-multithreaded-test-servers

Fix skip_env? to fall back to Rails.env when default_env is nil

Author: grosser

lib/recaptcha.rb

@@ -52,7 +52,9 @@ def self.with_configuration(config)
   end
 
   def self.skip_env?(env)
-    configuration.skip_verify_env.include?(env || configuration.default_env)
+    resolved = env || configuration.default_env
+    resolved ||= Rails.env.to_s if defined?(Rails.env)
+    configuration.skip_verify_env.include?(resolved)
   end
 
   def self.invalid_response?(resp)

test/verify_test.rb

@@ -521,3 +521,39 @@ def assert_flash_error
     assert_equal "reCAPTCHA verification failed, please try again.", @controller.flash[:recaptcha_error]
   end
 end
+
+describe "Recaptcha.skip_env?" do
+  # test/helper.rb deletes RAILS_ENV and RACK_ENV, so default_env is nil in this suite.
+  # This mirrors what can happen in multi-threaded servers (e.g. Puma running system tests)
+  # where the Configuration singleton is initialised before the env var is visible,
+  # leaving default_env as nil even though Rails.env correctly returns "test".
+
+  it "returns true when env argument matches skip_verify_env" do
+    assert Recaptcha.skip_env?("test")
+  end
+
+  it "returns false when env argument is not in skip_verify_env" do
+    refute Recaptcha.skip_env?("production")
+  end
+
+  it "returns false when env argument is nil and default_env is nil" do
+    assert_nil Recaptcha.configuration.default_env
+    refute Recaptcha.skip_env?(nil)
+  end
+
+  describe "when Rails.env is available and in skip_verify_env" do
+    before do
+      rails_stub = Module.new { def self.env; "test"; end }
+      Object.const_set(:Rails, rails_stub)
+    end
+
+    after do
+      Object.send(:remove_const, :Rails) if defined?(Rails)
+    end
+
+    it "returns true even when default_env is nil" do
+      assert_nil Recaptcha.configuration.default_env
+      assert Recaptcha.skip_env?(nil)
+    end
+  end
+end