briar 0.1.2 → 0.1.3.b1

data/lib/briar/keyboard/uia_keyboard.rb

@@ -0,0 +1,172 @@
+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')
+    end
+
+    def uia_await_keyboard(opts={})
+      default_opts = {:timeout => BRIAR_WAIT_TIMEOUT,
+                      :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                      :post_timeout => BRIAR_WAIT_STEP_PAUSE}
+      opts = default_opts.merge(opts)
+      unless opts[:timeout_message]
+        msg = "waited for '#{opts[:timeout]}' for keyboard"
+        opts[:timeout_message] = msg
+      end
+
+      wait_for(opts) do
+        uia_keyboard_visible?
+      end
+
+    end
+
+  end
+end

data/lib/briar/label.rb

@@ -1,3 +1,5 @@
+require 'calabash-cucumber'
+
 module Briar
   module Label
     def label_exists? (name)
@@ -32,9 +34,9 @@ module Briar
     def wait_for_label (label_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see label '#{label_id}'"
       wait_for(:timeout => timeout,
-               :retry_frequency => BRIAR_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
-               :timeout_message => msg ) do
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
+               :timeout_message => msg) do
         label_exists? label_id
       end
     end

data/lib/briar/picker/date_picker.rb

@@ -1,3 +1,4 @@
+require 'calabash-cucumber'
 =begin
 
 examples

data/lib/briar/picker/date_picker_core.rb

@@ -1,3 +1,5 @@
+require 'calabash-cucumber'
+
 UIDatePickerModeTime = 0
 UIDatePickerModeDate = 1
 UIDatePickerModeDateAndTime = 2
@@ -32,9 +34,7 @@ module Briar
 
       def should_see_date_picker (picker_id=nil)
         query_str = query_string_for_picker picker_id
-        if query(query_str).empty?
-          screenshot_and_raise "should see picker with query '#{query_str}'"
-        end
+        wait_for_query query_str
         query_str
       end
 
@@ -145,7 +145,7 @@ module Briar
 
       # funky little bugger - used to change a picker to the nearest minute
       # based on the minute interval
-      def time_hash_by_add_minutes_until_at_closest_interval (time_str, interval=picker_minute_interval())
+      def time_hash_by_add_minutes_until_at_closest_interval (time_str, interval=picker_minute_interval)
         screenshot_and_raise "interval '#{interval}' is not on (0, 59) which is not allowed" unless (0..59).member?(interval)
         time = Time.parse(time_str)
         # normalize to zero

data/lib/briar/picker/date_picker_manipulation.rb

@@ -1,3 +1,4 @@
+require 'calabash-cucumber'
 require 'date'
 
 =begin

data/lib/briar/scroll_view.rb

@@ -1,4 +1,4 @@
-require "calabash-cucumber"
+require 'calabash-cucumber'
 
 module Briar
   module ScrollView

data/lib/briar/table.rb

@@ -1,3 +1,5 @@
+require 'calabash-cucumber'
+
 module Briar
   #noinspection ALL
   module Table
@@ -32,11 +34,6 @@ module Briar
       res.first.eql? success_value
     end
 
-    #noinspection RubyUnusedLocalVariable
-    def row_exists? (row_id, table_id = nil)
-      pending "deprecated 0.0.8 - use 'row_visible?' instead"
-    end
-
     def row_visible? (row_id, table_id = nil)
       query_str = query_str_for_row row_id, table_id
       !query(query_str, AI).empty?
@@ -86,8 +83,8 @@ module Briar
       timeout = options[:timeout] || BRIAR_WAIT_TIMEOUT
       msg = "waited for '#{timeout}' seconds but did not see row '#{query_str}' with query '#{query_str}'"
       wait_for(:timeout => timeout,
-               :retry_frequency => BRIAR_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         row_visible? row_id, table_id
       end
@@ -160,12 +157,25 @@ module Briar
       step_pause
     end
 
-    def briar_scroll_to_row_and_touch (row_id, wait_for_view=nil)
-      briar_scroll_to_row(row_id)
-      if wait_for_view.nil?
+    def briar_scroll_to_row_and_touch (row_id, opts={})
+      if (not opts.is_a?(Hash)) and (not opts.nil?)
+        warn "WARN: deprecated 0.1.3 - you should no longer pass a view_id '#{opts}' as an arg, pass opts hash instead"
+        opts = {:wait_for_id => opts}
+      end
+
+      default_opts = {:wait_for_id => nil,
+                      :table_id => nil,
+                      :timeout => BRIAR_WAIT_TIMEOUT}
+      opts = default_opts.merge(opts)
+      table_id = opts[:table_id]
+      wait_for_id = opts[:wait_for_id]
+      timeout = opts[:timeout]
+      briar_scroll_to_row(row_id, table_id)
+      if wait_for_id.nil?
         touch_row row_id
       else
-        touch_row_and_wait_to_see row_id, wait_for_view
+        touch_row_and_wait_to_see row_id, wait_for_id, {:timeout => timeout,
+                                                        :table_id => table_id}
       end
     end
 
@@ -196,10 +206,20 @@ module Briar
     end
 
 
-    def touch_row_and_wait_to_see(row_id, view, table_id = nil)
-      should_see_row row_id, table_id
-      touch_row row_id, table_id
-      wait_for_view view, 3.0
+    def touch_row_and_wait_to_see(row_id, view, opts={})
+      if (not opts.is_a?(Hash)) and (not opts.nil?)
+        deprecated('0.1.3',
+                   "you should no longer pass a table_id '#{opts}' as an arg, pass opts hash instead",
+                   :warn)
+        opts = {:table_id => opts}
+      end
+
+      default_opts = {:table_id => nil,
+                      :timeout => BRIAR_WAIT_TIMEOUT}
+      opts = default_opts.merge(opts)
+      should_see_row row_id, opts[:table_id]
+      touch_row row_id, opts[:table_id]
+      wait_for_view view, opts[:timeout]
     end
 
     def table_exists? (table_name)
@@ -245,12 +265,16 @@ module Briar
     end
 
     def should_see_delete_confirmation_in_row(row_id, table_id=nil)
+      if ios7?
+        pending 'cannot detect delete confirmation in iOS 7'
+      end
+
       query_str = query_str_for_confirm_delete_in_row(row_id, table_id)
       timeout = 5
       msg = "waited for '#{timeout}' seconds but did not see 'Delete' confirmation in row '#{row_id}'"
       wait_for(:timeout => timeout,
-               :retry_frequency => BRIAR_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         element_exists query_str
       end
@@ -315,7 +339,9 @@ module Briar
     def should_see_switch_in_row_with_state (switch_id, row_id, state, opts={})
 
       if (not opts.is_a?(Hash)) and (not opts.nil?)
-        warn "WARN: deprecated 0.1.1 - you should no longer pass a table_id '#{table_id}' at an arg, pass opts hash instead"
+        deprecated('0.1.1',
+                   "you should no longer pass a table_id '#{opts}' as an arg, pass opts hash instead",
+                   :warn)
         opts = {:table_id => opts}
       end
 
@@ -381,9 +407,11 @@ module Briar
     end
 
     def touch_switch_in_row (switch_id, row_id, opts={})
-      if (not opts.is_a?(Hash)) and (not table_id.nil?)
-        warn "WARN: deprecated 0.1.1 - passing a table_id '#{table_id}' has been deprecated pass a hash instead"
-        opts = {:table_id => table_id}
+      if (not opts.is_a?(Hash)) and (not opts.nil?)
+        deprecated('0.1.1',
+                   "you should no longer pass a table_id '#{opts}' pass a hash instead",
+                   :warn)
+        opts = {:table_id => opts}
       end
 
       default_opts = {:table_id => nil,

data/lib/briar/text_field.rb

@@ -31,6 +31,11 @@ module Briar
       end
     end
 
+    def clear_text_field_with_button(text_field_id)
+      should_see_clear_button_in_text_field text_field_id
+      touch("textField marked:'#{text_field_id}' child button")
+    end
+
     def should_see_clear_button_in_text_field (text_field_id)
       unless button_in_text_field_is_clear? text_field_id
         screenshot_and_raise "expected to see clear button in text field #{text_field_id}"

data/lib/briar/text_view.rb

@@ -1,5 +1,4 @@
-require "calabash-cucumber"
-
+require 'calabash-cucumber'
 module Briar
   module TextView
     def text_view_exists? (view_id)
@@ -9,8 +8,8 @@ module Briar
     def wait_for_text_view(view_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see '#{view_id}'"
       wait_for(:timeout => timeout,
-               :retry_frequency => BRIAR_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         text_view_exists? view_id
       end
@@ -19,8 +18,8 @@ module Briar
     def wait_for_text_view_to_disappear(view_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds for '#{view_id}' to disappear but it is still visible"
       options = {:timeout => timeout,
-                 :retry_frequency => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg}
       wait_for(options) do
         not text_view_exists? view_id
@@ -35,11 +34,11 @@ module Briar
       wait_for_text_view_to_disappear(view_id, timeout)
     end
 
-    def should_see_text_view_with_text(view_id, text)
+    def should_see_text_view_with_text(view_id, text=@text_entered_by_keyboard)
       should_see_text_view view_id
       actual = query("textView marked:'#{view_id}'", :text).first
-      unless @text_entered_by_keyboard.eql?(actual)
-        screenshot_and_raise "i expected to see '#{@text_entered_by_keyboard}' in text view '#{view_id}' but found '#{actual}'"
+      unless text.eql?(actual)
+        screenshot_and_raise "i expected to see '#{text}' in text view '#{view_id}' but found '#{actual}'"
       end
     end
   end

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '0.1.2'
+  VERSION = '0.1.3.b1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3.b1
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
@@ -108,7 +108,8 @@ files:
 - lib/briar/cucumber.rb
 - lib/briar/email.rb
 - lib/briar/image_view.rb
-- lib/briar/keyboard.rb
+- lib/briar/keyboard/keyboard.rb
+- lib/briar/keyboard/uia_keyboard.rb
 - lib/briar/label.rb
 - lib/briar/picker/date_picker.rb
 - lib/briar/picker/date_picker_core.rb
@@ -137,15 +138,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: briar-0.1.2
+summary: briar-0.1.3.b1
 test_files:
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb