browser 5.3.1 → 6.0.0

data/test/unit/ios_test.rb

@@ -109,7 +109,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 +119,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

data/test/unit/platform_test.rb

@@ -13,7 +13,7 @@ class PlatformTest < Minitest::Test
     end
   end
 
-  test "extend matchers" do
+  test "extends matchers" do
     Browser::Platform.matchers.unshift(CustomPlatform)
     platform = Browser::Platform.new("Custom")
     assert_equal :custom, platform.id
@@ -31,11 +31,11 @@ class PlatformTest < Minitest::Test
   test "implements ==" do
     platform = Browser::Platform.new(Browser["IOS9"])
 
-    assert platform == :ios
-    refute platform == :android
+    assert_operator platform, :==, :ios # rubocop:disable Minitest/AssertEqual
+    refute_equal platform, :android
   end
 
-  test "detect unknown platforms" do
+  test "detects unknown platforms" do
     platform = Browser::Platform.new("Unknown")
 
     assert_equal "Unknown", platform.name
@@ -44,7 +44,7 @@ class PlatformTest < Minitest::Test
     assert platform.unknown?
   end
 
-  test "detect ios (iPhone)" do
+  test "detects ios (iPhone)" do
     platform = Browser::Platform.new(Browser["IOS4"])
 
     assert_equal "iOS (iPhone)", platform.name
@@ -53,7 +53,7 @@ class PlatformTest < Minitest::Test
     assert_equal "4", platform.version
   end
 
-  test "detect ios (iPad)" do
+  test "detects ios (iPad)" do
     platform = Browser::Platform.new(Browser["IOS9"])
 
     assert_equal "iOS (iPad)", platform.name
@@ -62,7 +62,7 @@ class PlatformTest < Minitest::Test
     assert_equal "9", platform.version
   end
 
-  test "detect specific minor iOS (iPhone)" do
+  test "detects specific minor iOS (iPhone)" do
     platform = Browser::Platform.new(Browser["IOS8_3"])
 
     assert_equal "iOS (iPhone)", platform.name
@@ -72,7 +72,7 @@ class PlatformTest < Minitest::Test
     assert_equal "8.3", platform.version
   end
 
-  test "detect specific patch iOS (iPhone)" do
+  test "detects specific patch iOS (iPhone)" do
     platform = Browser::Platform.new(Browser["IOS8_1_2"])
 
     assert_equal "iOS (iPhone)", platform.name
@@ -83,7 +83,7 @@ class PlatformTest < Minitest::Test
     assert_equal "8.1.2", platform.version
   end
 
-  test "detect ios (iPod Touch)" do
+  test "detects ios (iPod Touch)" do
     platform = Browser::Platform.new(Browser["IPOD"])
 
     assert_equal "iOS (iPod)", platform.name
@@ -92,7 +92,7 @@ class PlatformTest < Minitest::Test
     assert_equal "0", platform.version
   end
 
-  test "detect linux" do
+  test "detects linux" do
     platform = Browser::Platform.new(Browser["FIREFOX"])
 
     assert_equal "Generic Linux", platform.name
@@ -101,7 +101,7 @@ class PlatformTest < Minitest::Test
     assert_equal "0", platform.version
   end
 
-  test "detect mac" do
+  test "detects mac" do
     platform = Browser::Platform.new(Browser["SAFARI"])
 
     assert_equal "Mac OS X", platform.name
@@ -111,17 +111,17 @@ class PlatformTest < Minitest::Test
     assert platform.mac?(["=10.6.4"])
   end
 
-  test "return stub version for Mac user agent without version" do
+  test "returns stub version for Mac user agent without version" do
     platform = Browser::Platform.new("Macintosh")
     assert_equal "0", platform.version
   end
 
-  test "detect mac names" do
+  test "detects mac names" do
     assert_equal "Mac OS X", Browser::Platform.new(Browser["MAC_OSX"]).name
     assert_equal "macOS", Browser::Platform.new(Browser["MAC_OS"]).name
   end
 
-  test "detect firefox os" do
+  test "detects firefox os" do
     platform = Browser::Platform.new(Browser["FIREFOX_OS"])
 
     assert_equal "Firefox OS", platform.name
@@ -130,7 +130,7 @@ class PlatformTest < Minitest::Test
     assert_equal "0", platform.version
   end
 
-  test "detect windows phone" do
+  test "detects windows phone" do
     platform = Browser::Platform.new(Browser["MS_EDGE_MOBILE"])
 
     assert_equal "Windows Phone", platform.name
@@ -139,7 +139,7 @@ class PlatformTest < Minitest::Test
     assert_equal "10.0", platform.version
   end
 
-  test "detect windows mobile" do
+  test "detects windows mobile" do
     platform = Browser::Platform.new(Browser["WINDOWS_MOBILE"])
 
     assert_equal "Windows Mobile", platform.name
@@ -148,7 +148,7 @@ class PlatformTest < Minitest::Test
     assert_equal "0", platform.version
   end
 
-  test "detect blackberry 10" do
+  test "detects blackberry 10" do
     platform = Browser::Platform.new(Browser["BLACKBERRY10"])
 
     assert_equal "BlackBerry", platform.name
@@ -157,7 +157,7 @@ class PlatformTest < Minitest::Test
     assert_equal "10.0.9.1675", platform.version
   end
 
-  test "detect blackberry 4" do
+  test "detects blackberry 4" do
     platform = Browser::Platform.new(Browser["BLACKBERRY4"])
 
     assert_equal "BlackBerry", platform.name
@@ -166,7 +166,7 @@ class PlatformTest < Minitest::Test
     assert_equal "4.2.1", platform.version
   end
 
-  test "detect blackberry 4 (other)" do
+  test "detects blackberry 4 (other)" do
     platform = Browser::Platform.new(Browser["BLACKBERRY"])
 
     assert_equal "BlackBerry", platform.name
@@ -175,7 +175,7 @@ class PlatformTest < Minitest::Test
     assert_equal "4.1.0", platform.version
   end
 
-  test "detect blackberry 5" do
+  test "detects blackberry 5" do
     platform = Browser::Platform.new(Browser["BLACKBERRY5"])
 
     assert_equal "BlackBerry", platform.name
@@ -184,7 +184,7 @@ class PlatformTest < Minitest::Test
     assert_equal "5.0.0.93", platform.version
   end
 
-  test "detect blackberry 6" do
+  test "detects blackberry 6" do
     platform = Browser::Platform.new(Browser["BLACKBERRY6"])
 
     assert_equal "BlackBerry", platform.name
@@ -193,7 +193,7 @@ class PlatformTest < Minitest::Test
     assert_equal "6.0.0.141", platform.version
   end
 
-  test "detect blackberry 7" do
+  test "detects blackberry 7" do
     platform = Browser::Platform.new(Browser["BLACKBERRY7"])
 
     assert_equal "BlackBerry", platform.name
@@ -202,7 +202,7 @@ class PlatformTest < Minitest::Test
     assert_equal "7.0.0.1", platform.version
   end
 
-  test "detect android" do
+  test "detects android" do
     platform = Browser::Platform.new(Browser["ANDROID_CUPCAKE"])
 
     assert_equal "Android", platform.name
@@ -211,7 +211,7 @@ class PlatformTest < Minitest::Test
     assert_equal "1.5", platform.version
   end
 
-  test "detect chrome os" do
+  test "detects chrome os" do
     platform = Browser::Platform.new(Browser["CHROME_OS"])
 
     assert_equal "Chrome OS", platform.name
@@ -221,10 +221,18 @@ class PlatformTest < Minitest::Test
     assert_equal "3701.81.0", platform.version
   end
 
-  test "detect adobe air" do
+  test "detects adobe air" do
     platform = Browser::Platform.new(Browser["ADOBE_AIR"])
 
     assert platform.adobe_air?
     assert platform.adobe_air?(%w[>=13 <14])
   end
+
+  test "implements default match?" do
+    matcher_class = Class.new(Browser::Platform::Base)
+    Browser::Platform.matchers.unshift(matcher_class)
+    platform = Browser::Platform.new("")
+
+    assert platform.unknown?
+  end
 end

data/test/unit/proxy_test.rb

@@ -10,11 +10,11 @@ class ProxyTest < Minitest::Test
   ].each do |name|
     ua = Browser[name]
 
-    test "detect #{name} as proxy" do
+    test "detects #{name} as proxy" do
       browser = Browser.new(ua)
 
       assert browser.proxy?
-      assert browser.meta.include?("proxy")
+      assert_includes browser.meta, "proxy"
     end
   end
 end

data/test/unit/safari_test.rb

@@ -3,7 +3,7 @@
 require "test_helper"
 
 class SafariTest < Minitest::Test
-  test "detect safari 3" do
+  test "detects safari 3" do
     browser = Browser.new(Browser["SAFARI3"])
 
     assert browser.safari?
@@ -12,7 +12,7 @@ class SafariTest < Minitest::Test
     assert_equal "3.0.3", browser.full_version
   end
 
-  test "detect safari 4" do
+  test "detects safari 4" do
     browser = Browser.new(Browser["SAFARI4"])
 
     assert browser.safari?
@@ -21,7 +21,7 @@ class SafariTest < Minitest::Test
     assert_equal "4.0.3", browser.full_version
   end
 
-  test "detect safari 5" do
+  test "detects safari 5" do
     browser = Browser.new(Browser["SAFARI5"])
 
     assert browser.safari?
@@ -30,7 +30,7 @@ class SafariTest < Minitest::Test
     assert_equal "5.0.3", browser.full_version
   end
 
-  test "detect safari 6" do
+  test "detects safari 6" do
     browser = Browser.new(Browser["SAFARI6"])
 
     assert browser.safari?
@@ -39,7 +39,7 @@ class SafariTest < Minitest::Test
     assert_equal "6.0", browser.full_version
   end
 
-  test "detect safari 7" do
+  test "detects safari 7" do
     browser = Browser.new(Browser["SAFARI7"])
 
     assert browser.safari?
@@ -48,7 +48,7 @@ class SafariTest < Minitest::Test
     assert_equal "7.0", browser.full_version
   end
 
-  test "detect safari 8" do
+  test "detects safari 8" do
     browser = Browser.new(Browser["SAFARI8"])
 
     assert browser.safari?
@@ -57,7 +57,7 @@ class SafariTest < Minitest::Test
     assert_equal "8.0", browser.full_version
   end
 
-  test "detect safari 9" do
+  test "detects safari 9" do
     browser = Browser.new(Browser["SAFARI9"])
 
     assert browser.safari?
@@ -66,13 +66,13 @@ class SafariTest < Minitest::Test
     assert_equal "9.0.2", browser.full_version
   end
 
-  test "detect web app mode" do
+  test "detects web app mode" do
     browser = Browser.new(Browser["SAFARI_IPHONE_WEBAPP_MODE"])
 
     assert browser.safari_webapp_mode?
   end
 
-  test "reject regular safari as web app mode" do
+  test "rejects regular safari as web app mode" do
     browser = Browser.new(Browser["SAFARI9"])
 
     refute browser.safari_webapp_mode?
@@ -93,4 +93,9 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI9"])
     assert browser.safari?(%w[>=9.0 <10])
   end
+
+  test "does not detect as chromium" do
+    browser = Browser.new(Browser["SAFARI9"])
+    refute browser.chromium_based?
+  end
 end

data/test/unit/snapchat_test.rb

@@ -8,7 +8,7 @@ class SnapchatTest < Minitest::Test
 
     assert_equal "Snapchat", browser.name
     assert browser.snapchat?
-    assert :snapchat, browser.id
+    assert_equal :snapchat, browser.id
     assert_equal "10.69.5.72", browser.full_version
     assert_equal "10", browser.version
   end
@@ -18,7 +18,7 @@ class SnapchatTest < Minitest::Test
 
     assert_equal "Snapchat", browser.name
     assert browser.snapchat?
-    assert :snapchat, browser.id
+    assert_equal :snapchat, browser.id
     assert_equal "10.70.0.0", browser.full_version
     assert_equal "10", browser.version
   end
@@ -28,7 +28,7 @@ class SnapchatTest < Minitest::Test
 
     assert_equal "Snapchat", browser.name
     assert browser.snapchat?
-    assert :snapchat, browser.id
+    assert_equal :snapchat, browser.id
     assert_equal "10.70.0.0", browser.full_version
     assert_equal "10", browser.version
   end

data/test/unit/uc_browser_test.rb

@@ -6,7 +6,7 @@ class UcBrowserTest < Minitest::Test
   test "detects UC Browser" do
     browser = Browser.new(Browser["UC_BROWSER"])
     assert browser.uc_browser?
-    assert_equal browser.name, "UCBrowser"
+    assert_equal "UCBrowser", browser.name
   end
 
   test "detects version by range" do

data/test/unit/windows_test.rb

@@ -8,7 +8,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows_x64?
     refute browser.platform.windows_wow64?
     assert browser.platform.windows_x64_inclusive?
-    assert_equal browser.platform.version, "6.2"
+    assert_equal "6.2", browser.platform.version
   end
 
   test "detects windows wow64" do
@@ -16,14 +16,14 @@ class WindowsTest < Minitest::Test
     refute browser.platform.windows_x64?
     assert browser.platform.windows_wow64?
     assert browser.platform.windows_x64_inclusive?
-    assert_equal browser.platform.version, "6.3"
+    assert_equal "6.3", browser.platform.version
   end
 
   test "detects windows_2000" do
     browser = Browser.new(Browser["WINDOWS_2000"])
 
     assert browser.platform.windows?
-    assert_equal browser.platform.version, "5.0"
+    assert_equal "5.0", browser.platform.version
     assert browser.platform.windows?(["=5.0"])
   end
 
@@ -31,7 +31,7 @@ class WindowsTest < Minitest::Test
     browser = Browser.new(Browser["WINDOWS_2000_SP1"])
 
     assert browser.platform.windows?
-    assert_equal browser.platform.version, "5.01"
+    assert_equal "5.01", browser.platform.version
     assert browser.platform.windows?(["=5.01"])
   end
 
@@ -40,7 +40,7 @@ class WindowsTest < Minitest::Test
 
     assert browser.platform.windows?
     assert browser.platform.windows_xp?
-    assert_equal browser.platform.version, "5.1"
+    assert_equal "5.1", browser.platform.version
     assert browser.platform.windows?(["=5.1"])
   end
 
@@ -50,7 +50,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows?
     assert browser.platform.windows_xp?
     assert browser.platform.windows_x64?
-    assert_equal browser.platform.version, "5.2"
+    assert_equal "5.2", browser.platform.version
     assert browser.platform.windows?(["=5.2"])
   end
 
@@ -59,7 +59,7 @@ class WindowsTest < Minitest::Test
 
     assert browser.platform.windows?
     assert browser.platform.windows_vista?
-    assert_equal browser.platform.version, "6.0"
+    assert_equal "6.0", browser.platform.version
     assert browser.platform.windows?(["=6.0"])
   end
 
@@ -68,7 +68,7 @@ class WindowsTest < Minitest::Test
 
     assert browser.platform.windows?
     assert browser.platform.windows7?
-    assert_equal browser.platform.version, "6.1"
+    assert_equal "6.1", browser.platform.version
     assert browser.platform.windows?(["=6.1"])
   end
 
@@ -78,7 +78,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows?
     assert browser.platform.windows8?
     refute browser.platform.windows8_1?
-    assert_equal browser.platform.version, "6.2"
+    assert_equal "6.2", browser.platform.version
     assert browser.platform.windows?(["=6.2"])
   end
 
@@ -88,7 +88,7 @@ class WindowsTest < Minitest::Test
     assert browser.platform.windows?
     assert browser.platform.windows8?
     assert browser.platform.windows8_1?
-    assert_equal browser.platform.version, "6.3"
+    assert_equal "6.3", browser.platform.version
     assert browser.platform.windows?(["=6.3"])
   end
 
@@ -97,7 +97,7 @@ class WindowsTest < Minitest::Test
 
     assert browser.platform.windows?
     assert browser.platform.windows10?
-    assert_equal browser.platform.version, "10.0"
+    assert_equal "10.0", browser.platform.version
     assert browser.platform.windows?(["=10.0"])
   end