Modern ruby defaults to utf-8

Author: bootstraponline

Rakefile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # ruby_lib Rakefile
 require 'rubygems'
 require 'rake'

android_tests/Rakefile

@@ -1,4 +1,4 @@
-# encoding: utf-8
+
 require 'rubygems'
 require 'rake'
 

android_tests/lib/android/specs/android/dynamic.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 describe 'android/dynamic.rb' do
   t 'dynamic_code_to_string' do
     act = dynamic_code_to_string 3, 'hi'

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 describe 'android/element/alert.rb' do
   def open_alert
     # trigger the alert

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

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-describe 'common/element/button' do
+describe 'android/element/button' do
   def before_first
     # nav to buttons activity
     text('App').click

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe 'android/element/generic' do
   def m method
     r = method(method).call 'tent'

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe 'android/element/text' do
   t 's_texts' do
     exp = ['API Demos', 'Accessibility', 'Animation', 'App', 'Content', 'Graphics', 'Media', 'NFC', 'OS', 'Preference', 'Text', 'Views']

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe 'android/element/textfield' do
   def left
     'Left is best'

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake android[android/helper]
 describe 'android/helper' do
   t 'tag_name_to_android' do

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe 'android/patch.rb' do
   t 'type' do
     # nav to textfield

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe 'common/element/window' do
   t 'window_size' do
     size = window_size

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 describe 'common/helper' do
   # wait is a success unless an error is raised
   # max_wait=0 is infinity to use 0.1

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

@@ -1,11 +1,8 @@
-# encoding: utf-8
-
 =begin
   Skip:
     status # status patches are already tested in driver.rb
     raw_execute # debug output for Pry
 =end
-
 describe 'common/patch' do
 # Attributes are busted in Android.
 # Blocked on https://github.com/appium/appium/issues/628

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe 'version.rb' do
   t '::Appium::VERSION' do
     ::Appium::VERSION.must_match /(\d+)\.(\d+).(\d+)/

android_tests/lib/android/specs/driver.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake android[driver]
 describe 'driver' do
   def is_sauce

android_tests/lib/format.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # helper code useful for writing and verifying tests using Pry
 list = <<TXT
 find

android_tests/lib/run.rb

@@ -1,12 +1,9 @@
-# encoding: utf-8
 require 'rubygems'
 require 'spec'
 require 'fakefs/safe'
 require_relative '../../lib/appium_lib'
 
 =begin
-node server.js -V --fast-reset --without-delay
-
 Run all Android tests:
   ruby run.rb android
 
@@ -30,26 +27,19 @@
 caps = caps.merge({ appium_lib: { debug: true, wait: 1 } })
 caps[:app] = ENV['SAUCE_PATH'] if ENV['SAUCE_USERNAME'] && ENV['SAUCE_ACCESS_KEY']
 
-Appium::Driver.new(caps).start_driver
-
-=begin
-# Android doesn't like to be reset before booting up
-case device
-  when 'android'
-    button 'start button'
-    mobile :reset
-end
-=end
-
 trace_files = []
 
 if one_test
-  # ensure ext is .rb
-  one_test = File.join(File.dirname(one_test),
-                       File.basename(one_test, '.*') + '.rb')
-  one_test = File.join(dir, test_dir + 'specs/', one_test)
-  one_test = File.expand_path one_test
+  unless File.exists? one_test
+    # ensure ext is .rb
+    one_test = File.join(File.dirname(one_test),
+                         File.basename(one_test, '.*') + '.rb')
+    one_test = File.join(dir, test_dir + 'specs/', one_test)
+  else
+    one_test = File.expand_path one_test
+  end
   raise "\nTest #{one_test} does not exist.\n" unless File.exists?(one_test)
+  Appium::Driver.new(caps).start_driver
   # require support (common.rb)
   Dir.glob(File.join dir, test_dir + '/*.rb') do |test|
     require test
@@ -66,6 +56,7 @@
     puts "  #{File.basename(test, '.*')}"
     require test
   end
+  Appium::Driver.new(caps).start_driver
 end
 
 trace_files.map! do |f|

appium_lib.gemspec

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 def self.add_to_path path
  path = File.expand_path "../#{path}/", __FILE__
 

docs_gen/make_docs.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+
 
 require 'rubygems'
 require 'yard'

ios_tests/Rakefile

@@ -1,4 +1,4 @@
-# encoding: utf-8
+
 require 'rubygems'
 require 'rake'
 

ios_tests/lib/format.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # helper code useful for writing and verifying tests using Pry
 list = <<TXT
 alert_click

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe 'common/element/window' do
   def before_first
     screen.must_equal catalog

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake ios[common/helper]
 describe 'common/helper.rb' do
   def before_first

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+
 
 =begin
   Skip:

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 describe 'version.rb' do
   def before_first
     screen.must_equal catalog

ios_tests/lib/ios/specs/driver.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake ios[driver]
 describe 'driver' do
   def before_first

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake ios[ios/element/alert]
 describe 'ios/element/alert' do
   def nav_once

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake ios['ios/element/button']
 describe 'ios/element/button' do
   def before_first

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake ios['ios/element/generic']
 describe 'ios/element/generic' do
   def before_first

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake ios['ios/element/text']
 describe 'ios/element/text' do
   def ui_catalog

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake ios[ios/element/textfield]
 describe 'ios/element/textfield' do
   def enter_text

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake ios[ios/helper]
 describe 'ios/helper' do
   def before_first

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # rake ios[ios/patch]
 describe 'ios/patch' do
   def before_first

ios_tests/lib/run.rb

@@ -1,13 +1,10 @@
-# encoding: utf-8
 require 'rubygems'
 require 'spec'
 require 'hashdiff'
 
 require_relative '../../lib/appium_lib'
 
 =begin
-node server.js -V --fast-reset --without-delay
-
 Run all Android tests:
   ruby run.rb android
 

lib/appium_lib.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'Forwardable' unless defined? Forwardable
 require_relative 'appium_lib/rails/duplicable'
 

lib/appium_lib/android/dynamic.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   class Driver
     @@map = {

lib/appium_lib/android/element/alert.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Android
     # Tap the alert button identified by value.

lib/appium_lib/android/element/button.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # UIAButton methods
 module Appium
   module Android

lib/appium_lib/android/element/generic.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Android
 =begin

lib/appium_lib/android/element/text.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # UIAStaticText methods
 module Appium
   module Android

lib/appium_lib/android/element/textfield.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Android
     # UIATextField methods

lib/appium_lib/android/helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Android
     # Returns an array of android classes that match the tag name

lib/appium_lib/android/patch.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Android
     # @private

lib/appium_lib/common/element/window.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # UIAWindow methods
 module Appium
   module Common

lib/appium_lib/common/helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Generic helper methods not specific
 # to a particular tag name
 module Appium

lib/appium_lib/common/patch.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Common
     # Implement useful features for element.

lib/appium_lib/common/version.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
   VERSION = '0.24.1' unless defined? ::Appium::VERSION

lib/appium_lib/driver.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'rubygems'
 require 'ap'
 require 'selenium-webdriver'

lib/appium_lib/ios/element/alert.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Ios
     # Accept the alert.

lib/appium_lib/ios/element/button.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # UIAButton methods
 module Appium
   module Ios

lib/appium_lib/ios/element/generic.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Ios
     def find value

lib/appium_lib/ios/element/text.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # UIAStaticText methods
 module Appium
   module Ios

lib/appium_lib/ios/element/textfield.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Ios
     UIATextField = 'UIATextField'

lib/appium_lib/ios/helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Ios
     # iOS only. On Android uiautomator always returns an empty string for EditText password.
@@ -134,8 +133,9 @@ def page_window window_number=0
     # @return [Element]
     def id id
       lazy_load_strings
-      raise "Invalid id `#{id}`" unless @strings_xml[id]
-      find_element :id, id
+      value = @strings_xml[id]
+      raise "Invalid id `#{id}`" unless value
+      xpath_visible_exact '*', value
     end
 
     # Return the iOS version as an array of integers

lib/appium_lib/ios/patch.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Appium
   module Ios
     # @private