Update tests to work with new spec gem

Author: bootstraponline

android_tests/Gemfile

@@ -1,4 +1 @@
-source 'https://rubygems.org'
-gem 'test_runner', '>= 0.9.37'
-gem 'fakefs', '~> 0.5.0'
-gem 'rake', '~> 10.2.2'
+eval File.read('../Gemfile')

android_tests/lib/android/specs/android/element/textfield.rb

@@ -9,18 +9,20 @@ def right
     'Right is always right'
   end
 
-  before_first do
+  def before_first
     # nav to activity
     text('app').click
     text('activity').click
     text('custom title').click
   end
 
-  after_last do
+  def after_last
     # back to start
     3.times { back }
   end
 
+  t { before_first }
+
   t 'textfields' do
     exp = [left, right]
     textfields.must_equal exp
@@ -50,4 +52,6 @@ def right
     res = textfield_exact left
     res.text.must_equal left
   end
+
+  t { after_last }
 end

android_tests/lib/android/specs/common/element/button.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 
 describe 'common/element/button' do
-  before_first do
+  def before_first
     # nav to buttons activity
     text('App').click
     text('Activity').click
     text('Animation').click
   end
 
-  after_last do
+  def after_last
     # nav back to home activity
     3.times { back }
   end
@@ -17,6 +17,8 @@ def fade_in
     'Fade in'
   end
 
+  t { before_first }
+
   t 'button' do
     # by index
     button(1).name.must_equal fade_in
@@ -54,4 +56,6 @@ def fade_in
     # select the second button containing 'in'
     button_num('in', 2).name.must_equal 'Zoom in'
   end
+
+  t { after_last }
 end

android_tests/lib/run.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 require 'rubygems'
-require 'test_runner'
 require 'spec'
 require 'fakefs/safe'
+require_relative '../../lib/appium_lib'
+
 =begin
 node server.js -V --fast-reset --without-delay
 

android_tests/selendroid/appium.txt

@@ -30,8 +30,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'toml', '~> 0.0', '>= 0.0.4'
   s.add_runtime_dependency 'posix-spawn', '~> 0.3', '>= 0.3.8'
 
+  s.add_development_dependency 'hashdiff', '~> 0.2.0'
+  s.add_development_dependency 'spec', '~> 5.3.4'
+  s.add_development_dependency 'fakefs', '~> 0.5.0'
+
   s.add_development_dependency 'rake', '~> 10.2', '>= 10.2.2'
   s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7.3'
 
   s.files = `git ls-files`.split "\n"
-end
+end

appium_lib.gemspec

@@ -1,4 +1 @@
-source 'https://rubygems.org'
-gem 'test_runner', '>= 0.9.37'
-gem 'rake', '~> 10.2.2'
-gem 'selenium-webdriver', '>= 2.41.0'
+eval File.read('../Gemfile')

ios_tests/Gemfile

@@ -1,75 +1,79 @@
 describe 'common/device' do
-  before_first { screen.must_equal catalog }
-
-    t 'lock' do
-      lock 5
-      tag('button').name.must_equal 'SlideToUnlock'
-
-      # It appears that lockForDuration doesn't.
-      closeApp
-      launch
-    end
-
-    t 'background_app' do
-      background_app 5
-      screen.must_equal catalog
-    end
-
-    t 'is_installed' do
-      installed = is_installed? "Derrp"
-      installed.must_equal false
-    end
-
-    t 'shake' do
-      shake
-    end
-
-    t 'close and launch' do
-      closeApp
-      launch
-      tag('navigationBar').name.must_equal 'UICatalog'
-    end
-
-    t 'reset' do
-      reset
-    end
-
-    t 'available_contexts' do
-      available_contexts.must_equal ["NATIVE_APP"]
-    end
-
-    t 'current_context' do
-      current_context.must_equal nil
-    end
-
-    t 'switch_to_default_context' do
-      switch_to_default_context
-      current_context.must_equal nil
-    end
-
-    t 'app_strings' do
-      app_strings.must_include "SearchBarExplain"
-    end
-
-    t 'action_chain' do
-      ac = Appium::TouchAction.new
-      e = find_element(:name, 'Buttons, Various uses of UIButton')
-      ac.press element: e, x: 10, y: 10
-      ac.perform
-      back
-    end
-
-   t 'swipe' do
-      swipe start_x: 75, start_y: 500, end_x: 75, end_y: 0, duration: 0.8
-    end
-
-    t 'pinch & zoom' do
-      s_text('Images, Use of UIImageView').click
-      zoom 200
-      pinch 75
-    end
-
-   t 'file movement' do
+  def before_first
+    screen.must_equal catalog
+  end
+
+  t { before_first }
+
+  t 'lock' do
+    lock 5
+    tag('button').name.must_equal 'SlideToUnlock'
+
+    # It appears that lockForDuration doesn't.
+    closeApp
+    launch
+  end
+
+  t 'background_app' do
+    background_app 5
+    screen.must_equal catalog
+  end
+
+  t 'is_installed' do
+    installed = is_installed? "Derrp"
+    installed.must_equal false
+  end
+
+  t 'shake' do
+    shake
+  end
+
+  t 'close and launch' do
+    closeApp
+    launch
+    tag('navigationBar').name.must_equal 'UICatalog'
+  end
+
+  t 'reset' do
+    reset
+  end
+
+  t 'available_contexts' do
+    available_contexts.must_equal ["NATIVE_APP"]
+  end
+
+  t 'current_context' do
+    current_context.must_equal nil
+  end
+
+  t 'switch_to_default_context' do
+    switch_to_default_context
+    current_context.must_equal nil
+  end
+
+  t 'app_strings' do
+    app_strings.must_include "SearchBarExplain"
+  end
+
+  t 'action_chain' do
+    ac = Appium::TouchAction.new
+    e  = find_element(:name, 'Buttons, Various uses of UIButton')
+    ac.press element: e, x: 10, y: 10
+    ac.perform
+    back
+  end
+
+  t 'swipe' do
+    swipe start_x: 75, start_y: 500, end_x: 75, end_y: 0, duration: 0.8
+  end
+
+  t 'pinch & zoom' do
+    s_text('Images, Use of UIImageView').click
+    zoom 200
+    pinch 75
+  end
+
+  t 'file movement' do
     read_file = pull_file 'Library/AddressBook/AddressBook.sqlitedb'
     read_file.start_with?('SQLite format').must_equal true
   end

ios_tests/lib/ios/specs/common/device.rb

@@ -1,17 +1,19 @@
 # encoding: utf-8
 
 describe 'common/element/button' do
-  before_first do
+  def before_first
     screen.must_equal catalog
     # nav to buttons activity
     wait { name('buttons').click }
   end
 
-  after_last do
+  def after_last
     # nav back to start
     back_click
   end
 
+  t { before_first }
+
   def gray
     'Gray'
   end
@@ -53,4 +55,6 @@ def gray
     # select the second button containing 'in'
     button_num('in', 2).name.must_equal 'More info'
   end
+
+  t { after_last }
 end

ios_tests/lib/ios/specs/common/element/button.rb

@@ -1,7 +1,12 @@
 # encoding: utf-8
 
 describe 'common/element/text' do
-  before_first { screen.must_equal catalog }
+  def before_first
+    screen.must_equal catalog
+  end
+
+  t { before_first }
+
   t 's_texts' do
     exp = ['UICatalog', 'Buttons, Various uses of UIButton', 'Controls, Various uses of UIControl', 'TextFields, Uses of UITextField', 'SearchBar, Use of UISearchBar', 'TextView, Use of UITextField', 'Pickers, Uses of UIDatePicker, UIPickerView', 'Images, Use of UIImageView', 'Web, Use of UIWebView', 'Segments, Various uses of UISegmentedControl', 'Toolbar, Uses of UIToolbar', 'Alerts, Various uses of UIAlertView, UIActionSheet', 'Transitions, Shows UIViewAnimationTransitions']
     s_texts_names.must_equal exp

ios_tests/lib/ios/specs/common/element/text.rb

@@ -1,7 +1,12 @@
 # encoding: utf-8
 
 describe 'common/element/window' do
-  before_first { screen.must_equal catalog }
+  def before_first
+    screen.must_equal catalog
+  end
+
+  t { before_first }
+
   t 'window_size' do
     size = window_size
     size.width.class.must_equal Fixnum

ios_tests/lib/ios/specs/common/element/window.rb

@@ -1,7 +1,12 @@
 # encoding: utf-8
 # rake ios[common/helper]
 describe 'common/helper.rb' do
-  before_first { screen.must_equal catalog }
+  def before_first
+    screen.must_equal catalog
+  end
+
+  t { before_first }
+
   wait_time = [0.2, 0.2] # max_wait, interval
 
 =begin

ios_tests/lib/ios/specs/common/helper.rb

@@ -7,7 +7,12 @@
 =end
 
 describe 'common/patch.rb' do
-  before_first { screen.must_equal catalog }
+  def before_first
+    screen.must_equal catalog
+  end
+
+  t { before_first }
+
 # Attributes are busted in Android.
 # Blocked on https://github.com/appium/appium/issues/628
   describe 'Selenium::WebDriver::Element methods' do

ios_tests/lib/ios/specs/common/patch.rb

@@ -1,7 +1,12 @@
 # encoding: utf-8
 
 describe 'version.rb' do
-  before_first { screen.must_equal catalog }
+  def before_first
+    screen.must_equal catalog
+  end
+
+  t { before_first }
+
   t '::Appium::VERSION' do
     ::Appium::VERSION.must_match /(\d+)\.(\d+).(\d+)/
   end

ios_tests/lib/ios/specs/common/version.rb

@@ -1,7 +1,11 @@
 # encoding: utf-8
 # rake ios[driver]
 describe 'driver' do
-  before_first { screen.must_equal catalog }
+  def before_first
+    screen.must_equal catalog
+  end
+
+  t { before_first }
 
   def is_sauce
     ENV['UPLOAD_FILE'] && ENV['SAUCE_USERNAME']
@@ -35,10 +39,18 @@ def is_sauce
                               sauce_username:   nil,
                               sauce_access_key: nil,
                               port:             4723,
-                              device:           'ios',
+                              device:           :ios,
                               debug:            true }
 
-      actual.must_equal expected
+      if actual != expected
+        diff = HashDiff.diff expected, actual
+        diff = "diff (expected, actual):\n#{diff}"
+        # example:
+        # change :ios in expected to match 'ios' in actual
+        # [["~", "caps.platformName", :ios, "ios"]]
+        message = "\n\nactual:\n\n: #{actual.ai}expected:\n\n#{expected.ai}\n\n#{diff}"
+        fail message
+      end
     end
 
     t 'verify attributes are immutable' do