Merge pull request #289 from sofaking/master

Green tests on iOS 8.1/Xcode 6.1/ruby 2.0

Author: bootstraponline

ios_tests/appium.txt

@@ -1,8 +1,9 @@
 [caps]
 platformName = "ios"
+platformVersion = "8.1"
 deviceName ="iPhone Simulator"
 app = "./UICatalog.app"
 
 [appium_lib]
 sauce_username = ""
-sauce_access_key = ""
+sauce_access_key = ""

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

@@ -92,11 +92,11 @@ def before_first
   end
 
   t 'xpaths' do
-    xpaths('//UIAStaticText').length.must_equal 13
+    xpaths('//UIAStaticText').length.must_equal 25
   end
 
   def uibutton_text
-    'Buttons, Various uses of UIButton'
+    'Buttons'
   end
 
   t 'ele_index' do
@@ -135,7 +135,7 @@ def uibutton_text
 
   t 'find_eles_by_attr_include' do
     ele_count = find_eles_by_attr_include('UIAStaticText', :name, 'e').length
-    ele_count.must_equal 12
+    ele_count.must_equal 19
   end
 
   t 'first_ele' do
@@ -144,8 +144,8 @@ def uibutton_text
 
   t 'last_ele' do
     el = last_ele('UIAStaticText')
-    el.text.must_equal 'Transitions, Shows UIViewAnimationTransitions'
-    el.name.must_equal 'Transitions, Shows UIViewAnimationTransitions'
+    el.text.must_equal 'Transitions'
+    el.name.must_equal 'Transitions'
   end
 
   # t 'source' do # tested by get_source
@@ -166,15 +166,15 @@ def uibutton_text
   end
 
   t 'tag' do
-    tag('UIATableCell').name.must_equal 'Buttons, Various uses of UIButton'
+    tag('UIATableCell').name.must_equal uibutton_text
   end
 
   t 'tags' do
     tags('UIATableCell').length.must_equal 12
   end
 
   t 'find_eles_by_attr_include' do
-    find_eles_by_attr_include('UIATableCell', 'name', 'Use').length.must_equal 7
+    find_eles_by_attr_include('UIAStaticText', 'name', 'Use').length.must_equal 7
   end
 
   t 'get_page_class' do
@@ -200,4 +200,4 @@ def uibutton_text
 xpaths_visible_exact
 raise_no_element_error
 =end
-end
+end

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

@@ -2,10 +2,15 @@
 describe 'the web context' do
 
   t 'get_android_inspect' do
-    text('Web, Use of UIWebView').click
+    text('Web').click
     set_context 'WEBVIEW'
     current_context.must_equal 'WEBVIEW_1'
     sleep 1  #Give a chance to load
     page.start_with?("\nhtml\n").must_equal true
   end
-end
+
+  t 'after_last' do
+    set_context 'NATIVE_APP'
+    back_click
+  end
+end

ios_tests/lib/ios/specs/driver.rb

@@ -36,6 +36,7 @@ def is_sauce
       actual              = driver_attributes
       actual[:caps][:app] = File.basename actual[:caps][:app]
       expected            = { caps:             { platformName: 'ios',
+                                                  platformVersion: '8.1',
                                                   deviceName:   'iPhone Simulator',
                                                   app:          'UICatalog.app' },
                               custom_url:       false,

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

@@ -30,7 +30,7 @@ def gray
   t 'buttons' do
     exp = ['Back', 'Back', 'Gray', 'Right pointing arrow']
     buttons('a').map { |e| e.name }.must_equal exp
-    buttons.length.must_equal exp.length
+    buttons('a').length.must_equal exp.length
   end
 
   t 'first_button' do
@@ -52,4 +52,4 @@ def gray
   t 'after_last' do
     after_last
   end
-end
+end

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

@@ -5,7 +5,7 @@ def before_first
   end
 
   def uibutton_text
-    'Buttons, Various uses of UIButton'
+    'Buttons'
   end
 
   def verify element
@@ -32,4 +32,4 @@ def verify element
   t 'finds_exact' do
     verify finds_exact uibutton_text
   end
-end
+end

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

@@ -5,7 +5,7 @@ def ui_catalog
   end
 
   def uiview_transitions
-    'Transitions, Shows UIViewAnimationTransitions'
+    'Transitions'
   end
 
   def before_first
@@ -26,14 +26,14 @@ def before_first
   end
 
   t 'text' do
-    text('mat').text.must_equal uiview_transitions
+    text('siti').text.must_equal uiview_transitions
     text(1).text.must_equal ui_catalog
-    text('mat').name.must_equal uiview_transitions
+    text('siti').name.must_equal uiview_transitions
   end
 
   t 'texts' do
-    exp = ['Controls, Various uses of UIControl', 'Segments, Various uses of UISegmentedControl']
-    texts.length.must_equal 13
+    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('uses').length.must_equal 7
   end
@@ -55,4 +55,4 @@ def before_first
   t 'texts_exact' do
     texts_exact('UICatalog').length.must_equal 1
   end
-end
+end

lib/appium_lib/common/helper.rb

@@ -81,7 +81,7 @@ def reset
       # http://nokogiri.org/Nokogiri/XML/SAX/Document.html
       def start_element name, attrs = []
         # Count only visible elements. Android is always visible
-        element_visible = $driver.device_is_android? ? true : attrs.to_h['visible'] == 'true'
+        element_visible = $driver.device_is_android? ? true : Hash[attrs]['visible'] == 'true'
         @result[name]   += 1 if element_visible
       end
 
@@ -220,4 +220,4 @@ def _no_such_element
       raise Selenium::WebDriver::Error::NoSuchElementError, 'An element could not be located on the page using the given search parameters.'
     end
   end # module Common
-end # module Appium
+end # module Appium