1 files changed, 37 insertions, 15 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 940ebc0224..f208cfda89 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -435,6 +435,9 @@ class RequestHost < BaseRequestTest
 
     request = stub_request 'HTTP_X_FORWARDED_HOST' => "www.firsthost.org, www.secondhost.org"
     assert_equal "www.secondhost.org", request.host
+
+    request = stub_request 'HTTP_X_FORWARDED_HOST' => "", 'HTTP_HOST' => "rubyonrails.org"
+    assert_equal "rubyonrails.org", request.host
   end
 
   test "http host with default port overrides server port" do
@@ -997,8 +1000,8 @@ class RequestParameterFilter < BaseRequestTest
       }
 
       parameter_filter = ActionDispatch::Http::ParameterFilter.new(filter_words)
-      before_filter['barg'] = {'bargain'=>'gain', 'blah'=>'bar', 'bar'=>{'bargain'=>{'blah'=>'foo'}}}
-      after_filter['barg']  = {'bargain'=>'niag', 'blah'=>'[FILTERED]', 'bar'=>{'bargain'=>{'blah'=>'[FILTERED]'}}}
+      before_filter['barg'] = {:bargain=>'gain', 'blah'=>'bar', 'bar'=>{'bargain'=>{'blah'=>'foo'}}}
+      after_filter['barg']  = {:bargain=>'niag', 'blah'=>'[FILTERED]', 'bar'=>{'bargain'=>{'blah'=>'[FILTERED]'}}}
 
       assert_equal after_filter, parameter_filter.filter(before_filter)
     end
@@ -1125,28 +1128,47 @@ class RequestEtag < BaseRequestTest
 end
 
 class RequestVariant < BaseRequestTest
-  test "setting variant" do
-    request = stub_request
+  def setup
+    super
+    @request = stub_request
+  end
 
-    request.variant = :mobile
-    assert_equal [:mobile], request.variant
+  test 'setting variant to a symbol' do
+    @request.variant = :phone
 
-    request.variant = [:phone, :tablet]
-    assert_equal [:phone, :tablet], request.variant
+    assert @request.variant.phone?
+    assert_not @request.variant.tablet?
+    assert @request.variant.any?(:phone, :tablet)
+    assert_not @request.variant.any?(:tablet, :desktop)
+  end
 
-    assert_raise ArgumentError do
-      request.variant = [:phone, "tablet"]
-    end
+  test 'setting variant to an array of symbols' do
+    @request.variant = [:phone, :tablet]
+
+    assert @request.variant.phone?
+    assert @request.variant.tablet?
+    assert_not @request.variant.desktop?
+    assert @request.variant.any?(:tablet, :desktop)
+    assert_not @request.variant.any?(:desktop, :watch)
+  end
+
+  test 'clearing variant' do
+    @request.variant = nil
 
+    assert @request.variant.empty?
+    assert_not @request.variant.phone?
+    assert_not @request.variant.any?(:phone, :tablet)
+  end
+
+  test 'setting variant to a non-symbol value' do
     assert_raise ArgumentError do
-      request.variant = "yolo"
+      @request.variant = 'phone'
     end
   end
 
-  test "setting variant with non symbol value" do
-    request = stub_request
+  test 'setting variant to an array containing a non-symbol value' do
     assert_raise ArgumentError do
-      request.variant = "mobile"
+      @request.variant = [:phone, 'tablet']
     end
   end
 end