briar 0.1.3.b2 → 0.1.3.b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aac180fa4f9c1604dd8865d6a18c29094557c71
-  data.tar.gz: 97fd1e500e0beefd47891cb37429c32632cce93d
+  metadata.gz: 512528d4fa2a1d45ded34cc521654f7f562b6179
+  data.tar.gz: 94345455689bbe7fb6b67d3bdeb4e6f780ada03f
 SHA512:
-  metadata.gz: 271f2054cba3df7ef8e3d9e20478124364dfb8fa7beeb12ab8b6f2e379ceb1160b0e412e3d2503966f0d4d2c1da8404a2faa8a51e3853e8638d91f6532b9211e
-  data.tar.gz: 710690810ea51d2299684f0b401ef5a56f7dc07fdb50933dcd5185fb6835dd7bbece5c436e15a3ba32c434dbe8782c2d5d771704d37ccd49eba5438106e1a9b5
+  metadata.gz: 9d96364adc048ea8b503f3ada1d3e05b87430056ea33c0b1027a7777dd95f8f9735dfc63577ebd8699203ce48174bf6f9948cc388b688df45f0de99b2e1d371b
+  data.tar.gz: 3b81e8ae7d62a14d880aa14b38956cbfd03d1ab06635cb834f7aa006bcba9c092d3868badc347f43bd738dfb62fe49e68cfca4b60eda3e1efd8bcd203e05b930

data/features/step_definitions/keyboard_steps.rb

@@ -19,7 +19,7 @@ end
 
 
 Then /^I touch the delete key$/ do
-  briar_keyboard_send_backspace
+  keyboard_send_backspace
 end
 
 Then(/^I turn off spell checking and capitalization$/) do

data/lib/briar.rb

@@ -36,7 +36,8 @@ require 'calabash-cucumber'
 
 require 'briar/version'
 require 'briar/briar_core'
-require 'briar/briar_uia'
+require 'briar/uia/briar_uia'
+require 'briar/uia/briar_ipad_emulation'
 
 require 'briar/alerts_and_sheets/alert_view'
 require 'briar/alerts_and_sheets/action_sheet'
@@ -57,8 +58,12 @@ require 'briar/picker/date_picker'
 
 require 'briar/email'
 require 'briar/image_view'
+
 require 'briar/keyboard/keyboard'
 require 'briar/keyboard/uia_keyboard'
+require 'briar/keyboard/uia_keyboard_language'
+require 'briar/keyboard/uia_numeric_keyboard'
+
 require 'briar/label'
 require 'briar/scroll_view'
 

data/lib/briar/bars/navbar.rb

@@ -101,11 +101,26 @@ module Briar
     end
 
 
-    def go_back_after_waiting
-      sleep(0.2)
-      wait_for(:timeout => 1.0,
-               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
-               :post_timeout => BRIAR_WAIT_STEP_PAUSE) do
+    def go_back_after_waiting(opts={})
+      default_opts = {:wait_before_going_back => 0.2,
+                      :timeout => BRIAR_WAIT_TIMEOUT,
+                      :timeout_message => nil,
+                      :wait_step_pause => BRIAR_WAIT_STEP_PAUSE,
+                      :retry_frequency => BRIAR_WAIT_RETRY_FREQ}
+      opts = default_opts.merge(opts)
+      wait_before = opts[:wait_before_going_back]
+      sleep(wait_before)
+
+      msg = opts[:timeout_message]
+      timeout = opts[:timeout]
+      if msg.nil?
+        msg = "waited for '#{timeout + wait_before}' for navbar back button but didn't see it"
+      end
+
+      wait_for(:timeout => timeout,
+               :retry_frequency => opts[:retry_frequency],
+               :post_timeout => opts[:wait_step_pause],
+               :timeout_message => msg) do
         not query('navigationItemButtonView first').empty?
       end
       touch('navigationItemButtonView first')
@@ -114,8 +129,9 @@ module Briar
 
     def go_back_and_wait_for_view (view)
       sleep(0.2)
-      wait_for(:timeout => BRIAR_WAIT_TIMEOUT,
-               :retry_frequency => BRIAR_WAIT_RETRY_FREQ) do
+      timeout = BRIAR_WAIT_TIMEOUT
+      msg = "waited '#{timeout}' seconds but did not see navbar back button"
+      wait_for(wait_opts(msg, timeout)) do
         not query('navigationItemButtonView first').empty?
       end
 
@@ -127,10 +143,13 @@ module Briar
     end
 
     def touch_navbar_item(item_name, wait_for_view_id=nil)
-      wait_for(:timeout => BRIAR_WAIT_TIMEOUT,
-               :retry_frequency => BRIAR_WAIT_RETRY_FREQ) do
+      timeout = BRIAR_WAIT_TIMEOUT
+      msg = "waited '#{timeout}' seconds for nav bar item '#{item_name}' to appear"
+
+      wait_for(wait_opts(msg, timeout)) do
         (index_of_navbar_button(item_name) != nil) || button_exists?(item_name)
       end
+
       sleep(0.2)
       idx = index_of_navbar_button item_name
 

data/lib/briar/briar_core.rb

@@ -50,7 +50,7 @@ module Briar
         screenshot_and_raise "should see view with id '#{view_id}'"
       end
 
-      actual_ht = {x: res['rect']['center_x'], y: res['rect']['center_y']}
+      actual_ht = {x: res['rect']['center_x'].to_f, y: res['rect']['center_y'].to_f}
 
       unless actual_ht == center_ht
         screenshot_and_raise "#{view_id} has center '#{actual_ht}' but should have center '#{center_ht}'"

data/lib/briar/cucumber.rb

@@ -3,6 +3,7 @@ require 'briar'
 World(Briar)
 World(Briar::Core)
 World(Briar::UIA)
+World(Briar::UIA::IPadEmulation)
 World(Briar::Alerts_and_Sheets)
 World(Briar::Bars)
 World(Briar::Control::Button)
@@ -17,6 +18,8 @@ World(Briar::Email)
 World(Briar::ImageView)
 World(Briar::Keyboard)
 World(Briar::UIAKeyboard)
+World(Briar::UIAKeyboard::Numeric)
+World(Briar::UIAKeyboard::Language)
 World(Briar::Label)
 World(Briar::ScrollView)
 World(Briar::Table)

data/lib/briar/keyboard/uia_keyboard.rb

@@ -2,151 +2,6 @@ require 'calabash-cucumber'
 
 module Briar
   module UIAKeyboard
-    # use the apple localization codes
-    BRIAR_LANGUAGE_KEYS = {
-          :en => 'space',
-          :de => 'Leerzeichen',
-          # could not decide what the language code should be (alt was ja-JP)
-          :ja => '空白'
-    }
-
-    # work in progress
-    # the number of buttons on the keyboard will be
-    # 3 <== there is no international button
-    # 4 <== there is an international button
-    def keyboard_has_international? (opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-      res = uia('UIATarget.localTarget().frontMostApp().keyboard().buttons().length')
-      button_count = res['value']
-      button_count == 4
-    end
-
-    def touch_international_key(opts={})
-      default_opts = {:await_keyboard => false,
-                      :step_pause => 0.4}
-      opts = default_opts.merge(opts)
-
-      await_keyboard if opts[:await_keyboard]
-
-      unless keyboard_has_international?
-        screenshot_and_raise 'could not find an international key on the keyboard'
-      end
-
-      # the international button will be at index 1
-      # 3 <== return key
-      # 2 <== Dictation key
-      # 1 <== International key
-      # 0 <== shift key
-      res = uia('UIATarget.localTarget().frontMostApp().keyboard().buttons()[1].tap()')
-      # sleep for a moment and let the keyboard settle into the new language
-      sleep(opts[:step_pause])
-      res
-    end
-
-
-    # work in progress
-    # when looking at elements() the space bar will be at the penultimate index
-    # when looking at keys() the space bar index seems to float around
-    def spacebar_label (opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-      elm_count = uia('UIATarget.localTarget().frontMostApp().keyboard().elements().length')['value']
-      spacebar_idx = elm_count - 2
-      res = uia("UIATarget.localTarget().frontMostApp().keyboard().elements()[#{spacebar_idx}].label()")
-      res['value']
-    end
-
-    def spacebar_has_label?(label, opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-      spacebar_label.eql?(label)
-    end
-
-    def english_keyboard? (opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-      spacebar_has_label? BRIAR_LANGUAGE_KEYS[:en]
-    end
-
-    def german_keyboard? (opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-      spacebar_has_label? BRIAR_LANGUAGE_KEYS[:de]
-    end
-
-    def romaji_keyboard? (opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-      spacebar_has_label? BRIAR_LANGUAGE_KEYS[:ja]
-    end
-
-    def touch_international_until_language(language_key, opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-
-      unless keyboard_has_international?
-        screenshot_and_raise 'keyboard does not have an international key'
-      end
-
-      target = BRIAR_LANGUAGE_KEYS[language_key]
-      if target.nil?
-        screenshot_and_raise "unknown language key '#{language_key}'"
-      end
-
-      stop_at = spacebar_label
-      return if target.eql?(stop_at)
-
-      touch_international_key
-
-      current = spacebar_label
-      loop do
-        break if current.eql?(target)
-        touch_international_key
-        current = spacebar_label
-        if current.eql?(stop_at)
-          screenshot_and_raise "could not find keyboard using key '#{language_key}' and space bar label '#{target}'"
-        end
-      end
-    end
-
-    def is_numeric_keyboard?(opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-      res = uia('UIATarget.localTarget().frontMostApp().keyboard().keys().length')['value']
-      res == 12
-    end
-
-    def briar_keyboard_send_numeric_backspace(opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-      if ios7?
-        uia('UIATarget.localTarget().frontMostApp().keyboard().buttons()[0].tap()')
-      else
-        keyboard_enter_char 'Delete'
-      end
-    end
-
-    def briar_keyboard_send_backspace(opts={})
-      default_opts = {:await_keyboard => false}
-      opts = default_opts.merge(opts)
-      await_keyboard if opts[:await_keyboard]
-      if is_numeric_keyboard?
-        briar_keyboard_send_numeric_backspace
-      else
-        briar_keyboard_send_backspace
-      end
-    end
-
     def uia_keyboard_visible?
       res = uia('UIATarget.localTarget().frontMostApp().keyboard()')['value']
       not res.eql?(':nil')
@@ -165,8 +20,17 @@ module Briar
       wait_for(opts) do
         uia_keyboard_visible?
       end
-
     end
 
+    def dismiss_ipad_keyboard
+      screenshot_and_raise 'cannot dismiss keyboard on iphone' if iphone?
+      screenshot_and_raise 'cannot dismiss keyboard without launching with instruments' unless uia_available?
+      send_uia_command command: "uia.keyboard().buttons()['Hide keyboard'].tap()"
+      step_pause
+    end
   end
 end
+
+
+
+

data/lib/briar/keyboard/uia_keyboard_language.rb

@@ -0,0 +1,122 @@
+require 'calabash-cucumber'
+
+module Briar
+  module UIAKeyboard
+    module Language
+      # use the apple localization codes
+      BRIAR_LANGUAGE_KEYS = {
+            :en => 'space',
+            :de => 'Leerzeichen',
+            # could not decide what the language code should be (alt was ja-JP)
+            :ja => '空白'
+      }
+
+      # work in progress
+      # the number of buttons on the keyboard will be
+      # 3 <== there is no international button
+      # 4 <== there is an international button
+      def keyboard_has_international? (opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+        res = uia('UIATarget.localTarget().frontMostApp().keyboard().buttons().length')
+        button_count = res['value']
+        button_count == 4
+      end
+
+      def touch_international_key(opts={})
+        default_opts = {:await_keyboard => false,
+                        :step_pause => 0.4}
+        opts = default_opts.merge(opts)
+
+        await_keyboard if opts[:await_keyboard]
+
+        unless keyboard_has_international?
+          screenshot_and_raise 'could not find an international key on the keyboard'
+        end
+
+        # the international button will be at index 1
+        # 3 <== return key
+        # 2 <== Dictation key
+        # 1 <== International key
+        # 0 <== shift key
+        res = uia('UIATarget.localTarget().frontMostApp().keyboard().buttons()[1].tap()')
+        # sleep for a moment and let the keyboard settle into the new language
+        sleep(opts[:step_pause])
+        res
+      end
+
+
+      # work in progress
+      # when looking at elements() the space bar will be at the penultimate index
+      # when looking at keys() the space bar index seems to float around
+      def spacebar_label (opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+        elm_count = uia('UIATarget.localTarget().frontMostApp().keyboard().elements().length')['value']
+        spacebar_idx = elm_count - 2
+        res = uia("UIATarget.localTarget().frontMostApp().keyboard().elements()[#{spacebar_idx}].label()")
+        res['value']
+      end
+
+      def spacebar_has_label?(label, opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+        spacebar_label.eql?(label)
+      end
+
+      def english_keyboard? (opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+        spacebar_has_label? BRIAR_LANGUAGE_KEYS[:en]
+      end
+
+      def german_keyboard? (opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+        spacebar_has_label? BRIAR_LANGUAGE_KEYS[:de]
+      end
+
+      def romaji_keyboard? (opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+        spacebar_has_label? BRIAR_LANGUAGE_KEYS[:ja]
+      end
+
+      def touch_international_until_language(language_key, opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+
+        unless keyboard_has_international?
+          screenshot_and_raise 'keyboard does not have an international key'
+        end
+
+        target = BRIAR_LANGUAGE_KEYS[language_key]
+        if target.nil?
+          screenshot_and_raise "unknown language key '#{language_key}'"
+        end
+
+        stop_at = spacebar_label
+        return if target.eql?(stop_at)
+
+        touch_international_key
+
+        current = spacebar_label
+        loop do
+          break if current.eql?(target)
+          touch_international_key
+          current = spacebar_label
+          if current.eql?(stop_at)
+            screenshot_and_raise "could not find keyboard using key '#{language_key}' and space bar label '#{target}'"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/briar/keyboard/uia_numeric_keyboard.rb

@@ -0,0 +1,38 @@
+require 'calabash-cucumber'
+
+module Briar
+  module UIAKeyboard
+    module Numeric
+
+      def is_numeric_keyboard?(opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+        res = uia('UIATarget.localTarget().frontMostApp().keyboard().keys().length')['value']
+        res == 12
+      end
+
+      def keyboard_send_numeric_backspace(opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+        if ios7?
+          uia('UIATarget.localTarget().frontMostApp().keyboard().buttons()[0].tap()')
+        else
+          keyboard_enter_char 'Delete'
+        end
+      end
+
+      def keyboard_send_backspace(opts={})
+        default_opts = {:await_keyboard => false}
+        opts = default_opts.merge(opts)
+        await_keyboard if opts[:await_keyboard]
+        if is_numeric_keyboard?
+          keyboard_send_numeric_backspace
+        else
+          keyboard_send_backspace
+        end
+      end
+    end
+  end
+end

data/lib/briar/table.rb

@@ -260,6 +260,10 @@ module Briar
     end
 
     def query_str_for_confirm_delete_in_row(row_id, table_id=nil)
+      if device.ios5?
+        # it is not either of those...
+        pending 'cannot detect the confirm delete button (yet) in iOS 5'
+      end
       mark = device.ios7? ? 'Delete' : 'Confirm Deletion'
       "#{query_str_for_row row_id, table_id} descendant control marked:'#{mark}'"
     end

data/lib/briar/uia/briar_ipad_emulation.rb

@@ -0,0 +1,190 @@
+require 'calabash-cucumber'
+
+module Briar
+  module UIA
+    module IPadEmulation
+
+      class Cache
+        attr_accessor :device_internal
+        attr_accessor :window_index
+
+        def initialize
+          @device_internal = nil
+          @window_index = nil
+        end
+
+        def current_device
+          if device_internal.nil?
+            #noinspection RubyParenthesesAfterMethodCallInspection
+            @device_internal = device()
+          end
+          @device_internal
+        end
+
+      end
+      # use the apple localization codes
+      BRIAR_IPAD_1X_2X_BUTTON_LABELS = {
+            :en => {:emulated_1x => 'Switch to full screen mode',
+                    :emulated_2x => 'Switch to normal mode'}
+      }
+
+      def ensure_uia_and_ipad(cache=Cache.new)
+        #noinspection RubyParenthesesAfterMethodCallInspection
+        unless cache.current_device.ipad?
+          screenshot_and_raise 'this function is only for the iPad'
+        end
+
+        unless cache.current_device.ios7?
+          screenshot_and_raise 'this function only works on iOS 7'
+        end
+
+        unless uia_available?
+          screenshot_and_raise 'this function requires the app be launched with instruments'
+        end
+      end
+
+
+      def ipad_1x_2x_labels_hash(lang_code)
+        ht = BRIAR_IPAD_1X_2X_BUTTON_LABELS[lang_code]
+        if ht.nil?
+          screenshot_and_raise "did not recognize language code '#{lang_code}'"
+        end
+        ht
+      end
+
+      def ipad_1x_2x_labels_array(lang_code)
+        ht = ipad_1x_2x_labels_hash lang_code
+        [ht[:emulated_1x], ht[:emulated_2x]]
+      end
+
+      def uia_ipad_scale(opts={})
+        default_opts = {:language_code => :en,
+                        :ensure_uia_and_ipad => false,
+                        :cache => Cache.new}
+        opts = default_opts.merge(opts)
+
+        if opts[:ensure_uia_and_ipad]
+          ensure_uia_and_ipad(opts[:cache])
+          opts[:ensure_uia_and_ipad] = false
+        end
+
+
+        idx = window_index_of_ipad_1x_2x_button opts
+
+        res = uia("UIATarget.localTarget().frontMostApp().windows()[#{idx}].buttons()[0].label()")
+        val = res['value']
+
+        candidates = ipad_1x_2x_labels_array(opts[:language_code])
+
+        if val.eql?(candidates[0])
+          :emulated_1x
+        else
+          :emulated_2x
+        end
+      end
+
+
+      def is_iphone_app_emulated_on_ipad?(cache=Cache.new)
+        return false unless cache.current_device.ipad?
+        idx = window_index_of_ipad_1x_2x_button({:raise_if_not_found => false,
+                                                 :cache => cache})
+        idx != -1
+      end
+
+      def window_index_of_ipad_1x_2x_button(opts={})
+
+        default_opts = {:language_code => :en,
+                        :ensure_uia_and_ipad => false,
+                        :raise_if_not_found => true,
+                        :cache => Cache.new}
+        opts = default_opts.merge(opts)
+
+        cache = opts[:cache]
+        return cache.window_index unless cache.window_index.nil?
+
+
+        ensure_uia_and_ipad(opts[:cache]) if opts[:ensure_uia_and_ipad]
+
+        window_count = uia('UIATarget.localTarget().frontMostApp().windows().length')['value']
+        index = 0
+
+        lang_code = opts[:language_code]
+        candidates = ipad_1x_2x_labels_array(lang_code)
+        success = false
+        loop do
+          res = uia("UIATarget.localTarget().frontMostApp().windows()[#{index}].buttons()[0].label()")
+          if candidates.include?(res['value'])
+            success = true
+            break
+          end
+          index = index + 1
+          break unless index < window_count
+        end
+
+        unless success
+          if opts[:raise_if_not_found]
+            screenshot_and_raise "could not find window with button label '#{candidates[0]}' or '#{candidates[1]}' - is your an iphone app emulated on an ipad?"
+          end
+          index = -1
+        end
+        cache.window_index = index
+        index
+      end
+
+      def uia_tap_ipad_scale_button(opts={})
+        default_opts = {:language_code => :en,
+                        :ensure_uia_and_ipad => false,
+                        :step_pause_after_touch => BRIAR_STEP_PAUSE,
+                        :cache => Cache.new}
+        opts = default_opts.merge(opts)
+        ensure_uia_and_ipad(opts[:cache]) if opts[:ensure_uia_and_ipad]
+
+        idx = window_index_of_ipad_1x_2x_button(opts)
+        uia("UIATarget.localTarget().frontMostApp().windows()[#{idx}].buttons()[0].tap()")
+        sleep(opts[:step_pause_after_touch])
+      end
+
+
+      def ensure_ipad_emulation_scale(scale, opts={})
+        allowed = [:emulated_1x, :emulated_2x]
+        unless allowed.include?(scale)
+          screenshot_and_raise "'#{scale}' is not one of '#{allowed}' allowed args"
+        end
+
+        cache = Cache.new
+        #noinspection RubyParenthesesAfterMethodCallInspection
+        return unless is_iphone_app_emulated_on_ipad?(cache)
+
+        default_opts = {:language_code => :en,
+                        :ensure_uia_and_ipad => false,
+                        :step_pause_after_touch => BRIAR_STEP_PAUSE,
+                        :cache => cache}
+        opts = default_opts.merge(opts)
+
+        actual_scale = uia_ipad_scale(opts)
+
+        if actual_scale != scale
+          uia_tap_ipad_scale_button opts
+        end
+      end
+
+      def ensure_ipad_emulation_1x(opts={})
+        default_opts = {:language_code => :en,
+                        :ensure_uia_and_ipad => false,
+                        :step_pause_after_touch => BRIAR_STEP_PAUSE,
+                        :cache => Cache.new}
+        opts = default_opts.merge(opts)
+        ensure_ipad_emulation_scale(:emulated_1x, opts)
+      end
+
+      def ensure_ipad_emulation_2x(opts={})
+        default_opts = {:language_code => :en,
+                        :ensure_uia_and_ipad => false,
+                        :step_pause_after_touch => BRIAR_STEP_PAUSE,
+                        :cache => Cache.new}
+        opts = default_opts.merge(opts)
+        ensure_ipad_emulation_scale(:emulated_2x, opts)
+      end
+    end
+  end
+end

data/lib/briar/uia/briar_uia.rb

@@ -0,0 +1,51 @@
+require 'calabash-cucumber'
+
+module Briar
+  module UIA
+
+    def uia_available?
+      # proxy for testing if run_loop exists
+      not uia_not_available?
+    end
+
+    def uia_not_available?
+      default_device.nil?
+    end
+
+    def uia_handle_target_command(cmd, *query_args)
+      args = query_args.map do |part|
+        if part.is_a?(String)
+          "#{escape_uia_string(part)}"
+        else
+          "#{escape_uia_string(part.to_edn)}"
+        end
+      end
+      command = %Q[target.#{cmd}(#{args.join(', ')})]
+      if ENV['DEBUG'] == '1'
+        puts 'Sending UIA command'
+        puts command
+      end
+      s=send_uia_command :command => command
+      if ENV['DEBUG'] == '1'
+        puts 'Result'
+        p s
+      end
+      if s['status'] == 'success'
+        s['value']
+      else
+        raise s
+      end
+    end
+
+    def uia_touch_with_options(point, opts={})
+      defaults = {:tap_count => 1,
+                  :touch_count => 1,
+                  :duration => 0.0}
+      opts = defaults.merge(opts)
+      pt = "{x: #{point[:x]}, y: #{point[:y]}}"
+      args = "{tapCount: #{opts[:tap_count]}, touchCount: #{opts[:touch_count]}, duration: #{opts[:duration]}}"
+      uia_handle_target_command(:tapWithOptions, pt, args)
+    end
+
+  end
+end

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '0.1.3.b2'
+  VERSION = '0.1.3.b3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.1.3.b2
+  version: 0.1.3.b3
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
@@ -101,7 +101,6 @@ files:
 - lib/briar/bars/toolbar.rb
 - lib/briar/briar_core.rb
 - lib/briar/briar_steps.rb
-- lib/briar/briar_uia.rb
 - lib/briar/control/button.rb
 - lib/briar/control/segmented_control.rb
 - lib/briar/control/slider.rb
@@ -110,6 +109,8 @@ files:
 - lib/briar/image_view.rb
 - lib/briar/keyboard/keyboard.rb
 - lib/briar/keyboard/uia_keyboard.rb
+- lib/briar/keyboard/uia_keyboard_language.rb
+- lib/briar/keyboard/uia_numeric_keyboard.rb
 - lib/briar/label.rb
 - lib/briar/picker/date_picker.rb
 - lib/briar/picker/date_picker_core.rb
@@ -120,6 +121,8 @@ files:
 - lib/briar/table.rb
 - lib/briar/text_field.rb
 - lib/briar/text_view.rb
+- lib/briar/uia/briar_ipad_emulation.rb
+- lib/briar/uia/briar_uia.rb
 - lib/briar/version.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jmoody/briar
@@ -145,7 +148,7 @@ rubyforge_project:
 rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: briar-0.1.3.b2
+summary: briar-0.1.3.b3
 test_files:
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb

data/lib/briar/briar_uia.rb

@@ -1,98 +0,0 @@
-require 'calabash-cucumber'
-
-module Briar
-  module UIA
-
-    def uia_available?
-      # proxy for testing if run_loop exists
-      not uia_not_available?
-    end
-
-    def uia_not_available?
-      default_device.nil?
-    end
-
-    def uia_handle_target_command(cmd, *query_args)
-      args = query_args.map do |part|
-        if part.is_a?(String)
-          "#{escape_uia_string(part)}"
-        else
-          "#{escape_uia_string(part.to_edn)}"
-        end
-      end
-      command = %Q[target.#{cmd}(#{args.join(', ')})]
-      if ENV['DEBUG'] == '1'
-        puts 'Sending UIA command'
-        puts command
-      end
-      s=send_uia_command :command => command
-      if ENV['DEBUG'] == '1'
-        puts 'Result'
-        p s
-      end
-      if s['status'] == 'success'
-        s['value']
-      else
-        raise s
-      end
-    end
-
-    def uia_touch_with_options(point, opts={})
-      defaults = {:tap_count => 1,
-                  :touch_count => 1,
-                  :duration => 0.0}
-      opts = defaults.merge(opts)
-      pt = "{x: #{point[:x]}, y: #{point[:y]}}"
-      args = "{tapCount: #{opts[:tap_count]}, touchCount: #{opts[:touch_count]}, duration: #{opts[:duration]}}"
-      uia_handle_target_command(:tapWithOptions, pt, args)
-    end
-
-    def dismiss_ipad_keyboard
-      screenshot_and_raise 'cannot dismiss keyboard on iphone' if iphone?
-      screenshot_and_raise 'cannot dismiss keyboard without launching with instruments' unless uia_available?
-      send_uia_command command: "uia.keyboard().buttons()['Hide keyboard'].tap()"
-      step_pause
-    end
-
-    def make_ipad_emulation_1x
-      #irb(main):040:0> uia('UIATarget.localTarget().frontMostApp().windows()[2].buttons()[0].label()')
-      #{
-      #      "status" => "success",
-      #      "value" => "Switch to normal mode",
-      #      "index" => 21
-      #}
-      #irb(main):041:0> uia('UIATarget.localTarget().frontMostApp().windows()[2].buttons()[0].label()')
-      #{
-      #      "status" => "success",
-      #      "value" => "Switch to full screen mode",
-      #      "index" => 22
-      #}
-
-      device = device()
-      unless device.ipad?
-        pending 'this trick only works on the iPad'
-      end
-
-      unless device.ios7?
-        pending 'this trick only works on iOS 7'
-      end
-
-      unless uia_available?
-        pending 'this trick requires the app be launched with instruments'
-      end
-
-      # this only works because iPhone apps emulated on iPads in iOS 7 _always_
-      # launch at 2x
-      uia_touch_with_options({x: 738, y: 24})
-      step_pause
-    end
-
-    def ensure_ipad_emulation_1x
-      device = device()
-      if device.ipad? and device.ios7? and uia_available?
-        uia_touch_with_options({x: 738, y: 24})
-      end
-    end
-
-  end
-end