test/unit/android_test.rb in browser-1.1.0 vs test/unit/android_test.rb in browser-2.0.0.rc1

@@ -1,97 +1,92 @@
 require "test_helper"
 
 class AndroidTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
   test "detect android cupcake (1.5)" do
-    @browser.ua = $ua['ANDROID_CUPCAKE']
-    assert @browser.android?
-    assert @browser.android?(1.5)
+    browser = Browser.new(Browser["ANDROID_CUPCAKE"])
+    assert browser.platform.android?
+    assert browser.platform.android?(1.5)
   end
 
   test "detect android donut (1.6)" do
-    @browser.ua = $ua['ANDROID_DONUT']
-    assert @browser.android?
-    assert @browser.android?(1.6)
+    browser = Browser.new(Browser["ANDROID_DONUT"])
+    assert browser.platform.android?
+    assert browser.platform.android?(1.6)
   end
 
   test "detect android eclair (2.1)" do
-    @browser.ua = $ua['ANDROID_ECLAIR_21']
-    assert @browser.android?
-    assert @browser.android?(2.1)
+    browser = Browser.new(Browser["ANDROID_ECLAIR_21"])
+    assert browser.platform.android?
+    assert browser.platform.android?(2.1)
   end
 
   test "detect android froyo (2.2)" do
-    @browser.ua = $ua['ANDROID_FROYO']
-    assert @browser.android?
-    assert @browser.android?(2.2)
+    browser = Browser.new(Browser["ANDROID_FROYO"])
+    assert browser.platform.android?
+    assert browser.platform.android?(2.2)
   end
 
   test "detect android gingerbread (2.3)" do
-    @browser.ua = $ua['ANDROID_GINGERBREAD']
-    assert @browser.android?
-    assert @browser.android?(2.3)
+    browser = Browser.new(Browser["ANDROID_GINGERBREAD"])
+    assert browser.platform.android?
+    assert browser.platform.android?("~> 2.3.0")
   end
 
   test "detect android honeycomb (3.0)" do
-    @browser.ua = $ua['ANDROID_HONEYCOMB_30']
-    assert @browser.android?
-    assert @browser.android?(3.0)
+    browser = Browser.new(Browser["ANDROID_HONEYCOMB_30"])
+    assert browser.platform.android?
+    assert browser.platform.android?("~> 3.0")
   end
 
   test "detect android ice cream sandwich (4.0)" do
-    @browser.ua = $ua['ANDROID_ICECREAM']
-    assert @browser.android?
-    assert @browser.android?(4.0)
+    browser = Browser.new(Browser["ANDROID_ICECREAM"])
+    assert browser.platform.android?
+    assert browser.platform.android?("~> 4.0")
   end
 
   test "detect android jellybean (4.1)" do
-    @browser.ua = $ua['ANDROID_JELLYBEAN_41']
-    assert @browser.android?
-    assert @browser.android?(4.1)
+    browser = Browser.new(Browser["ANDROID_JELLYBEAN_41"])
+    assert browser.platform.android?
+    assert browser.platform.android?("~> 4.1")
   end
 
   test "detect android jellybean (4.2)" do
-    @browser.ua = $ua['ANDROID_JELLYBEAN_42']
-    assert @browser.android?
-    assert @browser.android?(4.2)
+    browser = Browser.new(Browser["ANDROID_JELLYBEAN_42"])
+    assert browser.platform.android?
+    assert browser.platform.android?(4.2)
   end
 
   test "detect android jellybean (4.3)" do
-    @browser.ua = $ua['ANDROID_JELLYBEAN_43']
-    assert @browser.android?
-    assert @browser.android?(4.3)
+    browser = Browser.new(Browser["ANDROID_JELLYBEAN_43"])
+    assert browser.platform.android?
+    assert browser.platform.android?(4.3)
   end
 
   test "detect android kitkat (4.4)" do
-    @browser.ua = $ua['ANDROID_KITKAT']
-    assert @browser.android?
-    assert @browser.android?(4.4)
+    browser = Browser.new(Browser["ANDROID_KITKAT"])
+    assert browser.platform.android?
+    assert browser.platform.android?(4.4)
   end
 
   test "detect android lollipop (5.0)" do
-    @browser.ua = $ua['ANDROID_LOLLIPOP_50']
-    assert @browser.android?
-    assert @browser.android?(5.0)
+    browser = Browser.new(Browser["ANDROID_LOLLIPOP_50"])
+    assert browser.platform.android?
+    assert browser.platform.android?(5.0)
   end
 
   test "detect android lollipop (5.1)" do
-    @browser.ua = $ua['ANDROID_LOLLIPOP_51']
-    assert @browser.android?
-    assert @browser.android?(5.1)
+    browser = Browser.new(Browser["ANDROID_LOLLIPOP_51"])
+    assert browser.platform.android?
+    assert browser.platform.android?(5.1)
   end
 
   test "detect android tv" do
-    @browser.ua = $ua['ANDROID_TV']
-    assert @browser.android?
-    assert @browser.tv?
+    browser = Browser.new(Browser["ANDROID_TV"])
+    assert browser.platform.android?
+    assert browser.device.tv?
   end
 
   test "detect nexus player" do
-    @browser.ua = $ua['ANDROID_NEXUS_PLAYER']
-    assert @browser.android?
-    assert @browser.tv?
+    browser = Browser.new(Browser["ANDROID_NEXUS_PLAYER"])
+    assert browser.platform.android?
   end
 end