appium_lib 6.0.0 → 7.0.0

data/ios_tests/lib/ios/specs/driver.rb

@@ -8,7 +8,7 @@ describe 'driver' do
     before_first
   end
 
-  def is_sauce
+  def sauce?
     ENV['UPLOAD_FILE'] && ENV['SAUCE_USERNAME']
   end
 
@@ -20,7 +20,7 @@ describe 'driver' do
   t 'load_appium_txt' do
     # skip this test if we're using Sauce
     # the storage API doesn't have an on disk file
-    skip if is_sauce
+    skip if sauce?
     appium_txt = File.expand_path(File.join(Dir.pwd, 'lib'))
     opts       = Appium.load_appium_txt file: appium_txt, verbose: true
 
@@ -36,7 +36,7 @@ describe 'driver' do
       actual              = driver_attributes
       actual[:caps][:app] = File.basename actual[:caps][:app]
       expected            = { caps:             { platformName: 'ios',
-                                                  platformVersion: '8.1',
+                                                  platformVersion: '8.3',
                                                   deviceName:   'iPhone Simulator',
                                                   app:          'UICatalog.app' },
                               custom_url:       false,
@@ -82,7 +82,7 @@ describe 'driver' do
     t 'app_path attr' do
       apk_name = File.basename driver_attributes[:caps][:app]
 
-      if is_sauce
+      if sauce?
         apk_name.must_equal 'sauce-storage:UICatalog6.1.app.zip'
       else
         apk_name.must_equal 'UICatalog.app'
@@ -92,7 +92,7 @@ describe 'driver' do
     # Only used for Sauce Labs
     t 'app_name attr' do
       name_attr = driver_attributes[:caps][:name]
-      if is_sauce
+      if sauce?
         name_attr.must_equal 'appium_lib_ios'
       else
         name_attr.must_be_nil
@@ -101,7 +101,7 @@ describe 'driver' do
 
     t 'sauce_username attr' do
       sauce_username = driver_attributes[:sauce_username]
-      if is_sauce
+      if sauce?
         sauce_username.must_equal 'appiumci'
       else
         sauce_username.must_be_nil
@@ -110,8 +110,8 @@ describe 'driver' do
 
     t 'sauce_access_key attr' do
       sauce_access_key = driver_attributes[:sauce_access_key]
-      if is_sauce
-        sauce_access_key.must_match /\h{8}-\h{4}-\h{4}-\h{4}-\h{12}/
+      if sauce?
+        sauce_access_key.must_match(/\h{8}-\h{4}-\h{4}-\h{4}-\h{12}/)
       else
         sauce_access_key.must_be_nil
       end
@@ -119,11 +119,6 @@ describe 'driver' do
   end
 
   describe 'Appium::Driver' do
-    t '@@loaded' do
-      loaded = $driver.class.class_variable_get :@@loaded
-      loaded.must_equal true
-    end
-
     t '$driver.class' do
       $driver.class.must_equal Appium::Driver
     end
@@ -136,10 +131,10 @@ describe 'driver' do
 
     t 'server_version' do
       server_version = appium_server_version['build']['version']
-      if is_sauce
+      if sauce?
         server_version.must_match 'Sauce OnDemand'
       else
-        server_version.must_match /(\d+)\.(\d+).(\d+)/
+        server_version.must_match(/(\d+)\.(\d+).(\d+)/)
       end
     end
 
@@ -152,12 +147,13 @@ describe 'driver' do
       driver.browser.must_equal :iOS
     end
 
-=begin
-  Skip:
-    screenshot   # this is slow and already tested by Appium
-    driver_quit  # tested by restart
-    start_driver # tested by restart
-=end
+    #
+    # Skip:
+    #    screenshot   # this is slow and already tested by Appium
+    #    driver_quit  # tested by restart
+    #    start_driver # tested by restart
+    #
+
     t 'set_wait' do
       # fill the @last_waits array with: [30, 30]
       set_wait(30).must_equal(30)
@@ -186,7 +182,12 @@ describe 'driver' do
     # returns true unless an error is raised
     t 'exists' do
       exists(0, 0) { true }.must_equal true
-      exists(0, 0) { raise 'error' }.must_equal false
+      exists(0, 0) { fail 'error' }.must_equal false
+    end
+
+    # simple integration sanity test to check for unexpected exceptions
+    t 'set_location' do
+      set_location latitude: 55, longitude: -72, altitude: 33
     end
 
     # any script

data/ios_tests/lib/ios/specs/ios/element/alert.rb

@@ -2,7 +2,11 @@
 describe 'ios/element/alert' do
   def nav_once
     screen.must_equal catalog
-    wait_true { text('alerts').click; tag('UIANavigationBar').name == 'Alerts' } # wait for true
+    wait_true do
+      text('alerts').click
+      tag('UIANavigationBar').name == 'Alerts' # wait for true
+    end
+
     tag('UIANavigationBar').name.must_equal 'Alerts'
 
     # redefine method as no-op after it's invoked once
@@ -40,4 +44,4 @@ describe 'ios/element/alert' do
   t 'after_last' do
     after_last
   end
-end
+end

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

@@ -30,7 +30,7 @@ describe 'ios/element/button' do
   t 'buttons' do
     exp = ['Back', 'Back', 'Gray', 'Right pointing arrow']
     target_buttons = buttons('a')
-    target_buttons.map { |e| e.name }.must_equal exp
+    target_buttons.map(&:name).must_equal exp
     target_buttons.length.must_equal exp.length
   end
 
@@ -53,4 +53,4 @@ describe 'ios/element/button' do
   t 'after_last' do
     after_last
   end
-end
+end

data/ios_tests/lib/ios/specs/ios/element/generic.rb

@@ -8,7 +8,7 @@ describe 'ios/element/generic' do
     'Buttons'
   end
 
-  def verify element
+  def verify(element)
     element = element.first if element.is_a? Array
     element.name.must_equal uibutton_text
   end

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

@@ -1,3 +1,5 @@
+# rubocop:disable Lint/HandleExceptions
+
 # rake ios['ios/element/text']
 describe 'ios/element/text' do
   def ui_catalog
@@ -34,7 +36,7 @@ describe 'ios/element/text' do
   t 'texts' do
     exp = ['Controls', 'Various uses of UIControl', 'Various uses of UISegmentedControl']
     texts.length.must_equal 24
-    texts('trol').map { |e| e.name }.must_equal exp
+    texts('trol').map(&:name).must_equal exp
     texts('uses').length.must_equal 7
   end
 
@@ -44,6 +46,7 @@ describe 'ios/element/text' do
     act = begin
       text_exact 'mos'
     rescue
+      # nop
     end
     act.must_be_nil
     set_wait

data/ios_tests/lib/ios/specs/ios/element/textfield.rb

@@ -27,14 +27,14 @@ describe 'ios/element/textfield' do
   end
 
   t 'textfields' do
-    values = textfields('enter').map { |e| e.value }
+    values = textfields('enter').map(&:value)
     values.include?('<enter text>').must_equal true
     values.include?('<enter password>').must_equal true
     textfields.length.must_equal 4
   end
 
   t 'predicate textfields' do
-    textfield_count = execute_script(%Q(au.mainApp().getAllWithPredicate("type contains[c] 'textfield'", true))).length
+    textfield_count = execute_script(%(au.mainApp().getAllWithPredicate("type contains[c] 'textfield'", true))).length
     textfield_count.must_equal 4
   end
 
@@ -72,14 +72,14 @@ describe 'ios/element/textfield' do
     textfield(1).send_keys 'ok'
     keyboard_must_exist
 
-    # type will dismiss the keyboard
+    # type should not dismiss the keyboard
     message = 'type test type'
     textfield(1).type message
-    keyboard_must_not_exist
+    keyboard_must_exist
     textfield(1).text.must_equal message
   end
 
-  def must_raise_no_element &block
+  def must_raise_no_element(&block)
     proc { block.call }.must_raise Selenium::WebDriver::Error::NoSuchElementError
   end
 
@@ -123,4 +123,4 @@ describe 'ios/element/textfield' do
   t 'after_last' do
     after_last
   end
-end
+end

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

@@ -13,7 +13,7 @@ describe 'ios/helper' do
     ios_password(2).must_equal 8226.chr('UTF-8') * 2
   end
 
-  # todo: t 'get_page' do
+  # TODO: t 'get_page' do
 
   # t 'page' do # writes to std out
 
@@ -21,7 +21,7 @@ describe 'ios/helper' do
     source_window.length.must_equal 11
   end
 
-  # todo: t 'page_window' do
-  # todo: t 'id' do
-  # todo: t 'ios_version' do
-end
+  # TODO: t 'page_window' do
+  # TODO: t 'id' do
+  # TODO: t 'ios_version' do
+end

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

@@ -13,7 +13,7 @@ describe 'ios/patch' do
     before_first
   end
 
-  # todo: test 'label'
+  # TODO: test 'label'
 
   t 'type' do
     # nav to textfield
@@ -27,4 +27,4 @@ describe 'ios/patch' do
   t 'after_last' do
     after_last
   end
-end
+end

data/ios_tests/lib/run.rb

@@ -1,4 +1,4 @@
 # ios tests have a set of common helper methods
 require_relative 'common'
 # run file is identical to android
-require_relative '../../android_tests/lib/run'
+require_relative '../../android_tests/lib/run'

data/ios_tests/readme.md

@@ -12,7 +12,7 @@ ruby_lib's iOS tests. Requires `Ruby 1.9.3` or better.
 
 `UICatalog6.1` is from [appium/appium](https://github.com/appium/appium/blob/master/assets/UICatalog6.1.app.zip)
 
-The tests are now run against `iPhone Simulator 7.0.3 (11B508)`
+The tests are now run against `iPhone 6 Simulator 8.3 (12F69)`
 
 #### Documentation
 
@@ -24,7 +24,7 @@ The tests are now run against `iPhone Simulator 7.0.3 (11B508)`
 --
 
 ```java
-Finished in 1 min 49 secs
+Finished in 1 min 57 secs
 
-101 runs, 130 assertions, 0 failures, 0 errors, 0 skips
+123 runs, 164 assertions, 0 failures, 0 errors, 0 skips
 ```

data/ios_tests/upload/sauce_storage.rb

@@ -6,13 +6,13 @@ s = SauceStorage.new username: 'my_user_name', key: '00', debug: true
 # or if you have  SAUCE_USERNAME and SAUCE_ACCESS_KEY in env already
 
 s = SauceStorage.new debug: true
- 
+
 # list all files
 s.files
- 
+
 # upload a file
 s.upload '/tmp/sauce/test.zip'
- 
+
 > s.files
 => [{"size"=>8,
   "mtime"=>1367700857.1011374,
@@ -30,20 +30,20 @@ require 'json'
 class SauceStorage
   attr_reader :username, :key, :url, :debug
 
-  def initialize opts
+  def initialize(opts)
     @username = opts.fetch :username, ENV['SAUCE_USERNAME']
     @key      = opts.fetch :key, ENV['SAUCE_ACCESS_KEY']
     @url      = "https://#{@username}:#{@key}@saucelabs.com/rest/v1/storage/#{@username}"
     @debug    = opts.fetch :debug, false
   end
 
-  def upload file_path
+  def upload(file_path)
     file_name = File.basename file_path
     file      = File.new file_path
     local_md5 = Digest::MD5.hexdigest File.read file_path
 
-    self.files.each do |file|
-      if file['md5'] == local_md5
+    files.each do |f|
+      if f['md5'] == local_md5
         puts 'File already uploaded' if @debug
         return true
       end
@@ -62,4 +62,4 @@ class SauceStorage
   def files
     JSON.parse(RestClient.get @url)['files']
   end
-end
+end

data/ios_tests/upload/upload.rb

@@ -3,4 +3,4 @@ require File.expand_path '../sauce_storage', __FILE__
 s   = SauceStorage.new debug: true
 apk = File.expand_path '../' * 2 + ENV['UPLOAD_FILE'], __FILE__
 
-s.upload apk
+s.upload apk

data/lib/appium_lib/android/client_xpath.rb

@@ -2,7 +2,7 @@ require 'nokogiri'
 
 module Appium
   module Android
-    def _nodeset_to_uiselector opts={}
+    def _nodeset_to_uiselector(opts = {})
       results = ''
 
       nodes = opts[:nodes]
@@ -11,16 +11,16 @@ module Appium
       nodes = [nodes[0]] if first
 
       nodes.each do |node|
-        results += %Q(new UiSelector().className("#{node.name}").instance(#{node.attr('instance')});)
+        results += %(new UiSelector().className("#{node.name}").instance(#{node.attr('instance')});)
       end
 
       results.strip
     end
 
-    def _client_xpath opts={}
+    def _client_xpath(opts = {})
       root_node = Nokogiri::XML(get_source).children.first
 
-      instance = Hash.new -1
+      instance = Hash.new(-1)
 
       root_node.traverse do |node|
         number = instance[node.name] += 1
@@ -33,15 +33,15 @@ module Appium
       _nodeset_to_uiselector nodes: nodes, first: first
     end
 
-    def client_xpath xpath
+    def client_xpath(xpath)
       find_element :uiautomator, _client_xpath(xpath: xpath, first: true)
     end
 
-    def client_xpaths xpath
+    def client_xpaths(xpath)
       find_elements :uiautomator, _client_xpath(xpath: xpath, first: false)
     end
   end
 end
 
 # http://stackoverflow.com/questions/9199415/getting-first-node-in-xpath-result-set
-# '(//android.widget.TextView)[1]' not '//android.widget.TextView[1]'
+# '(//android.widget.TextView)[1]' not '//android.widget.TextView[1]'

data/lib/appium_lib/android/element/alert.rb

@@ -3,7 +3,7 @@ module Appium
     # Click the first alert button that contains value or by index.
     # @param value [Integer, String] either an integer index of the button or the button's name
     # @return [void]
-    def alert_click value
+    def alert_click(value)
       button(value).click
     end
 
@@ -35,4 +35,4 @@ module Appium
       first_button.text
     end
   end # module Android
-end # module Appium
+end # module Appium

data/lib/appium_lib/android/element/button.rb

@@ -7,28 +7,28 @@ module Appium
     private
 
     # @private
-    def _button_visible_selectors opts={}
+    def _button_visible_selectors(opts = {})
       button_index       = opts.fetch :button_index, false
       image_button_index = opts.fetch :image_button_index, false
 
       if button_index && image_button_index
-        "new UiSelector().className(#{Button}).instance(#{button_index});" +
-        "new UiSelector().className(#{ImageButton}).instance(#{image_button_index});"
+        "new UiSelector().className(#{Button}).instance(#{button_index});" \
+          "new UiSelector().className(#{ImageButton}).instance(#{image_button_index});"
       else
-        "new UiSelector().className(#{Button});" +
-        "new UiSelector().className(#{ImageButton});"
+        "new UiSelector().className(#{Button});" \
+          "new UiSelector().className(#{ImageButton});"
       end
     end
 
     # @private
-    def _button_exact_string value
+    def _button_exact_string(value)
       button       = string_visible_exact Button, value
       image_button = string_visible_exact ImageButton, value
       button + image_button
     end
 
     # @private
-    def _button_contains_string value
+    def _button_contains_string(value)
       button       = string_visible_contains Button, value
       image_button = string_visible_contains ImageButton, value
       button + image_button
@@ -40,12 +40,12 @@ module Appium
     # @param value [String, Integer] the value to exactly match.
     # If int then the button at that index is returned.
     # @return [Button]
-    def button value
+    def button(value)
       # Don't use ele_index because that only works on one element type.
       # Android needs to combine button and image button to match iOS.
       if value.is_a? Numeric
         index = value
-        raise "#{index} is not a valid index. Must be >= 1" if index <= 0
+        fail "#{index} is not a valid index. Must be >= 1" if index <= 0
 
         return find_element :uiautomator, _button_visible_selectors(index: index)
       end
@@ -57,7 +57,7 @@ module Appium
     # If value is omitted, all buttons are returned.
     # @param value [String] the value to search for
     # @return [Array<Button>]
-    def buttons value=false
+    def buttons(value = false)
       return find_elements :uiautomator, _button_visible_selectors unless value
       find_elements :uiautomator, _button_contains_string(value)
     end
@@ -73,28 +73,28 @@ module Appium
     def last_button
       # uiautomator index doesn't support last
       # and it's 0 indexed
-      button_index       = tags(Button).length
-      button_index       -= 1 if button_index > 0
+      button_index = tags(Button).length
+      button_index -= 1 if button_index > 0
       image_button_index = tags(ImageButton).length
       image_button_index -= 1 if image_button_index > 0
 
       find_element :uiautomator,
                    _button_visible_selectors(button_index: button_index,
-                                            image_button_index: image_button_index)
+                                             image_button_index: image_button_index)
     end
 
     # Find the first button that exactly matches value.
     # @param value [String] the value to match exactly
     # @return [Button]
-    def button_exact value
+    def button_exact(value)
       find_element :uiautomator, _button_exact_string(value)
     end
 
     # Find all buttons that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<Button>]
-    def buttons_exact value
+    def buttons_exact(value)
       find_elements :uiautomator, _button_exact_string(value)
     end
   end # module Android
-end # module Appium
+end # module Appium