browser 1.1.0 → 2.0.0.rc1

data/test/unit/device_test.rb

@@ -0,0 +1,193 @@
+require "test_helper"
+
+class DeviceTest < Minitest::Test
+  test "detect generic device" do
+    device = Browser::Device.new("")
+
+    assert device.unknown?
+    assert_equal :unknown, device.id
+  end
+
+  test "detect ipad" do
+    device = Browser::Device.new(Browser["IOS9"])
+    assert device.ipad?
+    assert_equal :ipad, device.id
+    assert_equal "iPad", device.name
+  end
+
+  test "detect ipod" do
+    device = Browser::Device.new(Browser["IPOD"])
+    assert device.ipod_touch?
+    assert device.ipod?
+    assert_equal :ipod_touch, device.id
+    assert_equal "iPod Touch", device.name
+  end
+
+  test "detect 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
+    device = Browser::Device.new(Browser["PLAYSTATION3"])
+    assert device.ps3?
+    assert device.playstation3?
+    assert device.playstation?
+    assert_equal :ps3, device.id
+    assert_equal "PlayStation 3", device.name
+  end
+
+  test "detect ps4" do
+    device = Browser::Device.new(Browser["PLAYSTATION4"])
+    assert device.ps4?
+    assert device.playstation4?
+    assert device.playstation?
+    assert_equal :ps4, device.id
+    assert_equal "PlayStation 4", device.name
+  end
+
+  test "detects xbox 360" do
+    device = Browser::Device.new(Browser["XBOX360"])
+
+    assert device.console?
+    assert device.xbox?
+    refute device.xbox_one?
+    assert_equal :xbox_360, device.id
+    assert_equal "Xbox 360", device.name
+  end
+
+  test "detects xbox one" do
+    device = Browser::Device.new(Browser["XBOXONE"])
+
+    assert device.console?
+    assert device.xbox?
+    assert device.xbox_one?
+    assert_equal :xbox_one, device.id
+    assert_equal "Xbox One", device.name
+  end
+
+  test "detect 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
+    device = Browser::Device.new(Browser["PSP_VITA"])
+    assert device.playstation_vita?
+    assert device.vita?
+    assert_equal :psvita, device.id
+    assert_equal "PlayStation Vita", device.name
+  end
+
+  test "detect kindle" do
+    device = Browser::Device.new(Browser["KINDLE"])
+    assert device.kindle?
+    assert_equal :kindle, device.id
+    assert_equal "Kindle", device.name
+    refute device.silk?
+  end
+
+  %w[
+    KINDLE_FIRE
+    KINDLE_FIRE_HD
+    KINDLE_FIRE_HD_MOBILE
+  ].each do |key|
+    test "detect #{key} as kindle fire" do
+      device = Browser::Device.new(Browser[key])
+
+      assert device.kindle?
+      assert device.kindle_fire?
+      assert_equal :kindle_fire, device.id
+      assert_equal "Kindle Fire", device.name
+    end
+  end
+
+  test "detect wii" do
+    device = Browser::Device.new(Browser["NINTENDO_WII"])
+    assert device.nintendo_wii?
+    assert device.console?
+    assert device.nintendo?
+    assert device.wii?
+    assert_equal :wii, device.id
+    assert_equal "Nintendo Wii", device.name
+  end
+
+  test "detect wiiu" do
+    device = Browser::Device.new(Browser["NINTENDO_WIIU"])
+    assert device.nintendo_wiiu?
+    assert device.wiiu?
+    assert device.console?
+    assert device.nintendo?
+    assert_equal :wiiu, device.id
+    assert_equal "Nintendo WiiU", device.name
+  end
+
+  test "detect blackberry playbook" do
+    device = Browser::Device.new(Browser["PLAYBOOK"])
+    assert device.playbook?
+    assert device.blackberry_playbook?
+    assert_equal :playbook, device.id
+    assert_equal "BlackBerry Playbook", device.name
+  end
+
+  test "detect 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
+    device = Browser::Device.new(Browser["SMART_TV"])
+    assert device.tv?
+    assert_equal :tv, device.id
+    assert_equal "TV", device.name
+  end
+
+  %w[
+    ANDROID
+    SYMBIAN
+    MIDP
+    IPHONE
+    IPOD
+    WINDOWS_MOBILE
+    WINDOWS_PHONE
+    WINDOWS_PHONE8
+    WINDOWS_PHONE_81
+    OPERA_MINI
+    LUMIA800
+    MS_EDGE_MOBILE
+    UC_BROWSER
+    NOKIA
+    OPERA_MOBI
+    KINDLE_FIRE_HD_MOBILE
+  ].each do |key|
+    test "detect #{key} as mobile" do
+      device = Browser::Device.new(Browser[key])
+      assert device.mobile?
+      refute device.tablet?
+    end
+  end
+
+  %w[
+    PLAYBOOK
+    IPAD
+    NEXUS_TABLET
+    SURFACE
+    XOOM
+    NOOK
+    SAMSUNG
+    FIREFOX_TABLET
+    NEXUS7
+  ].each do |key|
+    test "detect #{key} as tablet" do
+      device = Browser::Device.new(Browser[key])
+      assert device.tablet?
+      refute device.mobile?
+    end
+  end
+end

data/test/unit/firefox_test.rb

@@ -1,41 +1,46 @@
 require "test_helper"
 
 class FirefoxTest < Minitest::Test
-  setup do
-    @browser = Browser.new
+  test "detects firefox" do
+    browser = Browser.new(Browser["FIREFOX"])
+
+    assert_equal "Firefox", browser.name
+    assert browser.firefox?
+    refute browser.modern?
+    assert_equal "3.8", browser.full_version
+    assert_equal "3", browser.version
   end
 
-  test "detects firefox" do
-    @browser.ua = $ua["FIREFOX"]
+  test "detects firefox for iOS" do
+    browser = Browser.new(Browser["FIREFOX_IOS"])
 
-    assert_equal "Firefox", @browser.name
-    assert @browser.firefox?
-    refute @browser.modern?
-    assert_equal "3.8", @browser.full_version
-    assert_equal "3", @browser.version
+    assert_equal "Firefox", browser.name
+    assert browser.firefox?
+    assert browser.platform.ios?
+    assert_equal "1.2", browser.full_version
+    assert_equal "1", browser.version
   end
 
   test "detects modern firefox" do
-    @browser.ua = $ua["FIREFOX_MODERN"]
-
-    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
+    browser = Browser.new(Browser["FIREFOX_MODERN"])
+
+    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
 
   test "detects firefox android tablet" do
-    @browser.ua = $ua["FIREFOX_TABLET"]
-
-    assert_equal :firefox, @browser.id
-    assert_equal "Firefox", @browser.name
-    assert @browser.firefox?
-    assert @browser.modern?
-    assert @browser.tablet?
-    assert @browser.android?
-    assert_equal "14.0", @browser.full_version
-    assert_equal "14", @browser.version
+    browser = Browser.new(Browser["FIREFOX_TABLET"])
+
+    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
   end
 end

data/test/unit/ie_test.rb

@@ -1,340 +1,325 @@
 require "test_helper"
 
 class IeTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
   test "detects ie6" do
-    @browser.ua = $ua["IE6"]
+    browser = Browser.new(Browser["IE6"])
 
-    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
+    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
 
   test "detects ie7" do
-    @browser.ua = $ua["IE7"]
+    browser = Browser.new(Browser["IE7"])
 
-    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
+    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
 
   test "detects ie8" do
-    @browser.ua = $ua["IE8"]
+    browser = Browser.new(Browser["IE8"])
 
-    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
+    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
   end
 
   test "detects ie8 in compatibility view" do
-    @browser.ua = $ua["IE8_COMPAT"]
+    browser = Browser.new(Browser["IE8_COMPAT"])
 
-    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
-    assert_equal "7.0", @browser.msie_full_version
-    assert_equal "7", @browser.msie_version
+    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
+    assert_equal "7.0", browser.msie_full_version
+    assert_equal "7", browser.msie_version
   end
 
   test "detects ie9" do
-    @browser.ua = $ua["IE9"]
+    browser = Browser.new(Browser["IE9"])
 
-    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
+    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
   end
 
   test "detects ie9 in compatibility view" do
-    @browser.ua = $ua["IE9_COMPAT"]
+    browser = Browser.new(Browser["IE9_COMPAT"])
 
-    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
-    assert_equal "7.0", @browser.msie_full_version
-    assert_equal "7", @browser.msie_version
+    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
+    assert_equal "7.0", browser.msie_full_version
+    assert_equal "7", browser.msie_version
   end
 
   test "detects ie10" do
-    @browser.ua = $ua["IE10"]
+    browser = Browser.new(Browser["IE10"])
 
-    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
+    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
   end
 
   test "detects ie10 in compatibility view" do
-    @browser.ua = $ua["IE10_COMPAT"]
+    browser = Browser.new(Browser["IE10_COMPAT"])
 
-    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
-    assert_equal "7.0", @browser.msie_full_version
-    assert_equal "7", @browser.msie_version
+    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
+    assert_equal "7.0", browser.msie_full_version
+    assert_equal "7", browser.msie_version
   end
 
   test "detects ie11" do
-    @browser.ua = $ua["IE11"]
+    browser = Browser.new(Browser["IE11"])
 
-    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
+    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
   end
 
   test "detects ie11 in compatibility view" do
-    @browser.ua = $ua["IE11_COMPAT"]
+    browser = Browser.new(Browser["IE11_COMPAT"])
 
-    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
-    assert_equal "7.0", @browser.msie_full_version
-    assert_equal "7", @browser.msie_version
+    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
+    assert_equal "7.0", browser.msie_full_version
+    assert_equal "7", browser.msie_version
   end
 
   test "detects Lumia 800" do
-    @browser.ua = $ua["LUMIA800"]
+    browser = Browser.new(Browser["LUMIA800"])
 
-    assert_equal "Internet Explorer", @browser.name
-    assert @browser.ie?
-    assert @browser.ie?(9)
-    assert_equal "9.0", @browser.full_version
-    assert_equal "9", @browser.version
-    refute @browser.tablet?
-    assert @browser.mobile?
+    assert_equal "Internet Explorer", browser.name
+    assert browser.ie?
+    assert browser.ie?(9)
+    assert_equal "9.0", browser.full_version
+    assert_equal "9", browser.version
   end
 
   test "detects ie11 touch desktop pc" do
-    @browser.ua = $ua["IE11_TOUCH_SCREEN"]
+    browser = Browser.new(Browser["IE11_TOUCH_SCREEN"])
 
-    assert_equal "Internet Explorer", @browser.name
-    assert @browser.ie?
-    assert @browser.ie?(11)
-    assert @browser.modern?
-    refute @browser.compatibility_view?
-    refute @browser.windows_rt?
-    assert @browser.windows_touchscreen_desktop?
-    assert @browser.windows8?
-    assert_equal "11.0", @browser.full_version
-    assert_equal "11", @browser.version
+    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?
+    assert browser.platform.windows8?
+    assert_equal "11.0", browser.full_version
+    assert_equal "11", browser.version
   end
 
   test "detects Microsoft Edge" do
-    @browser.ua = $ua["MS_EDGE"]
+    browser = Browser.new(Browser["MS_EDGE"])
 
-    assert_equal :edge, @browser.id
-    assert_equal "Microsoft Edge", @browser.name
-    assert_equal "12.0", @browser.full_version
-    assert_equal "12", @browser.version
-    assert @browser.windows10?
-    assert @browser.edge?
-    assert @browser.modern?
-    refute @browser.webkit?
-    refute @browser.chrome?
-    refute @browser.safari?
-    refute @browser.mobile?
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "12.0", browser.full_version
+    assert_equal "12", browser.version
+    assert browser.platform.windows10?
+    assert browser.edge?
+    assert browser.modern?
+    refute browser.webkit?
+    refute browser.chrome?
+    refute browser.safari?
+    refute browser.device.mobile?
   end
 
   test "detects Microsoft Edge in compatibility view" do
-    @browser.ua = $ua["MS_EDGE_COMPAT"]
-
-    assert_equal :edge, @browser.id
-    assert_equal "Microsoft Edge", @browser.name
-    assert_equal "12.0", @browser.full_version
-    assert_equal "12", @browser.version
-    assert_equal "7.0", @browser.msie_full_version
-    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?
-    refute @browser.mobile?
+    browser = Browser.new(Browser["MS_EDGE_COMPAT"])
+
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "12.0", browser.full_version
+    assert_equal "12", browser.version
+    assert_equal "7.0", browser.msie_full_version
+    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?
+    refute browser.device.mobile?
   end
 
   test "detects Microsoft Edge Mobile" do
-    @browser.ua = $ua["MS_EDGE_MOBILE"]
-
-    assert_equal :edge, @browser.id
-    assert_equal "Microsoft Edge", @browser.name
-    assert_equal "12.0", @browser.full_version
-    assert_equal "12", @browser.version
-    refute @browser.windows10?
-    assert @browser.windows_phone?
-    assert @browser.edge?
-    assert @browser.modern?
-    assert @browser.mobile?
-    refute @browser.webkit?
-    refute @browser.chrome?
-    refute @browser.safari?
+    browser = Browser.new(Browser["MS_EDGE_MOBILE"])
+
+    assert_equal :edge, browser.id
+    assert_equal "Microsoft Edge", browser.name
+    assert_equal "12.0", browser.full_version
+    assert_equal "12", browser.version
+    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 IE without Trident" do
-    @browser.ua = $ua["IE_WITHOUT_TRIDENT"]
-
-    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
-    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?
+    browser = Browser.new(Browser["IE_WITHOUT_TRIDENT"])
+
+    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
+    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 windows phone" do
-    @browser.ua = $ua["WINDOWS_PHONE"]
+    browser = Browser.new(Browser["WINDOWS_PHONE"])
 
-    assert @browser.ie?
-    assert_equal "7", @browser.version
-    assert @browser.mobile?
-    assert @browser.windows_phone?
-    refute @browser.windows_mobile?
-    refute @browser.tablet?
+    assert browser.ie?
+    assert_equal "7", browser.version
+    assert browser.platform.windows_phone?
+    refute browser.platform.windows_mobile?
   end
 
   test "detects windows phone 8" do
-    @browser.ua = $ua["WINDOWS_PHONE8"]
+    browser = Browser.new(Browser["WINDOWS_PHONE8"])
 
-    assert @browser.ie?
-    assert_equal "10", @browser.version
-    assert @browser.mobile?
-    assert @browser.windows_phone?
-    refute @browser.windows_mobile?
-    refute @browser.tablet?
+    assert browser.ie?
+    assert_equal "10", browser.version
+    assert browser.platform.windows_phone?
+    refute browser.platform.windows_mobile?
   end
 
   test "detects windows phone 8.1" do
-    @browser.ua = $ua["WINDOWS_PHONE_81"]
+    browser = Browser.new(Browser["WINDOWS_PHONE_81"])
 
-    assert @browser.ie?
-    assert_equal "Internet Explorer", @browser.name
-    assert_equal :ie, @browser.id
-    assert_equal "11", @browser.version
-    assert_equal "11.0", @browser.full_version
-    assert @browser.mobile?
-    assert @browser.windows_phone?
-    refute @browser.windows_mobile?
-    refute @browser.tablet?
+    assert browser.ie?
+    assert_equal "Internet Explorer", browser.name
+    assert_equal :ie, browser.id
+    assert_equal "11", browser.version
+    assert_equal "11.0", browser.full_version
+    assert browser.platform.windows_phone?
+    refute browser.platform.windows_mobile?
   end
 
   test "detects windows mobile (windows phone 8)" do
-    @browser.ua = $ua["WINDOWS_PHONE8"]
+    browser = Browser.new(Browser["WINDOWS_PHONE8"])
 
-    assert @browser.ie?
-    assert_equal "10", @browser.version
-    assert @browser.mobile?
-    assert @browser.windows_phone?
-    refute @browser.windows_mobile?
-    refute @browser.tablet?
+    assert browser.ie?
+    assert_equal "10", browser.version
+    assert browser.platform.windows_phone?
+    refute browser.platform.windows_mobile?
   end
 
   test "detects windows x64" do
-    @browser.ua = $ua["IE10_X64_WINX64"]
-    assert @browser.windows_x64?
-    refute @browser.windows_wow64?
-    assert @browser.windows_x64_inclusive?
+    browser = Browser.new(Browser["IE10_X64_WINX64"])
+    assert browser.platform.windows_x64?
+    refute browser.platform.windows_wow64?
+    assert browser.platform.windows_x64_inclusive?
   end
 
   test "detects windows wow64" do
-    @browser.ua = $ua["WINDOWS_WOW64"]
-    refute @browser.windows_x64?
-    assert @browser.windows_wow64?
-    assert @browser.windows_x64_inclusive?
+    browser = Browser.new(Browser["WINDOWS_WOW64"])
+    refute browser.platform.windows_x64?
+    assert browser.platform.windows_wow64?
+    assert browser.platform.windows_x64_inclusive?
   end
 
   test "detects windows platform" do
-    @browser.ua = "Windows"
-    assert_equal :windows, @browser.platform
-    assert @browser.windows?
+    browser = Browser.new("Windows")
+    assert_equal :windows, browser.platform.id
+    assert browser.platform.windows?
   end
 
   test "detects windows_xp" do
-    @browser.ua = $ua["WINDOWS_XP"]
+    browser = Browser.new(Browser["WINDOWS_XP"])
 
-    assert @browser.windows?
-    assert @browser.windows_xp?
+    assert browser.platform.windows?
+    assert browser.platform.windows_xp?
   end
 
   test "detects windows_vista" do
-    @browser.ua = $ua["WINDOWS_VISTA"]
+    browser = Browser.new(Browser["WINDOWS_VISTA"])
 
-    assert @browser.windows?
-    assert @browser.windows_vista?
+    assert browser.platform.windows?
+    assert browser.platform.windows_vista?
   end
 
   test "detects windows7" do
-    @browser.ua = $ua["WINDOWS7"]
+    browser = Browser.new(Browser["WINDOWS7"])
 
-    assert @browser.windows?
-    assert @browser.windows7?
+    assert browser.platform.windows?
+    assert browser.platform.windows7?
   end
 
   test "detects windows8" do
-    @browser.ua = $ua["WINDOWS8"]
+    browser = Browser.new(Browser["WINDOWS8"])
 
-    assert @browser.windows?
-    assert @browser.windows8?
-    refute @browser.windows8_1?
+    assert browser.platform.windows?
+    assert browser.platform.windows8?
+    refute browser.platform.windows8_1?
   end
 
   test "detects windows8.1" do
-    @browser.ua = $ua["WINDOWS81"]
+    browser = Browser.new(Browser["WINDOWS81"])
 
-    assert @browser.windows?
-    assert @browser.windows8?
-    assert @browser.windows8_1?
+    assert browser.platform.windows?
+    assert browser.platform.windows8?
+    assert browser.platform.windows8_1?
   end
 
   test "returns string representation for ie6" do
-    @browser.ua = $ua["IE6"]
-    meta = @browser.meta
+    browser = Browser.new(Browser["IE6"])
+    meta = browser.meta
 
     assert meta.include?("ie")
     assert meta.include?("ie6")
@@ -345,8 +330,8 @@ class IeTest < Minitest::Test
   end
 
   test "returns string representation for ie7" do
-    @browser.ua = $ua["IE7"]
-    meta = @browser.meta
+    browser = Browser.new(Browser["IE7"])
+    meta = browser.meta
 
     assert meta.include?("ie")
     assert meta.include?("ie7")
@@ -357,8 +342,8 @@ class IeTest < Minitest::Test
   end
 
   test "returns string representation for ie8" do
-    @browser.ua = $ua["IE8"]
-    meta = @browser.meta
+    browser = Browser.new(Browser["IE8"])
+    meta = browser.meta
 
     assert meta.include?("ie")
     assert meta.include?("ie8")
@@ -366,14 +351,14 @@ class IeTest < Minitest::Test
     assert meta.include?("windows")
   end
 
-  test "warn about deprecated numbered version" do
-    message = "Browser#ie6? is deprecated; use Browser#ie?(version) instead"
-    assert_deprecated(message, __FILE__, __LINE__) { @browser.ie6? }
+  test "don't detect as two different versions" do
+    browser = Browser.new(Browser["IE8"])
+    assert browser.ie?(8)
+    refute browser.ie?(7)
   end
 
-  test "don't detect as two different versions" do
-    @browser.ua = $ua["IE8"]
-    assert @browser.ie?(8)
-    refute @browser.ie?(7)
+  test "more complex versioning check" do
+    browser = Browser.new(Browser["IE8"])
+    assert browser.ie?(["> 7", "< 9"])
   end
 end