browser 2.5.2 → 5.3.1

data/test/unit/adobe_air_test.rb

@@ -9,7 +9,7 @@ class AdobeAirTest < Minitest::Test
     assert browser.webkit?
     assert_equal "0", browser.version
     assert_equal "0.0", browser.full_version
-    assert_equal "Generic Browser", browser.name
+    assert_equal "Unknown Browser", browser.name
     assert_equal "Adobe AIR", browser.platform.name
     assert_equal "13.0", browser.platform.version
   end

data/test/unit/alipay_test.rb

@@ -10,6 +10,9 @@ class AlipayTest < Minitest::Test
     assert browser.alipay?
     assert_equal "Alipay", browser.name
     assert_equal "2.3.4", browser.full_version
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 
   test "detects alipay Android" do
@@ -19,6 +22,9 @@ class AlipayTest < Minitest::Test
     assert browser.alipay?
     assert_equal "Alipay", browser.name
     assert_equal "9.0.1.073001", browser.full_version
+
+    refute browser.chrome?
+    refute browser.safari?
   end
 
   test "detects version by range" do

data/test/unit/blackberry_test.rb

@@ -9,7 +9,6 @@ class BlackberryTest < Minitest::Test
     assert_equal "BlackBerry", browser.name
     refute browser.device.tablet?
     assert browser.device.mobile?
-    refute browser.modern?
     assert_equal "4.1.0", browser.full_version
     assert_equal "4", browser.version
   end
@@ -18,7 +17,6 @@ class BlackberryTest < Minitest::Test
     browser = Browser.new(Browser["BLACKBERRY4"])
 
     assert_equal "BlackBerry", browser.name
-    refute browser.modern?
     assert_equal "4.2.1", browser.full_version
     assert_equal "4", browser.version
   end
@@ -29,7 +27,6 @@ class BlackberryTest < Minitest::Test
     assert_equal "BlackBerry", browser.name
     refute browser.device.tablet?
     assert browser.device.mobile?
-    refute browser.modern?
     assert_equal "5.0.0.93", browser.full_version
     assert_equal "5", browser.version
   end
@@ -40,7 +37,6 @@ class BlackberryTest < Minitest::Test
     assert_equal "BlackBerry", browser.name
     refute browser.device.tablet?
     assert browser.device.mobile?
-    assert browser.modern?
     assert_equal "6.0.0.141", browser.full_version
     assert_equal "6", browser.version
   end
@@ -51,7 +47,6 @@ class BlackberryTest < Minitest::Test
     assert_equal "BlackBerry", browser.name
     refute browser.device.tablet?
     assert browser.device.mobile?
-    assert browser.modern?
     assert_equal "7.0.0.1", browser.full_version
     assert_equal "7", browser.version
   end
@@ -62,7 +57,6 @@ class BlackberryTest < Minitest::Test
     assert_equal "BlackBerry", browser.name
     refute browser.device.tablet?
     assert browser.device.mobile?
-    assert browser.modern?
     assert_equal "10.0.9.1675", browser.full_version
     assert_equal "10", browser.version
   end

data/test/unit/bots_test.rb

@@ -15,25 +15,6 @@ class BotsTest < Minitest::Test
     refute browser.bot?
   end
 
-  test "doesn't consider empty UA as bot" do
-    browser = Browser.new("")
-    refute browser.bot?
-  end
-
-  test "allows setting empty string as bots" do
-    Browser::Bot.detect_empty_ua!
-    browser = Browser.new("")
-
-    assert browser.bot?
-  end
-
-  test "doesn't detect mozilla as a bot when considering empty UA" do
-    Browser::Bot.detect_empty_ua!
-    browser = Browser.new("Mozilla")
-
-    refute browser.bot?
-  end
-
   test "returns bot name" do
     browser = Browser.new(Browser["GOOGLE_BOT"])
     assert_equal "Google Bot", browser.bot.name
@@ -42,13 +23,6 @@ class BotsTest < Minitest::Test
     assert_equal "Facebook Bot", browser.bot.name
   end
 
-  test "returns bot name (empty string ua detection enabled)" do
-    Browser::Bot.detect_empty_ua!
-    browser = Browser.new("")
-
-    assert_equal browser.bot.name, "Generic Bot"
-  end
-
   test "returns nil for non-bots" do
     browser = Browser.new(Browser["CHROME"])
     assert_nil browser.bot.name
@@ -75,7 +49,6 @@ class BotsTest < 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?
@@ -98,4 +71,41 @@ class BotsTest < Minitest::Test
 
     Browser::Bot.bots.delete("faraday")
   end
+
+  test "detects recognized bots using common libs" do
+    browser = Browser.new(Browser.bot_user_agents["LINKEDIN"])
+
+    assert browser.bot?
+    assert_equal "LinkedIn", browser.bot.name
+  end
+
+  test "tells why user agent is considered a bot" do
+    matcher = Browser::Bot.why?(Browser.bot_user_agents["LINKEDIN"])
+
+    assert_equal Browser::Bot::KnownBotsMatcher, matcher
+  end
+
+  test "adds custom bot matcher" do
+    Browser::Bot.matchers << ->(ua, _) { ua.match?(/some-script/) }
+    browser = Browser.new("some-script")
+
+    assert browser.bot?
+    assert_equal "Generic Bot", browser.bot.name
+  end
+
+  %w[
+    content-fetcher
+    content-crawler
+    some-search-engine
+    monitoring-service
+    content-spider
+    some-bot
+  ].each do |ua|
+    test "detects user agents based on keywords (#{ua})" do
+      browser = Browser.new(ua)
+
+      assert browser.bot?
+      assert_equal Browser::Bot::KeywordMatcher, browser.bot.why?
+    end
+  end
 end

data/test/unit/chrome_test.rb

@@ -10,7 +10,6 @@ class ChromeTest < Minitest::Test
     assert browser.chrome?
     refute browser.safari?
     assert browser.webkit?
-    assert browser.modern?
     assert_equal "5.0.375.99", browser.full_version
     assert_equal "5", browser.version
   end
@@ -22,7 +21,6 @@ class ChromeTest < Minitest::Test
     assert browser.chrome?
     refute browser.safari?
     assert browser.webkit?
-    assert browser.modern?
     assert_equal "19.0.1084.60", browser.full_version
     assert_equal "19", browser.version
   end
@@ -35,7 +33,6 @@ class ChromeTest < Minitest::Test
     assert browser.platform.android?
     refute browser.safari?
     assert browser.webkit?
-    assert browser.modern?
     assert_equal "28.0.1500.94", browser.full_version
     assert_equal "28", browser.version
   end
@@ -45,22 +42,6 @@ class ChromeTest < Minitest::Test
     assert browser.platform.chrome_os?
   end
 
-  test "detects yandex browser" do
-    browser = Browser.new(Browser["YANDEX_BROWSER"])
-
-    assert browser.yandex?
-    assert browser.chrome?
-    refute browser.safari?
-    assert browser.webkit?
-    assert_equal "41.0.2272.118", browser.full_version
-    assert_equal "41", browser.version
-  end
-
-  test "detects yandex version by range" do
-    browser = Browser.new(Browser["YANDEX_BROWSER"])
-    assert browser.yandex?(%w[>=41 <42])
-  end
-
   test "detects chrome frame" do
     browser = Browser.new(Browser["IE9_CHROME_FRAME"])
 
@@ -77,6 +58,14 @@ class ChromeTest < Minitest::Test
     assert browser.chrome?
   end
 
+  test "detects chrome on android 10" do
+    browser = Browser.new(Browser["ANDROID_Q"])
+
+    assert browser.chrome?
+    assert_equal "Chrome", browser.name
+    assert_equal "78", browser.version
+  end
+
   test "detects version by range" do
     browser = Browser.new(Browser["CHROME"])
     assert browser.chrome?(%w[>=5 <6])

data/test/unit/console_test.rb

@@ -5,11 +5,11 @@ require "test_helper"
 class ConsoleTest < Minitest::Test
   test "detects psp" do
     browser = Browser.new(Browser["PSP"])
-    assert_equal "Generic Browser", browser.name
+    assert_equal "Unknown Browser", browser.name
   end
 
   test "detects psp vita" do
     browser = Browser.new(Browser["PSP_VITA"])
-    assert_equal "Generic Browser", browser.name
+    assert_equal "Unknown Browser", browser.name
   end
 end

data/test/unit/device_test.rb

@@ -5,7 +5,7 @@ require "test_helper"
 class DeviceTest < Minitest::Test
   class CustomDevice < Browser::Device::Base
     def match?
-      ua =~ /Custom/
+      ua.include?("Custom")
     end
 
     def id
@@ -20,14 +20,14 @@ class DeviceTest < Minitest::Test
 
     Browser::Device.matchers.shift
     device = Browser::Device.new("Custom")
-    assert_equal :unknown, device.id
+    assert_equal :unknown_device, device.id
   end
 
   test "detect generic device" do
     device = Browser::Device.new("")
 
     assert device.unknown?
-    assert_equal :unknown, device.id
+    assert_equal :unknown_device, device.id
   end
 
   test "detect ipad" do
@@ -157,6 +157,16 @@ class DeviceTest < Minitest::Test
     assert_equal "Nintendo WiiU", device.name
   end
 
+  test "detect switch" do
+    device = Browser::Device.new(Browser["NINTENDO_SWITCH"])
+    assert device.nintendo_switch?
+    assert device.switch?
+    assert device.console?
+    assert device.nintendo?
+    assert_equal :switch, device.id
+    assert_equal "Nintendo Switch", device.name
+  end
+
   test "detect blackberry playbook" do
     device = Browser::Device.new(Browser["PLAYBOOK"])
     assert device.playbook?
@@ -228,4 +238,51 @@ class DeviceTest < Minitest::Test
       refute device.mobile?
     end
   end
+
+  {
+    "ANDROID_CUPCAKE" => "T-Mobile G1",
+    "ANDROID_DONUT" => "SonyEricssonX10i",
+    "ANDROID_ECLAIR_21" => "Nexus One",
+    "ANDROID_FROYO" => "HTC_DesireHD_A9191",
+    "ANDROID_GINGERBREAD" => "Sensation_4G",
+    "ANDROID_HONEYCOMB_30" => "Xoom",
+    "ANDROID_ICECREAM" => "sdk",
+    "ANDROID_JELLYBEAN_41" => "Nexus S",
+    "ANDROID_JELLYBEAN_42" => "Nexus 10",
+    "ANDROID_JELLYBEAN_43" => "Nexus 7",
+    "CUSTOM_APP" => "HTC Ruby",
+    "NOOK" => "NOOK BNTV250A"
+  }.each do |key, name|
+    test "detect 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
+    device = Browser::Device.new(Browser["SAMSUNG_SM-G975F"])
+
+    assert device.samsung?
+    assert_equal :samsung, device.id
+    assert_equal "Samsung Galaxy S10+", device.name
+  end
+
+  test "detect generic samsung devices" do
+    device = Browser::Device.new(Browser["SAMSUNG_SM-FAKE"])
+
+    assert device.samsung?
+    assert_equal :samsung, device.id
+    assert_equal "Samsung SM-0000", device.name
+  end
+
+  {
+    "SAMSUNG_SM-G975F" => "Samsung Galaxy S10+",
+    "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
+      device = Browser::Device.new(Browser[key])
+      assert_equal name, device.name
+    end
+  end
 end

data/test/unit/duck_duck_go_test.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class DuckDuckGoTest < Minitest::Test
+  test "detects DuckDuckGo on iOS device" do
+    browser = Browser.new(Browser["DUCKDUCKGO_BROWSER_IOS"])
+    assert browser.duck_duck_go?
+    refute browser.safari?
+    refute browser.chrome?
+    assert browser.webkit?
+    refute browser.bot?
+    assert_equal "DuckDuckGo", browser.name
+    assert_equal :duckduckgo, browser.id
+  end
+
+  test "detects DuckDuckGo on Android device" do
+    browser = Browser.new(Browser["DUCKDUCKGO_BROWSER_ANDROID"])
+    assert browser.duck_duck_go?
+    refute browser.safari?
+    refute browser.chrome?
+    refute browser.bot?
+    assert_equal "DuckDuckGo", browser.name
+    assert_equal :duckduckgo, browser.id
+  end
+
+  test "detects correct version" do
+    browser = Browser.new(Browser["DUCKDUCKGO_BROWSER_IOS"])
+    assert_equal "7", browser.full_version
+    assert_equal "7", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["DUCKDUCKGO_BROWSER_IOS"])
+    assert browser.duck_duck_go?(%w[>=7 <8])
+  end
+end

data/test/unit/edge_test.rb

@@ -12,7 +12,6 @@ class EdgeTest < ActionController::TestCase
     assert_equal "12", browser.version
     assert browser.platform.windows10?
     assert browser.edge?
-    assert browser.modern?
     refute browser.webkit?
     refute browser.chrome?
     refute browser.safari?
@@ -30,7 +29,6 @@ class EdgeTest < ActionController::TestCase
     assert_equal "7", browser.msie_version
     assert browser.edge?
     assert browser.compatibility_view?
-    refute browser.modern?
     refute browser.webkit?
     refute browser.chrome?
     refute browser.safari?
@@ -47,14 +45,60 @@ class EdgeTest < ActionController::TestCase
     refute browser.platform.windows10?
     assert browser.platform.windows_phone?
     assert browser.edge?
-    assert browser.modern?
+    refute browser.webkit?
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
+  test "detects Microsoft Edge based on Chrome" do
+    browser = Browser.new(Browser["MS_EDGE_CHROME"])
+
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "79.0.309.18", browser.full_version
+    assert_equal "79", browser.version
+    assert browser.platform.mac?
+    refute browser.platform.windows?
+    assert browser.edge?
+    assert browser.webkit?
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
+  test "detects Microsoft Edge Mobile on iOS" do
+    browser = Browser.new(Browser["MS_EDGE_IOS"])
+
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "44.5.0.10", browser.full_version
+    assert_equal "44", browser.version
+    refute browser.platform.windows10?
+    refute browser.platform.windows_phone?
+    assert browser.platform.ios?
+    assert browser.edge?
+    refute browser.webkit?
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
+  test "detects Microsoft Edge Mobile on Android" do
+    browser = Browser.new(Browser["MS_EDGE_ANDROID"])
+
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "44.11.2.4122", browser.full_version
+    assert_equal "44", browser.version
+    refute browser.platform.windows10?
+    refute browser.platform.windows_phone?
+    assert browser.platform.android?
+    assert browser.edge?
     refute browser.webkit?
     refute browser.chrome?
     refute browser.safari?
   end
 
   test "detects version by range" do
-    browser = Browser.new(Browser["MS_EDGE"])
-    assert browser.edge?(%w[>=12 <13])
+    browser = Browser.new(Browser["MS_EDGE_IOS"])
+    assert browser.edge?(%w[>=43 <45])
   end
 end

data/test/unit/facebook_test.rb

@@ -13,6 +13,26 @@ class FacebookTest < Minitest::Test
     assert_equal "135", browser.version
   end
 
+  test "detects new facebook on iOS" do
+    browser = Browser.new(Browser["FACEBOOK_IOS"])
+
+    assert_equal "Facebook", browser.name
+    assert browser.facebook?
+    assert :facebook, browser.id
+    assert_equal "AppleWebKit/605.1.15", browser.full_version
+    assert_equal "AppleWebKit/605", browser.version
+  end
+
+  test "detects new facebook on Android" do
+    browser = Browser.new(Browser["FACEBOOK_ANDROID"])
+
+    assert_equal "Facebook", browser.name
+    assert browser.facebook?
+    assert :facebook, browser.id
+    assert_equal "214.0.0.43.83", browser.full_version
+    assert_equal "214", browser.version
+  end
+
   test "detects version by range" do
     browser = Browser.new(Browser["FACEBOOK"])
     assert browser.facebook?(%w[>=135])

data/test/unit/firefox_test.rb

@@ -8,7 +8,6 @@ class FirefoxTest < Minitest::Test
 
     assert_equal "Firefox", browser.name
     assert browser.firefox?
-    refute browser.modern?
     assert_equal "3.8", browser.full_version
     assert_equal "3", browser.version
   end
@@ -29,7 +28,6 @@ class FirefoxTest < Minitest::Test
     assert_equal :firefox, browser.id
     assert_equal "Firefox", browser.name
     assert browser.firefox?
-    assert browser.modern?
     assert_equal "17.0", browser.full_version
     assert_equal "17", browser.version
   end
@@ -40,7 +38,6 @@ class FirefoxTest < Minitest::Test
     assert_equal :firefox, browser.id
     assert_equal "Firefox", browser.name
     assert browser.firefox?
-    assert browser.modern?
     assert browser.platform.android?
     assert_equal "14.0", browser.full_version
     assert_equal "14", browser.version

data/test/unit/google_search_app_test.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class GoogleSearchAppTest < Minitest::Test
+  test "detects Google Search App (Android)" do
+    browser = Browser.new(Browser["GOOGLE_SEARCH_APP_ANDROID"])
+
+    assert browser.webkit?
+    assert browser.google_search_app?
+    assert browser.platform.android?
+    assert_equal :google_search_app, browser.id
+    assert_equal "11", browser.version
+    assert_equal "11.6.8.21", browser.full_version
+    assert_equal "Google Search App", browser.name
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
+  test "detects Google Search App (iPad)" do
+    browser = Browser.new(Browser["GOOGLE_SEARCH_APP_IPAD"])
+
+    assert browser.webkit?
+    assert browser.google_search_app?
+    assert browser.device.ipad?
+    assert browser.platform.ios?
+    assert_equal :google_search_app, browser.id
+    assert_equal "102", browser.version
+    assert_equal "102.0.304944559", browser.full_version
+    assert_equal "Google Search App", browser.name
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
+  test "detects Google Search App (iPhone)" do
+    browser = Browser.new(Browser["GOOGLE_SEARCH_APP_IPHONE"])
+
+    assert browser.webkit?
+    assert browser.google_search_app?
+    assert browser.device.iphone?
+    assert browser.platform.ios?
+    assert_equal :google_search_app, browser.id
+    assert_equal "105", browser.version
+    assert_equal "105.0.307913796", browser.full_version
+    assert_equal "Google Search App", browser.name
+    refute browser.chrome?
+    refute browser.safari?
+  end
+
+  test "detects version by range (iPad)" do
+    browser = Browser.new(Browser["GOOGLE_SEARCH_APP_IPAD"])
+    assert browser.google_search_app?(%w[>=102 <103])
+  end
+end

data/test/unit/huawei_browser_test.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class HuaweiBrowserTest < Minitest::Test
+  test "detects Huawei Browser" do
+    browser = Browser.new(Browser["HUAWEI_BROWSER"])
+    assert browser.huawei_browser?
+    refute browser.safari?
+    refute browser.chrome?
+    assert_equal "Huawei Browser", browser.name
+    assert_equal :huawei_browser, browser.id
+  end
+
+  test "detects correct version" do
+    browser = Browser.new(Browser["HUAWEI_BROWSER"])
+    assert_equal "10.1.2.300", browser.full_version
+    assert_equal "10", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["HUAWEI_BROWSER"])
+    assert browser.huawei_browser?(%w[>=10 <11])
+  end
+end

data/test/unit/instagram_test.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class InstagramTest < Minitest::Test
+  test "detects instagram" do
+    browser = Browser.new(Browser["INSTAGRAM"])
+
+    assert_equal "Instagram", browser.name
+    assert browser.instagram?
+    assert :instagram, browser.id
+    assert_equal "41.0.0.14.90", browser.full_version
+    assert_equal "41", browser.version
+  end
+
+  test "detects alternate instagram user agent" do
+    browser = Browser.new(Browser["INSTAGRAM_OTHER"])
+
+    assert_equal "Instagram", browser.name
+    assert browser.instagram?
+    assert :instagram, browser.id
+    assert_equal "182257141", browser.full_version
+    assert_equal "182257141", browser.version
+  end
+
+  test "detects version by range" do
+    browser = Browser.new(Browser["INSTAGRAM"])
+    assert browser.instagram?(%w[>=41])
+  end
+end