Fix ios[ios/element/alert]

Author: bootstraponline

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

@@ -11,7 +11,7 @@ def nav_once
   end
 
   def after_last
-    ignore { wait(4) { alert_accept } }
+    alert_accept if exists { s_text('UIActionSheet <title>') }
     back_click
     screen.must_equal catalog
     sleep 1
@@ -23,56 +23,26 @@ def after_last
   end
 
   def open_alert
-    wait_true { s_text('Show OK-Cancel').click; alert_accept_text == 'OK' }
+    wait_true do
+      return true if exists { s_text('UIActionSheet <title>') }
+      s_text('Show OK-Cancel').click
+      s_text('UIActionSheet <title>').displayed?
+    end
   end
 
+  # iOS 7 is not using the alert methods. alert is nil.
   def ios7_alert_detected
-    # iOS 7 doesn't use the standard .alert() method
     execute_script 'UIATarget.localTarget().frontMostApp().alert().isNil()'
   end
 
-  # UIAlertView
-  t 'alert_click' do
-    if ios7_alert_detected
-      # iOS 7 is not using the alert methods anymore so alert_click
-      # is not possible to implement in a meaningful way
-      # for this test, we're going to skip testing alert_click on iOS 7
-      alert_accept
-    else
-      alert_click 'OK'
-    end
-  end
-
-  t 'alert_text' do
-    if ios7_alert_detected
-      # iOS 7 is not using the alert methods anymore so alert_text
-      # is not possible to implement in a meaningful way
-      # for this test, we're going to skip testing alert_text on iOS 7
-      alert_accept
-    else
-      alert_text.must_equal 'UIAlertView'
-      alert_accept
-    end
-  end
-
   t 'alert_accept' do
     alert_accept
   end
 
-  t 'alert_accept_text' do
-    alert_accept_text.must_equal 'OK'
-    alert_accept
-  end
-
   t 'alert_dismiss' do
     alert_dismiss
   end
 
-  t 'alert_dismiss_text' do
-    alert_dismiss_text.must_equal 'Cancel'
-    alert_dismiss
-  end
-
   t 'after_last' do
     after_last
   end

ios_tests/lib/run.rb

@@ -82,8 +82,6 @@ def catalog
 
 caps[:app] = ENV['SAUCE_PATH'] if ENV['SAUCE_USERNAME'] && ENV['SAUCE_ACCESS_KEY']
 
-Appium::Driver.new(caps).start_driver
-
 trace_files = []
 
 if one_test
@@ -96,6 +94,7 @@ def catalog
     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
@@ -112,6 +111,7 @@ def catalog
     puts "  #{File.basename(test, '.*')}"
     require test
   end
+  Appium::Driver.new(caps).start_driver
 end
 
 trace_files.map! do |f|

lib/appium_lib/ios/element/alert.rb

@@ -1,31 +1,6 @@
 # encoding: utf-8
 module Appium
   module Ios
-    # iOS only
-    # Tap the alert button identified by value.
-    #
-    # Click the ok button:
-    #   alert_click 'OK'
-    #
-    # Click the first button:
-    #   alert_click 0
-    #
-    # @param value [Integer, String] either an integer index of the button or the button's name
-    # @return [void]
-    def alert_click value
-      value = "'#{value}'" if value.is_a?(String)
-      @driver.execute_script "UIATarget.localTarget().frontMostApp().alert().buttons()[#{value}].tap();"
-    end
-
-    # Get the alert message text.
-    # @return [String]
-    def alert_text
-      # this will call get text twice so call bridge directly
-      # ".switch_to.alert" calls it once, then ".text" another time.
-      # @driver.switch_to.alert.text
-      driver.send(:bridge).getAlertText
-    end
-
     # Accept the alert.
     # @return [void]
     def alert_accept
@@ -34,64 +9,12 @@ def alert_accept
       driver.send(:bridge).acceptAlert
     end
 
-    # Get the text of the alert's accept button.
-    # The last button is considered "accept." on iOS 6
-    # The first button is considered "accept." on iOS 7
-    # @return [String]
-    def alert_accept_text
-      old_wait = default_wait
-      set_wait 0
-      target_text = ''
-
-      a = ignore { @driver.find_element(:tag_name, :alert) }
-
-      begin
-        if a.nil? # either no alert or on iOS 7
-          b           = xpaths 'actionsheet/button'
-          target_text = b.first.text if b && b.size >= 1
-        else # iOS 6 alert found
-          b           = a.find_elements(:tag_name, :button)
-          target_text = b.last.text if b && b.size >= 1
-        end
-      rescue
-      ensure
-        set_wait old_wait
-        return target_text
-      end
-    end
-
     # Dismiss the alert.
     # @return [void]
     def alert_dismiss
       # @driver.switch_to.alert.dismiss
       # ".switch_to.alert" calls getAlertText so use bridge directly
       driver.send(:bridge).dismissAlert
     end
-
-    # Get the text of the alert's dismiss button.
-    # The first button is considered "dismiss." on iOS 6
-    # The last button is considered "dismiss." on iOS 7
-    # @return [String]
-    def alert_dismiss_text
-      old_wait = default_wait
-      set_wait 0
-      target_text = ''
-
-      a = ignore { @driver.find_element(:tag_name, :alert) }
-
-      begin
-        if a.nil? # either no alert or on iOS 7
-          b           = xpaths 'actionsheet/button'
-          target_text = b.last.text if b && b.size >= 1
-        else # iOS 6 alert found
-          b           = a.find_elements(:tag_name, :button)
-          target_text = b.first.text if b && b.size >= 1
-        end
-      rescue
-      ensure
-        set_wait old_wait
-        return target_text
-      end
-    end
   end # module Ios
 end # module Appium