browser 1.1.0 → 2.0.0.rc1

data/test/unit/blackberry_test.rb

@@ -1,106 +1,84 @@
 require "test_helper"
 
 class BlackberryTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
   test "detects blackberry" do
-    @browser.ua = $ua["BLACKBERRY"]
-
-    assert_equal "BlackBerry", @browser.name
-    assert @browser.blackberry?
-    refute @browser.tablet?
-    assert @browser.mobile?
-    refute @browser.modern?
-    assert_equal "4.1.0", @browser.full_version
-    assert_equal "4", @browser.version
+    browser = Browser.new(Browser["BLACKBERRY"])
+
+    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
 
   test "detects blackberry4" do
-    @browser.ua = $ua["BLACKBERRY4"]
-
-    assert_equal "BlackBerry", @browser.name
-    assert_equal "4", @browser.blackberry_version
-    assert @browser.blackberry?(4)
-    refute @browser.tablet?
-    assert @browser.mobile?
-    refute @browser.modern?
-    assert_equal "4.2.1", @browser.full_version
-    assert_equal "4", @browser.version
+    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
 
   test "detects blackberry5" do
-    @browser.ua = $ua["BLACKBERRY5"]
-
-    assert_equal "BlackBerry", @browser.name
-    assert @browser.blackberry?(5)
-    assert_equal "5", @browser.blackberry_version
-    refute @browser.tablet?
-    assert @browser.mobile?
-    refute @browser.modern?
-    assert_equal "5.0.0.93", @browser.full_version
-    assert_equal "5", @browser.version
+    browser = Browser.new(Browser["BLACKBERRY5"])
+
+    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
 
   test "detects blackberry6" do
-    @browser.ua = $ua["BLACKBERRY6"]
-
-    assert_equal "Safari", @browser.name
-    assert @browser.blackberry?(6)
-    assert_equal "6", @browser.blackberry_version
-    refute @browser.tablet?
-    assert @browser.mobile?
-    assert @browser.modern?
-    assert_equal "534.11", @browser.full_version
-    assert_equal "534", @browser.version
+    browser = Browser.new(Browser["BLACKBERRY6"])
+
+    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
 
   test "detects blackberry7" do
-    @browser.ua = $ua["BLACKBERRY7"]
-
-    assert_equal "Safari", @browser.name
-    assert @browser.blackberry?(7)
-    assert_equal "7", @browser.blackberry_version
-    refute @browser.tablet?
-    assert @browser.mobile?
-    assert @browser.modern?
-    assert_equal "534.11", @browser.full_version
-    assert_equal "534", @browser.version
+    browser = Browser.new(Browser["BLACKBERRY7"])
+
+    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
 
   test "detects blackberry10" do
-    @browser.ua = $ua["BLACKBERRY10"]
-
-    assert_equal "Safari", @browser.name
-    assert_equal "10", @browser.blackberry_version
-    assert @browser.blackberry?(10)
-    refute @browser.tablet?
-    assert @browser.mobile?
-    assert @browser.modern?
-    assert_equal "10.0.9.1675", @browser.full_version
-    assert_equal "10", @browser.version
+    browser = Browser.new(Browser["BLACKBERRY10"])
+
+    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
 
   test "detects blackberry playbook tablet" do
-    @browser.ua = $ua["PLAYBOOK"]
+    browser = Browser.new(Browser["PLAYBOOK"])
 
-    refute @browser.android?
-    assert @browser.tablet?
-    refute @browser.mobile?
-
-    assert_equal "7.2.1.0", @browser.full_version
-    assert_equal "7", @browser.version
-  end
+    refute browser.platform.android?
+    assert browser.device.tablet?
+    refute browser.device.mobile?
 
-  test "warn about deprecated numbered version" do
-    message = "Browser#blackberry10? is deprecated; use Browser#blackberry?(version) instead"
-    assert_deprecated(message, __FILE__, __LINE__) { @browser.blackberry10? }
+    assert_equal "7.2.1.0", browser.full_version
+    assert_equal "7", browser.version
   end
 
   test "don't detect as two different versions" do
-    @browser.ua = $ua["BLACKBERRY10"]
-    assert @browser.blackberry?(10)
-    refute @browser.blackberry?(7)
+    browser = Browser.new(Browser["BLACKBERRY10"])
+    assert browser.platform.blackberry?("~> 10.0")
+    refute browser.platform.blackberry?("~> 7.0")
   end
 end

data/test/unit/bots_test.rb

@@ -1,121 +1,89 @@
 require "test_helper"
 
 class BotsTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
-  test "detects bots" do
-    %w[
-      APPLE_BOT
-      DOMAINAREANIMATOR
-      DOT_BOT
-      FACEBOOK_BOT
-      GOOGLE_BOT
-      GRAPESHOT
-      LINKDEXBOT
-      LOAD_TIME_BOT
-      MAIL_RU
-      MEGAINDEX_RU
-      MSN_BOT
-      QUERYSEEKER
-      SCRAPY
-      SEOKICKS
-      TINEYE
-      SISTRIX
-      YANDEX_DIRECT
-      YANDEX_METRIKA
-    ].each do |key|
-      @browser.ua = $ua[key]
-      assert @browser.bot?, "#{$ua[key]} should be a bot"
+  Browser.bot_user_agents.each do |key, ua|
+    test "detect #{key} as bot" do
+      browser = Browser.new(ua)
+      assert browser.bot?
     end
-
-    @browser.ua = $ua["CHROME"]
-    refute @browser.bot?
   end
 
-  test "detects Google Page Speed as a bot" do
-    @browser.ua = $ua["GOOGLE_PAGE_SPEED_INSIGHTS"]
-    assert @browser.bot?
+  test "don't detect as bot" do
+    browser = Browser.new(Browser["CHROME"])
+    refute browser.bot?
   end
 
   test "doesn't consider empty UA as bot" do
-    @browser.ua = ""
-    refute @browser.bot?
+    browser = Browser.new("")
+    refute browser.bot?
   end
 
   test "allows setting empty string as bots" do
-    Browser::Bots.detect_empty_ua!
-    @browser.ua = ""
+    Browser::Bot.detect_empty_ua!
+    browser = Browser.new("")
 
-    assert @browser.bot?
+    assert browser.bot?
   end
 
   test "doesn't detect mozilla as a bot when considering empty UA" do
-    Browser::Bots.detect_empty_ua!
-    @browser.ua = "Mozilla"
+    Browser::Bot.detect_empty_ua!
+    browser = Browser.new("Mozilla")
 
-    refute @browser.bot?
+    refute browser.bot?
   end
 
   test "returns bot name" do
-    @browser.ua = $ua["GOOGLE_BOT"]
-    assert_equal @browser.bot_name, "Googlebot"
+    browser = Browser.new(Browser["GOOGLE_BOT"])
+    assert_equal "Google Bot", browser.bot.name
 
-    @browser.ua = $ua["FACEBOOK_BOT"]
-    assert_equal @browser.bot_name, "facebookexternalhit"
+    browser = Browser.new(Browser["FACEBOOK_BOT"])
+    assert_equal "Facebook Bot", browser.bot.name
   end
 
   test "returns bot name (empty string ua detection enabled)" do
-    Browser::Bots.detect_empty_ua!
-    @browser.ua = ""
+    Browser::Bot.detect_empty_ua!
+    browser = Browser.new("")
 
-    assert_equal @browser.bot_name, "Generic Bot"
+    assert_equal browser.bot.name, "Generic Bot"
   end
 
   test "returns nil for non-bots" do
-    @browser.ua = $ua["CHROME"]
-    assert_equal @browser.bot_name, nil
+    browser = Browser.new(Browser["CHROME"])
+    assert_nil browser.bot.name
   end
 
-  test "detects as search engines" do
-    %w[
-      ASK
-      BAIDU
-      BINGBOT
-      DUCKDUCKGO
-      GOOGLE_BOT
-      YAHOO_SLURP
-    ].each do |key|
-      @browser.ua = $ua[key]
-      assert @browser.search_engine?, "#{$ua[key]} should be a search engine"
+  Browser.search_engine_user_agents.each do |key, ua|
+    test "detects #{key} as search engine" do
+      browser = Browser.new(ua)
+      assert browser.bot.search_engine?
     end
   end
 
-  test "detects Google Structured Data Testing Tool as a bot" do
-    @browser.ua = $ua["GOOGLE_STRUCTURED_DATA_TESTING_TOOL"]
-
-    assert @browser.bot?, "Google Structured Data Testing Tool should be a bot"
+  test "detects Daumoa" do
+    browser = Browser.new(Browser["DAUMOA"])
+
+    assert_equal :ie, browser.id
+    assert_equal "Internet Explorer", browser.name
+    assert_equal "0.0", browser.msie_full_version
+    assert_equal "0", browser.msie_version
+    assert_equal "0.0", browser.full_version
+    assert_equal "0", browser.version
+    assert browser.ie?
+    assert browser.bot?
+    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?
+    refute browser.safari?
   end
 
-  test "detects Daumoa" do
-    @browser.ua = $ua["DAUMOA"]
-
-    assert_equal :ie, @browser.id
-    assert_equal "Internet Explorer", @browser.name
-    assert_equal "0.0", @browser.msie_full_version
-    assert_equal "0", @browser.msie_version
-    assert_equal "0.0", @browser.full_version
-    assert_equal "0", @browser.version
-    assert @browser.ie?
-    assert @browser.bot?
-    refute @browser.windows10?
-    refute @browser.windows_phone?
-    refute @browser.edge?
-    refute @browser.modern?
-    refute @browser.mobile?
-    refute @browser.webkit?
-    refute @browser.chrome?
-    refute @browser.safari?
+  test "custom android user agent (#144)" do
+    browser = Browser.new(Browser["CUSTOM_APP"])
+
+    assert browser.platform.android?
+    refute browser.bot?
   end
 end

data/test/unit/chrome_test.rb

@@ -1,60 +1,66 @@
 require "test_helper"
 
 class ChromeTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
   test "detects chrome" do
-    @browser.ua = $ua["CHROME"]
-
-    assert_equal "Chrome", @browser.name
-    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
+    browser = Browser.new(Browser["CHROME"])
+
+    assert_equal "Chrome", browser.name
+    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
 
   test "detects mobile chrome" do
-    @browser.ua = $ua["MOBILE_CHROME"]
-
-    assert_equal "Chrome", @browser.name
-    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
+    browser = Browser.new(Browser["MOBILE_CHROME"])
+
+    assert_equal "Chrome", browser.name
+    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
 
   test "detects samsung chrome" do
-    @browser.ua = $ua["SAMSUNG_CHROME"]
-
-    assert_equal "Chrome", @browser.name
-    assert @browser.chrome?
-    assert @browser.android?
-    refute @browser.safari?
-    assert @browser.webkit?
-    assert @browser.modern?
-    assert_equal "28.0.1500.94", @browser.full_version
-    assert_equal "28", @browser.version
+    browser = Browser.new(Browser["SAMSUNG_CHROME"])
+
+    assert_equal "Chrome", browser.name
+    assert browser.chrome?
+    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
 
   test "detects chrome os" do
-    @browser.ua = $ua["CHROME_OS"]
-    assert @browser.chrome_os?
+    browser = Browser.new(Browser["CHROME_OS"])
+    assert browser.platform.chrome_os?
   end
 
   test "detects yandex browser" do
-    @browser.ua = $ua["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
+    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 chrome frame" do
+    browser = Browser.new(Browser["IE9_CHROME_FRAME"])
+
+    assert browser.chrome?
+    refute browser.safari?
+    assert browser.webkit?
+    assert_equal "26.0.1410.43", browser.full_version
+    assert_equal "26", browser.version
   end
 end

data/test/unit/console_test.rb

@@ -1,71 +1,13 @@
 require "test_helper"
 
 class ConsoleTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
-  test "detects nintendo wii" do
-    @browser.ua = $ua["NINTENDO_WII"]
-
-    assert @browser.console?
-    assert @browser.nintendo?
-  end
-
-  test "detects nintendo wii u" do
-    @browser.ua = $ua["NINTENDO_WIIU"]
-
-    assert @browser.console?
-    assert @browser.nintendo?
-  end
-
-  test "detects playstation 3" do
-    @browser.ua = $ua["PLAYSTATION3"]
-
-    assert @browser.console?
-    assert @browser.playstation?
-    refute @browser.playstation4?
-  end
-
-  test "detects playstation 4" do
-    @browser.ua = $ua["PLAYSTATION4"]
-
-    assert @browser.console?
-    assert @browser.playstation?
-    assert @browser.playstation4?
-  end
-
-  test "detects xbox 360" do
-    @browser.ua = $ua["XBOX360"]
-
-    assert @browser.console?
-    assert @browser.xbox?
-    refute @browser.xbox_one?
-  end
-
-  test "detects xbox one" do
-    @browser.ua = $ua["XBOXONE"]
-
-    assert @browser.console?
-    assert @browser.xbox?
-    assert @browser.xbox_one?
-  end
-
   test "detects psp" do
-    @browser.ua = $ua["PSP"]
-
-    assert_equal "PlayStation Portable", @browser.name
-    assert @browser.psp?
-    refute @browser.psp_vita?
-    assert @browser.mobile?
+    browser = Browser.new(Browser["PSP"])
+    assert_equal "Generic Browser", browser.name
   end
 
   test "detects psp vita" do
-    @browser.ua = $ua["PSP_VITA"]
-
-    assert_equal "PlayStation Portable", @browser.name
-    assert @browser.psp?
-    assert @browser.psp_vita?
-    assert @browser.mobile?
+    browser = Browser.new(Browser["PSP_VITA"])
+    assert_equal "Generic Browser", browser.name
   end
 end