Merge pull request #723 from splitrb/fix-context-shim-override-behavior

Fix context shim override behavior

lib/split/encapsulated_helper.rb

@@ -24,7 +24,7 @@ def initialize(context)
       end
 
       def params
-        request.params if request_present?
+        request.params if request && request.respond_to?(:params)
       end
 
       def request

lib/split/helper.rb

@@ -163,11 +163,11 @@ def is_ignored_ip_address?
     end
 
     def params_present?
-      defined?(params) && params != nil
+      defined?(params) && params
     end
 
     def request_present?
-      defined?(request) && request != nil
+      defined?(request) && request
     end
 
     def active_experiments

spec/encapsulated_helper_spec.rb

@@ -3,34 +3,23 @@
 require "spec_helper"
 
 describe Split::EncapsulatedHelper do
-  include Split::EncapsulatedHelper
+  let(:context_shim) { Split::EncapsulatedHelper::ContextShim.new(double(request: request)) }
 
   describe "ab_test" do
     before do
       allow_any_instance_of(Split::EncapsulatedHelper::ContextShim).to receive(:ab_user)
       .and_return(mock_user)
     end
 
-    context "when params raises an error" do
-      before do
-        allow(self).to receive(:params).and_raise(NoMethodError)
-      end
-
-      it "should not raise an error " do
-        expect { params }.to raise_error(NoMethodError)
-        expect { ab_test("link_color", "blue", "red") }.not_to raise_error
-      end
-    end
-
     it "calls the block with selected alternative" do
-      expect { |block| ab_test("link_color", "red", "red", &block) }.to yield_with_args("red", {})
+      expect { |block| context_shim.ab_test("link_color", "red", "red", &block) }.to yield_with_args("red", {})
     end
 
     context "inside a view" do
       it "works inside ERB" do
         require "erb"
         template = ERB.new(<<-ERB.split(/\s+/s).map(&:strip).join(" "), nil, "%")
-          foo <% ab_test(:foo, '1', '2') do |alt, meta| %>
+          foo <% context_shim.ab_test(:foo, '1', '2') do |alt, meta| %>
             static <%= alt %>
           <% end %>
         ERB