browser 2.5.2 → 5.3.1

data/test/unit/internet_explorer_test.rb

@@ -9,7 +9,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(6)
-    refute browser.modern?
     assert_equal "6.0", browser.full_version
     assert_equal "6", browser.version
   end
@@ -20,7 +19,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(7)
-    refute browser.modern?
     assert_equal "7.0", browser.full_version
     assert_equal "7", browser.version
   end
@@ -31,7 +29,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(8)
-    refute browser.modern?
     refute browser.compatibility_view?
     assert_equal "8.0", browser.full_version
     assert_equal "8", browser.version
@@ -43,7 +40,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(8)
-    refute browser.modern?
     assert browser.compatibility_view?
     assert_equal "8.0", browser.full_version
     assert_equal "8", browser.version
@@ -57,7 +53,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(9)
-    assert browser.modern?
     refute browser.compatibility_view?
     assert_equal "9.0", browser.full_version
     assert_equal "9", browser.version
@@ -69,7 +64,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(9)
-    refute browser.modern?
     assert browser.compatibility_view?
     assert_equal "9.0", browser.full_version
     assert_equal "9", browser.version
@@ -83,7 +77,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(10)
-    assert browser.modern?
     refute browser.compatibility_view?
     assert_equal "10.0", browser.full_version
     assert_equal "10", browser.version
@@ -95,7 +88,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(10)
-    refute browser.modern?
     assert browser.compatibility_view?
     assert_equal "10.0", browser.full_version
     assert_equal "10", browser.version
@@ -109,7 +101,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(11)
-    assert browser.modern?
     refute browser.compatibility_view?
     assert_equal "11.0", browser.full_version
     assert_equal "11", browser.version
@@ -121,7 +112,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(11)
-    refute browser.modern?
     assert browser.compatibility_view?
     assert_equal "11.0", browser.full_version
     assert_equal "11", browser.version
@@ -145,7 +135,6 @@ class IeTest < Minitest::Test
     assert_equal "Internet Explorer", browser.name
     assert browser.ie?
     assert browser.ie?(11)
-    assert browser.modern?
     refute browser.compatibility_view?
     refute browser.platform.windows_rt?
     assert browser.platform.windows_touchscreen_desktop?
@@ -166,7 +155,6 @@ class IeTest < Minitest::Test
     refute browser.platform.windows10?
     refute browser.platform.windows_phone?
     refute browser.edge?
-    refute browser.modern?
     refute browser.device.mobile?
     refute browser.webkit?
     refute browser.chrome?

data/test/unit/ios_test.rb

@@ -9,7 +9,6 @@ class IosTest < Minitest::Test
     assert_equal "Safari", browser.name
     assert browser.safari?
     assert browser.webkit?
-    assert browser.modern?
     assert browser.platform.ios?
     refute browser.platform.mac?
     assert_equal "3.0", browser.full_version
@@ -22,7 +21,6 @@ class IosTest < Minitest::Test
     assert_equal "Safari", browser.name
     assert browser.safari?
     assert browser.webkit?
-    assert browser.modern?
     assert_equal "5.0.1", browser.full_version
     assert_equal "5", browser.version
   end
@@ -56,7 +54,6 @@ class IosTest < Minitest::Test
     assert_equal "Safari", browser.name
     assert browser.safari?
     assert browser.webkit?
-    assert browser.modern?
     assert browser.platform.ios?
     refute browser.platform.mac?
     assert_equal "4.0.4", browser.full_version
@@ -105,6 +102,13 @@ class IosTest < Minitest::Test
     refute browser.platform.mac?
   end
 
+  test "detects ios12" do
+    browser = Browser.new(Browser["IOS12"])
+    assert browser.platform.ios?
+    assert browser.platform.ios?(12)
+    refute browser.platform.mac?
+  end
+
   test "don't detect as two different versions" do
     browser = Browser.new(Browser["IOS8"])
     assert browser.platform.ios?(8)
@@ -119,7 +123,6 @@ class IosTest < Minitest::Test
     assert meta.include?("ios")
     assert meta.include?("safari")
     assert meta.include?("safari3")
-    assert meta.include?("modern")
     assert meta.include?("mobile")
     refute meta.include?("tablet")
   end
@@ -131,7 +134,6 @@ class IosTest < Minitest::Test
     assert meta.include?("webkit")
     assert meta.include?("ios")
     assert meta.include?("safari")
-    assert meta.include?("modern")
     assert meta.include?("tablet")
     refute meta.include?("mobile")
   end

data/test/unit/kai_os_test.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class KaiOSTest < Minitest::Test
+  test "detects KaiOS" do
+    browser = Browser.new(Browser["NOKIA_8110"])
+
+    assert browser.firefox?
+    assert_equal "48", browser.version
+    assert_equal "48.0", browser.full_version
+    assert_equal "Firefox", browser.name
+    assert browser.platform.kai_os?
+    assert_equal "KaiOS", browser.platform.name
+    assert_equal "2.5", browser.platform.version
+    refute browser.platform.android?
+  end
+
+  test "detects KaiOS with Android string in user-agent " do
+    browser = Browser.new(Browser["JIOPHONE_2"])
+
+    assert browser.firefox?
+    assert_equal "48", browser.version
+    assert_equal "48.0", browser.full_version
+    assert_equal "Firefox", browser.name
+    assert browser.platform.kai_os?
+    assert_equal "KaiOS", browser.platform.name
+    assert_equal "2.5", browser.platform.version
+    refute browser.platform.android?
+  end
+end

data/test/unit/kindle_test.rb

@@ -17,13 +17,11 @@ class KindleTest < Minitest::Test
     browser = Browser.new(Browser["KINDLE_FIRE_HD"])
 
     assert browser.webkit?
-    assert browser.modern?
   end
 
   test "detects kindle fire hd mobile" do
     browser = Browser.new(Browser["KINDLE_FIRE_HD_MOBILE"])
 
     assert browser.webkit?
-    assert browser.modern?
   end
 end

data/test/unit/maxthon_test.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class MaxthonTest < Minitest::Test
+  test "detects Maxthon" do
+    browser = Browser.new(Browser["MAXTHON"])
+    assert browser.maxthon?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Maxthon", browser.name
+    assert_equal :maxthon, browser.id
+  end
+
+  test "detects correct version" do
+    browser = Browser.new(Browser["MAXTHON"])
+    assert_equal "5.3.8.2000", browser.full_version
+    assert_equal "5", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["MAXTHON"])
+    assert browser.maxthon?(%w[>=5 <6])
+  end
+end

data/test/unit/meta_test.rb

@@ -5,7 +5,7 @@ require "test_helper"
 class MetaTest < Minitest::Test
   class CustomRule < Browser::Meta::Base
     def meta
-      "custom" if browser.ua =~ /Custom/
+      "custom" if /Custom/.match?(browser.ua)
     end
   end
 
@@ -36,7 +36,6 @@ class MetaTest < Minitest::Test
     assert meta.include?("chrome")
     assert meta.include?("webkit")
     assert meta.include?("mac")
-    assert meta.include?("modern")
   end
 
   test "returns string representation for mobile" do
@@ -46,4 +45,13 @@ class MetaTest < Minitest::Test
     assert meta.include?("blackberry")
     assert meta.include?("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")
+  end
 end

data/test/unit/micro_messenger_test.rb

@@ -3,18 +3,33 @@
 require "test_helper"
 
 class MicroMessengerTest < Minitest::Test
-  test "detects micro messenger 6.3.15" do
-    browser = Browser.new(Browser["MICRO_MESSENGER"])
+  test "detects micro messenger 7.0.10 on iOS" do
+    browser = Browser.new(Browser["MICRO_MESSENGER_IOS"])
 
     assert browser.micro_messenger?
     assert browser.wechat?
-    assert_equal "6.3.15", browser.full_version
+    assert_equal "7.0.10", browser.full_version
     assert_equal "MicroMessenger", browser.name
     assert_equal :micro_messenger, browser.id
   end
 
-  test "detects version by range" do
-    browser = Browser.new(Browser["MICRO_MESSENGER"])
-    assert browser.wechat?(%w[>=6 <7])
+  test "detects version by range on iOS" do
+    browser = Browser.new(Browser["MICRO_MESSENGER_IOS"])
+    assert browser.wechat?(%w[>=7 <8])
+  end
+
+  test "detects micro messenger 7.0.13.1640 on Android" do
+    browser = Browser.new(Browser["MICRO_MESSENGER_ANDROID"])
+
+    assert browser.micro_messenger?
+    assert browser.wechat?
+    assert_equal "7.0.13.1640", browser.full_version
+    assert_equal "MicroMessenger", browser.name
+    assert_equal :micro_messenger, browser.id
+  end
+
+  test "detects version by range on Android" do
+    browser = Browser.new(Browser["MICRO_MESSENGER_ANDROID"])
+    assert browser.wechat?(%w[>=7 <8])
   end
 end

data/test/unit/miui_browser_test.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class MiuiBrowserTest < Minitest::Test
+  test "detects Miui Browser" do
+    browser = Browser.new(Browser["MIUI_BROWSER"])
+    assert browser.miui_browser?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Miui Browser", browser.name
+    assert_equal :miui_browser, browser.id
+  end
+
+  test "detects correct version" do
+    browser = Browser.new(Browser["MIUI_BROWSER"])
+    assert_equal "12.3.3", browser.full_version
+    assert_equal "12", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["MIUI_BROWSER"])
+    assert browser.miui_browser?(%w[>=12 <13])
+  end
+end

data/test/unit/opera_test.rb

@@ -8,7 +8,6 @@ class OperaTest < Minitest::Test
 
     assert_equal "Opera", browser.name
     assert browser.opera?
-    refute browser.modern?
     assert_equal "11.64", browser.full_version
     assert_equal "11", browser.version
   end
@@ -20,8 +19,8 @@ class OperaTest < Minitest::Test
     assert_equal :opera, browser.id
     assert browser.opera?
     assert browser.webkit?
-    assert browser.modern?
     refute browser.chrome?
+    refute browser.safari?
     assert_equal "15.0.1147.44", browser.full_version
     assert_equal "15", browser.version
   end

data/test/unit/platform_test.rb

@@ -5,7 +5,7 @@ require "test_helper"
 class PlatformTest < Minitest::Test
   class CustomPlatform < Browser::Platform::Base
     def match?
-      ua =~ /Custom/
+      ua.include?("Custom")
     end
 
     def id
@@ -20,7 +20,7 @@ class PlatformTest < Minitest::Test
 
     Browser::Platform.matchers.shift
     platform = Browser::Platform.new("Custom")
-    assert_equal :other, platform.id
+    assert_equal :unknown_platform, platform.id
   end
 
   test "implements to_s" do
@@ -35,13 +35,13 @@ class PlatformTest < Minitest::Test
     refute platform == :android
   end
 
-  test "detect other" do
-    platform = Browser::Platform.new("Other")
+  test "detect unknown platforms" do
+    platform = Browser::Platform.new("Unknown")
 
-    assert_equal "Other", platform.name
-    assert_equal :other, platform.id
+    assert_equal "Unknown", platform.name
+    assert_equal :unknown_platform, platform.id
     assert_equal "0", platform.version
-    assert platform.other?
+    assert platform.unknown?
   end
 
   test "detect ios (iPhone)" do
@@ -62,6 +62,27 @@ class PlatformTest < Minitest::Test
     assert_equal "9", platform.version
   end
 
+  test "detect specific minor iOS (iPhone)" do
+    platform = Browser::Platform.new(Browser["IOS8_3"])
+
+    assert_equal "iOS (iPhone)", platform.name
+    assert_equal :ios, platform.id
+    assert platform.ios?
+    assert platform.ios?(8.3)
+    assert_equal "8.3", platform.version
+  end
+
+  test "detect specific patch iOS (iPhone)" do
+    platform = Browser::Platform.new(Browser["IOS8_1_2"])
+
+    assert_equal "iOS (iPhone)", platform.name
+    assert_equal :ios, platform.id
+    assert platform.ios?
+    assert platform.ios?("8.1.2")
+    assert platform.ios?("<8.2")
+    assert_equal "8.1.2", platform.version
+  end
+
   test "detect ios (iPod Touch)" do
     platform = Browser::Platform.new(Browser["IPOD"])
 
@@ -83,7 +104,7 @@ class PlatformTest < Minitest::Test
   test "detect mac" do
     platform = Browser::Platform.new(Browser["SAFARI"])
 
-    assert_equal "Macintosh", platform.name
+    assert_equal "Mac OS X", platform.name
     assert_equal :mac, platform.id
     assert platform.mac?
     assert_equal "10.6.4", platform.version
@@ -95,6 +116,11 @@ class PlatformTest < Minitest::Test
     assert_equal "0", platform.version
   end
 
+  test "detect 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
     platform = Browser::Platform.new(Browser["FIREFOX_OS"])
 

data/test/unit/qq_test.rb

@@ -9,6 +9,9 @@ class QQTest < Minitest::Test
     assert_equal "6.3.3.432", browser.full_version
     assert_equal "QQ Browser", browser.name
     assert_equal :qq, browser.id
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 
   test "detects QQ browser for Android" do
@@ -17,6 +20,9 @@ class QQTest < Minitest::Test
     assert_equal "6.2", browser.full_version
     assert_equal "QQ Browser", browser.name
     assert_equal :qq, browser.id
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 
   test "detects QQ browser for Mac" do
@@ -25,6 +31,9 @@ class QQTest < Minitest::Test
     assert_equal "4.2.4753.400", browser.full_version
     assert_equal "QQ Browser", browser.name
     assert_equal :qq, browser.id
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 
   test "detects QQ browser lite for Mac" do
@@ -33,5 +42,8 @@ class QQTest < Minitest::Test
     assert_equal "1.0.4", browser.full_version
     assert_equal "QQ Browser", browser.name
     assert_equal :qq, browser.id
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 end

data/test/unit/safari_test.rb

@@ -7,7 +7,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI3"])
 
     assert browser.safari?
-    assert browser.safari?(3)
+    assert browser.safari?("~>3.0")
     assert_equal "3", browser.version
     assert_equal "3.0.3", browser.full_version
   end
@@ -16,7 +16,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI4"])
 
     assert browser.safari?
-    assert browser.safari?(4)
+    assert browser.safari?("~>4.0")
     assert_equal "4", browser.version
     assert_equal "4.0.3", browser.full_version
   end
@@ -25,7 +25,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI5"])
 
     assert browser.safari?
-    assert browser.safari?(5)
+    assert browser.safari?("~>5.0")
     assert_equal "5", browser.version
     assert_equal "5.0.3", browser.full_version
   end
@@ -34,7 +34,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI6"])
 
     assert browser.safari?
-    assert browser.safari?(6)
+    assert browser.safari?("~>6.0")
     assert_equal "6", browser.version
     assert_equal "6.0", browser.full_version
   end
@@ -43,7 +43,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI7"])
 
     assert browser.safari?
-    assert browser.safari?(7)
+    assert browser.safari?("~>7.0")
     assert_equal "7", browser.version
     assert_equal "7.0", browser.full_version
   end
@@ -52,7 +52,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI8"])
 
     assert browser.safari?
-    assert browser.safari?(8)
+    assert browser.safari?("~>8.0")
     assert_equal "8", browser.version
     assert_equal "8.0", browser.full_version
   end
@@ -61,7 +61,7 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI9"])
 
     assert browser.safari?
-    assert browser.safari?(9)
+    assert browser.safari?("~>9.0")
     assert_equal "9", browser.version
     assert_equal "9.0.2", browser.full_version
   end
@@ -88,4 +88,9 @@ class SafariTest < Minitest::Test
     browser = Browser.new(Browser["SAFARI9"])
     assert browser.webkit?(%w[>=601 <602])
   end
+
+  test "detects safari version by range" do
+    browser = Browser.new(Browser["SAFARI9"])
+    assert browser.safari?(%w[>=9.0 <10])
+  end
 end

data/test/unit/samsung_browser_test.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SamsungBrowserTest < Minitest::Test
+  test "detects samsung browser" do
+    browser = Browser.new(Browser["SAMSUNG_BROWSER"])
+
+    assert browser.webkit?
+    assert browser.samsung_browser?
+    assert_equal "11", browser.version
+    assert_equal :samsung_browser, browser.id
+    assert_equal "11.1", browser.full_version
+    assert_equal "Samsung Browser", browser.name
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["SAMSUNG_BROWSER"])
+    assert browser.samsung_browser?(%w[>=11 <12])
+  end
+end

data/test/unit/snapchat_test.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SnapchatTest < Minitest::Test
+  test "detects snapchat" do
+    browser = Browser.new(Browser["SNAPCHAT"])
+
+    assert_equal "Snapchat", browser.name
+    assert browser.snapchat?
+    assert :snapchat, browser.id
+    assert_equal "10.69.5.72", browser.full_version
+    assert_equal "10", browser.version
+  end
+
+  test "detects snapchat for badly formatted user agent" do
+    browser = Browser.new(Browser["SNAPCHAT_EMPTY_STRING_VERSION"])
+
+    assert_equal "Snapchat", browser.name
+    assert browser.snapchat?
+    assert :snapchat, browser.id
+    assert_equal "10.70.0.0", browser.full_version
+    assert_equal "10", browser.version
+  end
+
+  test "detects alternate snapchat user agent" do
+    browser = Browser.new(Browser["SNAPCHAT_SPACE_VERSION"])
+
+    assert_equal "Snapchat", browser.name
+    assert browser.snapchat?
+    assert :snapchat, browser.id
+    assert_equal "10.70.0.0", browser.full_version
+    assert_equal "10", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["SNAPCHAT"])
+    assert browser.snapchat?(%w[>=10])
+  end
+end

data/test/unit/sougou_browser_test.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SougouBrowserTest < Minitest::Test
+  test "detects Sougou Browser on desktop device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER"])
+    assert browser.sougou_browser?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Sougou Browser", browser.name
+    assert_equal :sougou_browser, browser.id
+  end
+
+  test "detects correct version on desktop device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER"])
+    assert_equal "0.0", browser.full_version
+    assert_equal "0", browser.version
+  end
+
+  test "detects Sougou Browser on mobile device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER_MOBILE"])
+    assert browser.sougou_browser?
+    assert browser.device.mobile?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Sougou Browser", browser.name
+    assert_equal :sougou_browser, browser.id
+  end
+
+  test "detects correct version on mobile device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER_MOBILE"])
+    assert_equal "5.28.12", browser.full_version
+    assert_equal "5", browser.version
+  end
+
+  test "detects version by range on mobile device" do
+    browser = Browser.new(Browser["SOUGOU_BROWSER_MOBILE"])
+    assert browser.sougou_browser?(%w[>=5 <6])
+  end
+end

data/test/unit/sputnik_test.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SputnikTest < Minitest::Test
+  test "detects sputnik" do
+    browser = Browser.new(Browser["SPUTNIK"])
+
+    assert_equal "Sputnik", browser.name
+    assert_equal :sputnik, browser.id
+    assert browser.sputnik?
+    refute browser.chrome?
+    refute browser.safari?
+    assert_equal "4.1.2801.0", browser.full_version
+    assert_equal "4", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["SPUTNIK"])
+    assert browser.sputnik?(%w[>=4 <5])
+  end
+end