browser 5.3.1 → 6.1.0

data/test/unit/device_test.rb

@@ -13,7 +13,7 @@ class DeviceTest < Minitest::Test
     end
   end
 
-  test "extend matchers" do
+  test "extends matchers" do
     Browser::Device.matchers.unshift(CustomDevice)
     device = Browser::Device.new("Custom")
     assert_equal :custom, device.id
@@ -23,28 +23,28 @@ class DeviceTest < Minitest::Test
     assert_equal :unknown_device, device.id
   end
 
-  test "detect generic device" do
+  test "detects generic device" do
     device = Browser::Device.new("")
 
     assert device.unknown?
     assert_equal :unknown_device, device.id
   end
 
-  test "detect ipad" do
+  test "detects ipad" do
     device = Browser::Device.new(Browser["IOS9"])
     assert device.ipad?
     assert_equal :ipad, device.id
     assert_equal "iPad", device.name
   end
 
-  test "detect old ipad" do
+  test "detects old ipad" do
     device = Browser::Device.new(Browser["IOS3"])
     assert device.ipad?
     assert_equal :ipad, device.id
     assert_equal "iPad", device.name
   end
 
-  test "detect ipod" do
+  test "detects ipod" do
     device = Browser::Device.new(Browser["IPOD"])
     assert device.ipod_touch?
     assert device.ipod?
@@ -52,14 +52,14 @@ class DeviceTest < Minitest::Test
     assert_equal "iPod Touch", device.name
   end
 
-  test "detect iphone" do
+  test "detects iphone" do
     device = Browser::Device.new(Browser["IOS8"])
     assert device.iphone?
     assert_equal :iphone, device.id
     assert_equal "iPhone", device.name
   end
 
-  test "detect ps3" do
+  test "detects ps3" do
     device = Browser::Device.new(Browser["PLAYSTATION3"])
     assert device.ps3?
     assert device.playstation3?
@@ -68,7 +68,7 @@ class DeviceTest < Minitest::Test
     assert_equal "PlayStation 3", device.name
   end
 
-  test "detect ps4" do
+  test "detects ps4" do
     device = Browser::Device.new(Browser["PLAYSTATION4"])
     assert device.ps4?
     assert device.playstation4?
@@ -99,14 +99,14 @@ class DeviceTest < Minitest::Test
     assert_equal "Xbox One", device.name
   end
 
-  test "detect psp" do
+  test "detects psp" do
     device = Browser::Device.new(Browser["PSP"])
     assert device.psp?
     assert_equal :psp, device.id
     assert_equal "PlayStation Portable", device.name
   end
 
-  test "detect psvita" do
+  test "detects psvita" do
     device = Browser::Device.new(Browser["PSP_VITA"])
     assert device.playstation_vita?
     assert device.vita?
@@ -114,7 +114,7 @@ class DeviceTest < Minitest::Test
     assert_equal "PlayStation Vita", device.name
   end
 
-  test "detect kindle" do
+  test "detects kindle" do
     device = Browser::Device.new(Browser["KINDLE"])
     assert device.kindle?
     assert_equal :kindle, device.id
@@ -127,7 +127,7 @@ class DeviceTest < Minitest::Test
     KINDLE_FIRE_HD
     KINDLE_FIRE_HD_MOBILE
   ].each do |key|
-    test "detect #{key} as kindle fire" do
+    test "detects #{key} as kindle fire" do
       device = Browser::Device.new(Browser[key])
 
       assert device.kindle?
@@ -137,7 +137,7 @@ class DeviceTest < Minitest::Test
     end
   end
 
-  test "detect wii" do
+  test "detects wii" do
     device = Browser::Device.new(Browser["NINTENDO_WII"])
     assert device.nintendo_wii?
     assert device.console?
@@ -147,7 +147,7 @@ class DeviceTest < Minitest::Test
     assert_equal "Nintendo Wii", device.name
   end
 
-  test "detect wiiu" do
+  test "detects wiiu" do
     device = Browser::Device.new(Browser["NINTENDO_WIIU"])
     assert device.nintendo_wiiu?
     assert device.wiiu?
@@ -157,7 +157,7 @@ class DeviceTest < Minitest::Test
     assert_equal "Nintendo WiiU", device.name
   end
 
-  test "detect switch" do
+  test "detects switch" do
     device = Browser::Device.new(Browser["NINTENDO_SWITCH"])
     assert device.nintendo_switch?
     assert device.switch?
@@ -167,7 +167,7 @@ class DeviceTest < Minitest::Test
     assert_equal "Nintendo Switch", device.name
   end
 
-  test "detect blackberry playbook" do
+  test "detects blackberry playbook" do
     device = Browser::Device.new(Browser["PLAYBOOK"])
     assert device.playbook?
     assert device.blackberry_playbook?
@@ -175,21 +175,21 @@ class DeviceTest < Minitest::Test
     assert_equal "BlackBerry Playbook", device.name
   end
 
-  test "detect surface" do
+  test "detects surface" do
     device = Browser::Device.new(Browser["SURFACE"])
     assert device.surface?
     assert_equal :surface, device.id
     assert_equal "Microsoft Surface", device.name
   end
 
-  test "detect tv" do
+  test "detects tv" do
     device = Browser::Device.new(Browser["SMART_TV"])
     assert device.tv?
     assert_equal :tv, device.id
     assert_equal "TV", device.name
   end
 
-  test "detect unknown device" do
+  test "detects unknown device" do
     device = Browser::Device.new("")
 
     assert device.unknown?
@@ -214,7 +214,7 @@ class DeviceTest < Minitest::Test
     OPERA_MOBI
     KINDLE_FIRE_HD_MOBILE
   ].each do |key|
-    test "detect #{key} as mobile" do
+    test "detects #{key} as mobile" do
       device = Browser::Device.new(Browser[key])
       assert device.mobile?
       refute device.tablet?
@@ -232,7 +232,7 @@ class DeviceTest < Minitest::Test
     FIREFOX_TABLET
     NEXUS7
   ].each do |key|
-    test "detect #{key} as tablet" do
+    test "detects #{key} as tablet" do
       device = Browser::Device.new(Browser[key])
       assert device.tablet?
       refute device.mobile?
@@ -253,13 +253,13 @@ class DeviceTest < Minitest::Test
     "CUSTOM_APP" => "HTC Ruby",
     "NOOK" => "NOOK BNTV250A"
   }.each do |key, name|
-    test "detect device name of #{key} as #{name}" do
+    test "detects device name of #{key} as #{name}" do
       device = Browser::Device.new(Browser[key])
       assert_equal name, device.name
     end
   end
 
-  test "detect samsung devices" do
+  test "detects samsung devices" do
     device = Browser::Device.new(Browser["SAMSUNG_SM-G975F"])
 
     assert device.samsung?
@@ -267,7 +267,7 @@ class DeviceTest < Minitest::Test
     assert_equal "Samsung Galaxy S10+", device.name
   end
 
-  test "detect generic samsung devices" do
+  test "detects generic samsung devices" do
     device = Browser::Device.new(Browser["SAMSUNG_SM-FAKE"])
 
     assert device.samsung?
@@ -280,7 +280,7 @@ class DeviceTest < Minitest::Test
     "SAMSUNG_SM-G960F" => "Samsung Galaxy S9",
     "SAMSUNG_SM-F700F" => "Samsung Galaxy Z Flip"
   }.each do |key, name|
-    test "detect device name of #{key} as #{name}" do
+    test "detects device name of #{key} as #{name}" do
       device = Browser::Device.new(Browser[key])
       assert_equal name, device.name
     end

data/test/unit/edge_test.rb

@@ -16,6 +16,7 @@ class EdgeTest < ActionController::TestCase
     refute browser.chrome?
     refute browser.safari?
     refute browser.device.mobile?
+    refute browser.chromium_based?
   end
 
   test "detects Microsoft Edge in compatibility view" do
@@ -33,6 +34,7 @@ class EdgeTest < ActionController::TestCase
     refute browser.chrome?
     refute browser.safari?
     refute browser.device.mobile?
+    refute browser.chromium_based?
   end
 
   test "detects Microsoft Edge Mobile" do
@@ -48,6 +50,7 @@ class EdgeTest < ActionController::TestCase
     refute browser.webkit?
     refute browser.chrome?
     refute browser.safari?
+    refute browser.chromium_based?
   end
 
   test "detects Microsoft Edge based on Chrome" do
@@ -58,6 +61,7 @@ class EdgeTest < ActionController::TestCase
     assert_equal "79.0.309.18", browser.full_version
     assert_equal "79", browser.version
     assert browser.platform.mac?
+    assert browser.chromium_based?
     refute browser.platform.windows?
     assert browser.edge?
     assert browser.webkit?
@@ -79,6 +83,7 @@ class EdgeTest < ActionController::TestCase
     refute browser.webkit?
     refute browser.chrome?
     refute browser.safari?
+    refute browser.chromium_based?
   end
 
   test "detects Microsoft Edge Mobile on Android" do
@@ -95,6 +100,7 @@ class EdgeTest < ActionController::TestCase
     refute browser.webkit?
     refute browser.chrome?
     refute browser.safari?
+    refute browser.chromium_based?
   end
 
   test "detects version by range" do

data/test/unit/electron_test.rb

@@ -3,7 +3,7 @@
 require "test_helper"
 
 class ElectronTest < Minitest::Test
-  test "detect electron" do
+  test "detects electron" do
     browser = Browser.new(Browser["ELECTRON"])
 
     assert_equal "Electron", browser.name

data/test/unit/facebook_test.rb

@@ -8,7 +8,7 @@ class FacebookTest < Minitest::Test
 
     assert_equal "Facebook", browser.name
     assert browser.facebook?
-    assert :facebook, browser.id
+    assert_equal :facebook, browser.id
     assert_equal "135.0.0.45.90", browser.full_version
     assert_equal "135", browser.version
   end
@@ -18,7 +18,7 @@ class FacebookTest < Minitest::Test
 
     assert_equal "Facebook", browser.name
     assert browser.facebook?
-    assert :facebook, browser.id
+    assert_equal :facebook, browser.id
     assert_equal "AppleWebKit/605.1.15", browser.full_version
     assert_equal "AppleWebKit/605", browser.version
   end
@@ -28,7 +28,7 @@ class FacebookTest < Minitest::Test
 
     assert_equal "Facebook", browser.name
     assert browser.facebook?
-    assert :facebook, browser.id
+    assert_equal :facebook, browser.id
     assert_equal "214.0.0.43.83", browser.full_version
     assert_equal "214", browser.version
   end

data/test/unit/generic_test.rb

@@ -3,20 +3,20 @@
 require "test_helper"
 
 class GenericTest < Minitest::Test
-  test "return default msie version" do
+  test "returns default msie version" do
     browser = Browser.new("")
 
     assert_equal "0.0", browser.msie_full_version
     assert_equal "0", browser.msie_version
   end
 
-  test "return default compatibility view" do
+  test "returns default compatibility view" do
     browser = Browser.new("")
 
     refute browser.compatibility_view?
   end
 
-  test "return default safari web app mode" do
+  test "returns default safari web app mode" do
     browser = Browser.new("")
 
     refute browser.safari_webapp_mode?

data/test/unit/instagram_test.rb

@@ -8,7 +8,7 @@ class InstagramTest < Minitest::Test
 
     assert_equal "Instagram", browser.name
     assert browser.instagram?
-    assert :instagram, browser.id
+    assert_equal :instagram, browser.id
     assert_equal "41.0.0.14.90", browser.full_version
     assert_equal "41", browser.version
   end
@@ -18,7 +18,7 @@ class InstagramTest < Minitest::Test
 
     assert_equal "Instagram", browser.name
     assert browser.instagram?
-    assert :instagram, browser.id
+    assert_equal :instagram, browser.id
     assert_equal "182257141", browser.full_version
     assert_equal "182257141", browser.version
   end

data/test/unit/internet_explorer_test.rb

@@ -261,43 +261,43 @@ class IeTest < Minitest::Test
     browser = Browser.new(Browser["IE6"])
     meta = browser.meta
 
-    assert meta.include?("ie")
-    assert meta.include?("ie6")
-    assert meta.include?("oldie")
-    assert meta.include?("lt-ie8")
-    assert meta.include?("lt-ie9")
-    assert meta.include?("windows")
+    assert_includes meta, "ie"
+    assert_includes meta, "ie6"
+    assert_includes meta, "oldie"
+    assert_includes meta, "lt-ie8"
+    assert_includes meta, "lt-ie9"
+    assert_includes meta, "windows"
   end
 
   test "returns string representation for ie7" do
     browser = Browser.new(Browser["IE7"])
     meta = browser.meta
 
-    assert meta.include?("ie")
-    assert meta.include?("ie7")
-    assert meta.include?("oldie")
-    assert meta.include?("lt-ie8")
-    assert meta.include?("lt-ie9")
-    assert meta.include?("windows")
+    assert_includes meta, "ie"
+    assert_includes meta, "ie7"
+    assert_includes meta, "oldie"
+    assert_includes meta, "lt-ie8"
+    assert_includes meta, "lt-ie9"
+    assert_includes meta, "windows"
   end
 
   test "returns string representation for ie8" do
     browser = Browser.new(Browser["IE8"])
     meta = browser.meta
 
-    assert meta.include?("ie")
-    assert meta.include?("ie8")
-    assert meta.include?("lt-ie9")
-    assert meta.include?("windows")
+    assert_includes meta, "ie"
+    assert_includes meta, "ie8"
+    assert_includes meta, "lt-ie9"
+    assert_includes meta, "windows"
   end
 
-  test "don't detect as two different versions" do
+  test "does not detect as two different versions" do
     browser = Browser.new(Browser["IE8"])
     assert browser.ie?(8)
     refute browser.ie?(7)
   end
 
-  test "more complex versioning check" do
+  test "handles more complex versioning check" do
     browser = Browser.new(Browser["IE8"])
     assert browser.ie?(["> 7", "< 9"])
   end

data/test/unit/ios_app_test.rb

@@ -5,15 +5,15 @@ require "test_helper"
 class IosAppTest < Minitest::Test
   let(:browser) { Browser.new(Browser["IOS_WEBVIEW"]) }
 
-  test "detect as ios" do
+  test "detects as ios" do
     assert browser.platform.ios?
   end
 
-  test "don't detect as safari" do
+  test "does not detect as safari" do
     refute browser.safari?
   end
 
-  test "detect as webview" do
+  test "detects as webview" do
     assert browser.platform.ios_webview?
   end
 end

data/test/unit/ios_test.rb

@@ -25,6 +25,12 @@ class IosTest < Minitest::Test
     assert_equal "5", browser.version
   end
 
+  test "detects chrome in desktop mode" do
+    browser = Browser.new(Browser["CHROME_REQUEST_DESKTOP_SITE"])
+    assert browser.platform.ios?
+    assert browser.device.mobile?
+  end
+
   test "detects safari in webapp mode" do
     browser = Browser.new(Browser["SAFARI_IPAD_WEBAPP_MODE"])
     refute browser.safari?
@@ -109,7 +115,7 @@ class IosTest < Minitest::Test
     refute browser.platform.mac?
   end
 
-  test "don't detect as two different versions" do
+  test "does not detect as two different versions" do
     browser = Browser.new(Browser["IOS8"])
     assert browser.platform.ios?(8)
     refute browser.platform.ios?(7)
@@ -119,22 +125,22 @@ class IosTest < Minitest::Test
     browser = Browser.new(Browser["IPHONE"])
     meta = browser.to_s
 
-    assert meta.include?("webkit")
-    assert meta.include?("ios")
-    assert meta.include?("safari")
-    assert meta.include?("safari3")
-    assert meta.include?("mobile")
-    refute meta.include?("tablet")
+    assert_includes meta, "webkit"
+    assert_includes meta, "ios"
+    assert_includes meta, "safari"
+    assert_includes meta, "safari3"
+    assert_includes meta, "mobile"
+    refute_includes meta, "tablet"
   end
 
   test "returns string representation for ipad" do
     browser = Browser.new(Browser["IPAD"])
     meta = browser.to_s
 
-    assert meta.include?("webkit")
-    assert meta.include?("ios")
-    assert meta.include?("safari")
-    assert meta.include?("tablet")
-    refute meta.include?("mobile")
+    assert_includes meta, "webkit"
+    assert_includes meta, "ios"
+    assert_includes meta, "safari"
+    assert_includes meta, "tablet"
+    refute_includes meta, "mobile"
   end
 end

data/test/unit/kindle_test.rb

@@ -11,6 +11,21 @@ class KindleTest < Minitest::Test
   test "detects kindle fire" do
     browser = Browser.new(Browser["KINDLE_FIRE"])
     assert browser.webkit?
+
+    browser = Browser.new(Browser["KINDLE_SILK_TABLET"])
+    assert browser.webkit?
+
+    browser = Browser.new(Browser["KINDLE_SILK_DESKTOP"])
+    assert browser.webkit?
+
+    browser = Browser.new(Browser["KINDLE_SILK_MOBILE"])
+    assert browser.webkit?
+
+    browser = Browser.new(Browser["KINDLE_SILK_TABLET_1ST_GEN"])
+    assert browser.webkit?
+
+    browser = Browser.new(Browser["KINDLE_SILK_MOBILE_1ST_GEN"])
+    assert browser.webkit?
   end
 
   test "detects kindle fire hd" do

data/test/unit/meta_test.rb

@@ -5,23 +5,23 @@ require "test_helper"
 class MetaTest < Minitest::Test
   class CustomRule < Browser::Meta::Base
     def meta
-      "custom" if /Custom/.match?(browser.ua)
+      "custom" if browser.ua.include?("Custom")
     end
   end
 
-  test "extend rules" do
+  test "extends rules" do
     Browser::Meta.rules.unshift(CustomRule)
 
     browser = Browser.new("Custom")
-    assert browser.meta.include?("custom")
+    assert_includes browser.meta, "custom"
 
     browser = Browser.new("Safari")
-    refute browser.meta.include?("custom")
+    refute_includes browser.meta, "custom"
 
     Browser::Meta.rules.shift
 
     browser = Browser.new("Custom")
-    refute browser.meta.include?("custom")
+    refute_includes browser.meta, "custom"
   end
 
   test "sets meta" do
@@ -33,25 +33,25 @@ class MetaTest < Minitest::Test
     browser = Browser.new(Browser["CHROME"])
     meta = browser.to_s
 
-    assert meta.include?("chrome")
-    assert meta.include?("webkit")
-    assert meta.include?("mac")
+    assert_includes meta, "chrome"
+    assert_includes meta, "webkit"
+    assert_includes meta, "mac"
   end
 
   test "returns string representation for mobile" do
     browser = Browser.new(Browser["BLACKBERRY"])
     meta = browser.to_s
 
-    assert meta.include?("blackberry")
-    assert meta.include?("mobile")
+    assert_includes meta, "blackberry"
+    assert_includes meta, "mobile"
   end
 
   test "returns string representation for unknown platform/device/browser" do
     browser = Browser.new("Unknown")
     meta = browser.to_s
 
-    assert meta.include?("unknown_platform")
-    assert meta.include?("unknown_device")
-    assert meta.include?("unknown_browser")
+    assert_includes meta, "unknown_platform"
+    assert_includes meta, "unknown_device"
+    assert_includes meta, "unknown_browser"
   end
 end