Update tests

Author: bootstraponline

Rakefile

@@ -5,21 +5,21 @@ require 'date'
 require 'posix/spawn'
 
 # Defines gem name.
-def repo_name;
+def repo_name
   'appium_lib'
 end
 
 # ruby_lib published as appium_lib
-def gh_name;
+def gh_name
   'ruby_lib'
 end
 
 # the name as used on github.com
-def version_file;
+def version_file
   "lib/#{repo_name}/common/version.rb"
 end
 
-def version_rgx;
+def version_rgx
   /\s*VERSION\s*=\s*'([^']+)'/m
 end
 
@@ -144,8 +144,8 @@ task :uninstall do
   cmd = "gem uninstall -aIx #{repo_name}"
   # rescue on gem not installed error.
   begin
-    ; sh "#{cmd}";
-  rescue;
+    sh "#{cmd}"
+  rescue
   end
 end
 

android_tests/Rakefile

@@ -6,8 +6,8 @@ task :default => :android
 # Run sh and ignore exception
 def run_sh cmd
   begin
-    ; sh cmd;
-  rescue;
+    sh cmd
+  rescue
   end
 end
 

android_tests/api.apk

@@ -1,4 +1,4 @@
-describe 'android/element/alert.rb' do
+describe 'android/element/alert' do
   def open_alert
     # trigger the alert
     wait { button('OK Cancel dialog with a long message').click }

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

@@ -29,6 +29,7 @@ def fade_in
   t 'buttons' do
     exp = ['Zoom in', 'Modern zoom in', 'Thumbnail zoom']
     wait { buttons('zoom').map { |e| e.text }.must_equal exp }
+    wait { buttons.length.must_equal 6 }
   end
 
   t 'first_button' do
@@ -47,9 +48,5 @@ def fade_in
     wait { buttons_exact(fade_in).first.name.must_equal fade_in }
   end
 
-  t 'e_buttons' do
-    wait { e_buttons.length.must_equal 6 }
-  end
-
   t { after_last }
 end

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

@@ -5,35 +5,32 @@ def must_raise_no_element &block
     proc { block.call }.must_raise Selenium::WebDriver::Error::NoSuchElementError
   end
 
-  t 's_text' do
-    wait { s_text(1).text.must_equal 'API Demos' }
-    wait { s_text('mos').text.must_equal 'API Demos' }
+  t 'text' do
+    wait { text(1).text.must_equal 'API Demos' }
+    wait { text('mos').text.must_equal 'API Demos' }
   end
 
-  t 's_texts' do
-    wait { s_texts('i').length.must_equal 7 }
+  t 'texts' do
+    wait { texts('i').length.must_equal 6 }
+    wait { texts.length.must_equal 12 }
   end
 
-  t 'first_s_text' do
-    wait { first_s_text.text.must_equal 'API Demos' }
+  t 'first_text' do
+    wait { first_text.text.must_equal 'API Demos' }
   end
 
-  t 'last_s_text' do
-    wait { last_s_text.text.must_equal 'Views' }
+  t 'last_text' do
+    wait { last_text.text.must_equal 'Views' }
   end
 
-  t 's_text_exact' do
-    must_raise_no_element { s_text_exact 'mos' }
+  t 'text_exact' do
+    must_raise_no_element { text_exact 'mos' }
 
     # should pass
-    wait { s_text_exact('API Demos').text.must_equal 'API Demos' }
+    wait { text_exact('API Demos').text.must_equal 'API Demos' }
   end
 
-  t 's_texts_exact' do
-    wait { s_texts_exact('API Demos').length.must_equal 1 }
-  end
-
-  t 'e_s_texts' do
-    wait { e_s_texts.length.must_equal 14 }
+  t 'texts_exact' do
+    wait { texts_exact('API Demos').length.must_equal 1 }
   end
 end

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

@@ -32,6 +32,7 @@ def after_last
 
   t 'textfields' do
     wait { textfields('right').first.text.must_equal right }
+    wait { textfields.length.must_equal 2 }
   end
 
   t 'first_textfield' do
@@ -52,9 +53,5 @@ def after_last
     wait { textfields_exact(left).first.text.must_equal left }
   end
 
-  t 'e_textfields' do
-    wait { e_textfields.length.must_equal 2 }
-  end
-
   t { after_last }
 end

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

@@ -1,7 +1,7 @@
 # rake android[android/helper]
 describe 'android/helper' do
   t 'tags' do
-    wait { tags('android.widget.TextView').length.must_equal 14 }
+    wait { tags('android.widget.TextView').length.must_equal 12 }
   end
 
   def page_class_data

android_tests/lib/android/specs/android/helper.rb

@@ -20,7 +20,7 @@
 
   t 'reset' do
     reset
-    wait { s_text(1).text.must_equal 'API Demos' }
+    wait { text(1).text.must_equal 'API Demos' }
   end
 
   t 'close & launch' do
@@ -42,13 +42,14 @@
 
   t 'set_context' do
     wait do
-      scroll_to "Views"
-      last_s_text.click
-      scroll_to 'WebView'
-      last_s_text.click
+      scroll_to('Views').click
+      scroll_to('WebView').click
       set_context 'WEBVIEW'
       current_context.must_equal 'WEBVIEW_1'
     end
+
+    set_context 'NATIVE_APP'
+    2.times { back; sleep 1 }
   end
 
   t 'within_context' do
@@ -94,20 +95,20 @@ def must_return_element element
     end
     wait { find_element(:name, 'Custom View') }
     back
-    wait { s_text_exact 'NFC' }
+    wait { text_exact 'NFC' }
   end
 
   t 'swipe' do
     wait { Appium::TouchAction.new.swipe(start_x: 0.75, start_y: 0.25, end_x: 0.75, end_y: 0.5, duration: 1.5).perform }
-    wait { !exists { s_text_exact 'NFC' } }
+    wait { !exists { text_exact 'NFC' } }
     back
-    wait { s_text_exact 'NFC' }
+    wait { text_exact 'NFC' }
   end
 
   t 'pinch & zoom' do
-    wait { s_text_exact 'NFC' }
-    wait { s_text_exact('Graphics').click }
-    wait { s_text('BitmapMesh').click }
+    wait { text_exact 'NFC' }
+    wait { text_exact('Graphics').click }
+    wait { text('BitmapMesh').click }
     wait do
       zoom 200
       pinch 75

android_tests/lib/android/specs/common/device.rb

@@ -45,11 +45,11 @@
 
   t 'back' do
     # start page
-    wait { e_s_texts.length.must_equal 14 }
+    wait { texts.length.must_equal 12 }
     # nav to new page.
     # ele 0 is the title and can't be clicked.
-    wait { s_text(2).click }
-    wait { e_s_texts.length.must_equal 8 }
+    wait { text(2).click }
+    wait { texts.length.must_equal 5 }
     # go back
     back
     # start page
@@ -65,15 +65,15 @@
   end
 
   t 'xpaths' do
-    wait { xpaths('//android.widget.TextView').length.must_equal 14 }
+    wait { xpaths('//android.widget.TextView').length.must_equal 12 }
   end
 
   t 'ele_index' do
     wait { ele_index('android.widget.TextView', 2).name.must_equal 'Accessibility' }
   end
 
   t 'tags' do
-    wait { tags('android.widget.TextView').length.must_equal 14 }
+    wait { tags('android.widget.TextView').length.must_equal 12 }
   end
 
   t 'find_ele_by_attr_include' do
@@ -86,7 +86,7 @@
   t 'find_eles_by_attr_include' do
     wait do
       ele_count = find_eles_by_attr_include('android.widget.TextView', :text, 'e').length
-      ele_count.must_equal 9
+      ele_count.must_equal 7
     end
   end
 

android_tests/lib/android/specs/common/helper.rb

@@ -13,14 +13,14 @@
     # t 'value' do; end # Doesn't work on Android
 
     t 'name' do
-      wait { first_s_text.name.must_equal 'API Demos' }
+      wait { first_text.name.must_equal 'API Demos' }
     end
 
     # t 'tag_name' do; end # Doesn't work on Android
 
     t 'location_rel' do
       wait do
-        loc = first_s_text.location_rel
+        loc = first_text.location_rel
         loc.x.class.must_equal String
         loc.y.class.must_equal String
       end
@@ -55,7 +55,7 @@
     t 'find many elements by resource id' do
       wait do
         value = find_elements(:id, 'android:id/text1').length
-        value.must_equal 13
+        value.must_equal 11
       end
     end
 

android_tests/lib/android/specs/common/patch.rb

@@ -158,7 +158,7 @@ def validate_path path;
     # any elements
     t 'find_elements' do
       wait do
-        find_elements(:class_name, 'android.widget.TextView').length.must_equal 14
+        find_elements(:class_name, 'android.widget.TextView').length.must_equal 12
       end
     end
 

android_tests/lib/android/specs/driver.rb

@@ -6,8 +6,8 @@ task :default => :ios
 # Run sh and ignore exception
 def run_sh cmd
   begin
-    ; sh cmd;
-  rescue;
+    sh cmd
+  rescue
   end
 end
 

ios_tests/Rakefile

@@ -65,7 +65,7 @@ def before_first
     # start page
     tag('UIANavigationBar').name.must_equal 'UICatalog'
     # nav to new page.
-    wait_true { s_text('buttons').click; tag('UIANavigationBar').name == 'Buttons' }
+    wait_true { text('buttons').click; tag('UIANavigationBar').name == 'Buttons' }
     tag('UIANavigationBar').name.must_equal 'Buttons'
     # go back
     back_click

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

@@ -19,13 +19,13 @@ def before_first
     # todo: t 'value' do; end
 
     t 'name' do
-      first_s_text.name.must_equal 'UICatalog'
+      first_text.name.must_equal 'UICatalog'
     end
 
     # t 'tag_name' do; end # Doesn't work on Android
 
     t 'location_rel' do
-      loc = first_s_text.location_rel
+      loc = first_text.location_rel
       loc.x.class.must_equal String
       loc.y.class.must_equal String
     end

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

@@ -67,11 +67,11 @@ def before_first
   end
 
   t 'swipe' do
-    swipe start_x: 75, start_y: 500, end_x: 75, end_y: 0, duration: 0.8
+    swipe start_x: 75, start_y: 500, end_x: 75, end_y: 0, duration: 800
   end
 
   t 'pinch & zoom' do
-    s_text('Images, Use of UIImageView').click
+    text('Images, Use of UIImageView').click
     zoom 200
     pinch 75
   end

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

@@ -139,7 +139,7 @@ def is_sauce
 
     t 'restart' do
       restart
-      s_text 'buttons'
+      text 'buttons'
     end
 
     t 'driver' do

ios_tests/lib/ios/specs/driver.rb

@@ -2,15 +2,15 @@
 describe 'ios/element/alert' do
   def nav_once
     screen.must_equal catalog
-    wait_true { s_text('alerts').click; tag('UIANavigationBar').name == 'Alerts' } # wait for true
+    wait_true { text('alerts').click; tag('UIANavigationBar').name == 'Alerts' } # wait for true
     tag('UIANavigationBar').name.must_equal 'Alerts'
 
     # redefine method as no-op after it's invoked once
     self.class.send :define_method, :nav_once, proc {}
   end
 
   def after_last
-    alert_accept if exists { s_text('UIActionSheet <title>') }
+    alert_accept if exists { text('UIActionSheet <title>') }
     back_click
     screen.must_equal catalog
     sleep 1
@@ -23,9 +23,9 @@ def after_last
 
   def open_alert
     wait_true do
-      return true if exists { s_text('UIActionSheet <title>') }
-      s_text('Show OK-Cancel').click
-      s_text('UIActionSheet <title>').displayed?
+      return true if exists { text('UIActionSheet <title>') }
+      text('Show OK-Cancel').click
+      text('UIActionSheet <title>').displayed?
     end
   end