briar 0.0.7 → 0.0.8

data/features/step_definitions/text_field_steps.rb

@@ -21,11 +21,7 @@ Then /^I should see a clear button in the text field in the "([^"]*)" row$/ do |
 end
 
 Then /^I touch the clear button in the text field in the "([^"]*)" row$/ do |row_id|
-  query_str = "tableViewCell marked:'#{row_id}' child tableViewCellContentView child textField"
-  res = query(query_str)
-  screenshot_and_raise "expected to see text field in '#{row_id}' row" if res.empty?
-  touch("#{query_str} child button")
-  step_pause
+  touch_text_field_clear_button_in_row row_id
 end
 
 Then(/^I should see "(.*?)" text field with text "(.*?)"$/) do |text_field_id, text|

data/features/step_definitions/text_view_steps.rb

@@ -1,7 +1,7 @@
 Then /^I clear text view named "([^\"]*)"$/ do |name|
   res = query("textView marked:'#{name}'")
   if res
-    set_text("textView marked:'#{name}'", '')
+    clear_text("textView marked:'#{name}'")
   end
 end
 
@@ -34,5 +34,5 @@ end
 
 Then /^I touch text view "([^"]*)"$/ do |text_view|
   touch("textView marked:'#{text_view}'")
-  sleep(STEP_PAUSE)
+  step_pause
 end

data/install-calabash-framework.sh.example

@@ -0,0 +1,10 @@
+#!/bin/sh
+current_dir=`pwd`
+cd ~/git/calabash-ios/calabash-cucumber
+rake build_server
+cd "$current_dir"
+briar rm-cal-targets
+cp ~/git/calabash-ios/calabash-cucumber/staticlib/calabash.framework.zip ./
+rm -rf calabash.framework
+unzip calabash.framework.zip
+rm -rf calabash.framework.zip

data/lib/briar.rb

@@ -1,15 +1,18 @@
 #$:.unshift File.dirname(__FILE__)
 
 DEVICE_ENDPOINT = (ENV['DEVICE_ENDPOINT'] || 'http://localhost:37265')
-AI = :accessibilityIdentifier
 TOUCH_TRANSITION_TIMEOUT = 30.0
 TOUCH_TRANSITION_RETRY_FREQ = 0.5
+BRIAR_STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.4).to_f
+ANIMATION_PAUSE = (ENV['ANIMATION_PAUSE'] || 0.6).to_f
+AI = :accessibilityIdentifier
+AL = :accessibilityLabel
 
 require 'briar/version'
-require 'briar/gestalt'
 require 'briar/briar_core'
 
 require 'briar/alerts_and_sheets/alert_view'
+require 'briar/alerts_and_sheets/action_sheet'
 
 require 'briar/bars/tabbar'
 require 'briar/bars/navbar'
@@ -21,6 +24,8 @@ require 'briar/control/slider'
 
 require 'briar/picker/picker_shared'
 require 'briar/picker/picker'
+require 'briar/picker/date_picker_core'
+require 'briar/picker/date_picker_manipulation'
 require 'briar/picker/date_picker'
 
 require 'briar/email'
@@ -33,10 +38,31 @@ require 'briar/table'
 require 'briar/text_field'
 require 'briar/text_view'
 
+#noinspection RubyDefParenthesesInspection
+def device ()
+  url = URI.parse(ENV['DEVICE_ENDPOINT']|| 'http://localhost:37265/')
+  http = Net::HTTP.new(url.host, url.port)
+  res = http.start do |sess|
+    sess.request Net::HTTP::Get.new(ENV['CALABASH_VERSION_PATH'] || 'version')
+  end
+  status = res.code
+
+  #noinspection RubyUnusedLocalVariable
+  begin
+    http.finish if http and http.started?
+  rescue Exception => e
+    # ignored
+  end
+
+  if status=='200'
+    version_body = JSON.parse(res.body)
+    Calabash::Cucumber::Device.new(url, version_body)
+  end
+end
+
+#noinspection RubyDefParenthesesInspection
 def gestalt ()
-  uri = URI("#{DEVICE_ENDPOINT}/version")
-  res = Net::HTTP.get(uri)
-  Briar::Gestalt.new(res)
+  pending("deprecated 0.0.8: replaced with Calabash::Cucumber::Device implementation - from now on use use 'device.*'")
 end
 
 

data/lib/briar/alerts_and_sheets/action_sheet.rb

@@ -0,0 +1,99 @@
+module Briar
+  module Alerts_and_Sheets
+
+    def query_str_for_sheet(sheet_id)
+      if sheet_id
+        "actionSheet marked:'#{sheet_id}'"
+      else
+        'actionSheet'
+      end
+    end
+
+    def sheet_exists? (sheet_id)
+      !query(query_str_for_sheet sheet_id).empty?
+    end
+
+    def should_see_sheet (sheet_id, button_titles=nil, sheet_title=nil)
+      unless sheet_exists? (sheet_id)
+        screenshot_and_raise "should see sheet marked '#{sheet_id}'"
+      end
+
+      if button_titles
+        button_titles.each { |title| should_see_button_on_sheet title, sheet_id }
+      end
+
+      if sheet_title
+        should_see_sheet_title sheet_title, sheet_id
+      end
+    end
+
+    def should_not_see_sheet(sheet_id)
+      if sheet_exists? (sheet_id)
+        screenshot_and_raise "should not see sheet marked '#{sheet_id}'"
+      end
+    end
+
+    def wait_for_sheet (sheet_id, timeout=1.0)
+      msg = "waited for '#{timeout}' seconds but did not see '#{sheet_id}'"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg ) do
+        sheet_exists? sheet_id
+      end
+    end
+
+    def wait_for_sheet_to_disappear(sheet_id, timeout=1.0)
+      msg = "waited for '#{timeout}' seconds for '#{sheet_id}' to disappear but it is still visible"
+      options = {:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg}
+      wait_for(options) do
+        not sheet_exists? sheet_id
+      end
+    end
+
+    def error_msg_for_sheet_button(button_title, visible, sheet_id=nil)
+      vis_str = visible ? 'see' : 'not see'
+      sheet_str = sheet_id ? sheet_id : ''
+      "should #{vis_str} button with title '#{button_title}' on sheet '#{sheet_str}'"
+    end
+
+    def sheet_button_exists? (button_title, sheet_id=nil)
+      sheet_query = query_str_for_sheet sheet_id
+      query("#{sheet_query} child button child label", :text).include?(button_title)
+    end
+
+    def should_see_button_on_sheet(button_title, sheet_id=nil)
+      unless sheet_button_exists? button_title, sheet_id
+        screenshot_and_raise error_msg_for_sheet_button button_title, true, sheet_id
+      end
+    end
+
+    def should_not_see_button_on_sheet(button_title, sheet_id=nil)
+      if sheet_button_exists? button_title, sheet_id
+        screenshot_and_raise error_msg_for_sheet_button button_title, false, sheet_id
+      end
+    end
+
+    def should_see_sheet_title(label_title, sheet_id=nil)
+      sheet_query = query_str_for_sheet sheet_id
+      res = query("#{sheet_query} child label", :text).include?(label_title)
+      unless res
+        "should see sheet #{sheet_id ? "'#{sheet_id}'" : ''} with title '#{label_title}'"
+      end
+    end
+
+    def touch_sheet_button (button_title, sheet_id=nil)
+      sheet_query = query_str_for_sheet sheet_id
+      should_see_button_on_sheet button_title, sheet_id
+      touch("#{sheet_query} child button child label marked:'#{button_title}'")
+    end
+
+    def touch_sheet_button_and_wait_for_view(button_title, view_id, sheet_id=nil)
+      touch_sheet_button button_title, sheet_id
+      wait_for_view view_id
+    end
+  end
+end

data/lib/briar/alerts_and_sheets/alert_view.rb

@@ -1,16 +1,20 @@
 module Briar
   module Alerts_and_Sheets
-    def alert_exists? (alert_id)
-      !query("alertView marked:'#{alert_id}'").empty?
+    def alert_exists? (alert_id=nil)
+      if alert_id.nil?
+        !query('alertView').empty?
+      else
+        !query("alertView marked:'#{alert_id}'").empty?
+      end
     end
 
-    def should_see_alert (alert_id)
+    def should_see_alert (alert_id=nil)
       unless alert_exists? alert_id
         screenshot_and_raise "should see alert view marked '#{alert_id}'"
       end
     end
 
-    def should_not_see_alert (alert_id)
+    def should_not_see_alert (alert_id=nil)
       if alert_exists? alert_id
         screenshot_and_raise "should not see alert view marked '#{alert_id}'"
       end
@@ -28,7 +32,24 @@ module Briar
 
     def dismiss_alert_with_button (button_label)
       touch("alertView child button marked:'#{button_label}'")
+      wait_for_view_to_disappear 'alertView'
+    end
+
+    def should_see_alert_with_title (title)
+      unless query('alertView child label', :text).include?(title)
+        screenshot_and_raise "i do not see an alert view with title '#{title}'"
+      end
     end
 
+    def should_see_alert_with_message (message)
+      unless query('alertView descendant label', :text).include?(message)
+        screenshot_and_raise "i do not see an alert view with message '#{message}'"
+      end
+    end
+
+    def touch_alert_button(button_title)
+      touch("alertView child button marked:'#{button_title}'")
+      step_pause
+    end
   end
 end

data/lib/briar/bars/navbar.rb

@@ -19,7 +19,7 @@ module Briar
     end
 
     def navbar_has_back_button?
-          !query('navigationItemButtonView').empty?
+      !query('navigationItemButtonView').empty?
     end
 
     def should_see_navbar_back_button
@@ -37,7 +37,7 @@ module Briar
 
     # will not work to detect left/right buttons
     def index_of_navbar_button (name)
-      titles = query('navigationButton', :accessibilityLabel)
+      titles = query('navigationButton', AL)
       titles.index(name)
     end
 
@@ -58,54 +58,65 @@ module Briar
     def date_is_in_navbar (date)
       with_leading = date.strftime('%a %b %d')
       without_leading = date.strftime("%a %b #{date.day}")
-      items = query('navigationItemView', :accessibilityLabel)
+      items = query('navigationItemView', AL)
       items.include?(with_leading) || items.include?(without_leading)
     end
 
 
     def go_back_after_waiting
-      wait_for_animation
+      sleep(0.2)
+      wait_for(:timeout => 1.0,
+               :retry_frequency => 0.2) do
+        not query('navigationItemButtonView first').empty?
+      end
       touch('navigationItemButtonView first')
       step_pause
     end
 
     def go_back_and_wait_for_view (view)
-      wait_for_animation
+      sleep(0.2)
+      wait_for(:timeout => 1.0,
+               :retry_frequency => 0.2) do
+        not query('navigationItemButtonView first').empty?
+      end
+
       touch_transition('navigationItemButtonView first',
                        "view marked:'#{view}'",
                        {:timeout=>TOUCH_TRANSITION_TIMEOUT,
                         :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+      step_pause
     end
 
-    def touch_navbar_item(name)
+    def touch_navbar_item(item_name, wait_for_view_id=nil)
       wait_for(:timeout => 1.0,
                :retry_frequency => 0.4) do
-        index_of_navbar_button(name) != nil
+        (index_of_navbar_button(item_name) != nil) || button_exists?(item_name)
       end
-      wait_for_animation
-      idx = index_of_navbar_button name
+      sleep(0.2)
+      idx = index_of_navbar_button item_name
+
       if idx
         touch("navigationButton index:#{idx}")
+        unless wait_for_view_id.nil?
+          wait_for_view wait_for_view_id
+        end
         step_pause
+      elsif button_exists? item_name
+        touch_button_and_wait_for_view item_name, wait_for_view_id
       else
-        screenshot_and_raise "could not find navbar item '#{name}'"
+        screenshot_and_raise "could not find navbar item '#{item_name}'"
       end
     end
 
 
-    def touch_navbar_item_and_wait_for_view(item, view)
-      wait_for_animation
-      idx = index_of_navbar_button item
-      touch_transition("navigationButton index:#{idx}",
-                       "view marked:'#{view}'",
-                       {:timeout=>TOUCH_TRANSITION_TIMEOUT,
-                        :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+    def touch_navbar_item_and_wait_for_view(item_name, view_id)
+      touch_navbar_item item_name, view_id
     end
 
 
     def navbar_has_title? (title)
-      wait_for_animation
-      query('navigationItemView', :accessibilityLabel).include?(title)
+      sleep(0.2)
+      query('navigationItemView', AL).include?(title)
     end
 
     def should_see_navbar_with_title(title)

data/lib/briar/bars/tabbar.rb

@@ -19,20 +19,23 @@ module Briar
     end
 
     def index_of_tabbar_item(name)
-      tabs = query('tabBarButton', :accessibilityLabel)
+      tabs = query('tabBarButton', AL)
       tabs.index(name)
     end
 
-    def touch_tabbar_item(name)
+    def touch_tabbar_item(name, wait_for_view_id=nil)
+      sleep(0.2)
       wait_for(:timeout => 1.0,
                :retry_frequency => 0.4) do
         index_of_tabbar_item(name) != nil
       end
-      wait_for_animation
       should_see_tabbar
       idx = index_of_tabbar_item name
       if idx
         touch "tabBarButton index:#{idx}"
+        unless wait_for_view_id.nil?
+          wait_for_view wait_for_view_id
+        end
         step_pause
       else
         screenshot_and_raise "tabbar button with name #{name} does not exist"
@@ -41,7 +44,7 @@ module Briar
 
     def should_see_tab_at_index(name, index)
       should_see_tabbar
-      tabs = query('tabBarButton', :accessibilityLabel)
+      tabs = query('tabBarButton', AL)
       unless tabs.index(name) == index.to_i
         screenshot_and_raise "should have seen tab named '#{name}' at index '#{index}' but found these: '#{tabs}'"
       end

data/lib/briar/bars/toolbar.rb

@@ -20,7 +20,7 @@ module Briar
       #text_button_arr = query("toolbar child toolbarTextButton child button child buttonLabel", :text)
       #has_text_button = text_button_arr.index(name_or_id) != nil
       ## look for non_text button
-      #toolbar_button_arr = query("toolbar child toolbarButton", :accessibilityLabel)
+      #toolbar_button_arr = query("toolbar child toolbarButton", AL)
       #has_toolbar_button = toolbar_button_arr.index(name_or_id) != nil
       #
       #has_text_button or has_toolbar_button
@@ -32,5 +32,18 @@ module Briar
         screenshot_and_raise "could not see toolbar button with name '#{name_or_id}'"
       end
     end
+
+    def touch_toolbar_button(button_name, and_wait_for_view_id=nil)
+      should_see_toolbar_button button_name
+      if and_wait_for_view_id.nil?
+        touch("toolbar descendant view marked:'#{button_name}'")
+      else
+        touch_transition("toolbar descendant view marked:'#{button_name}'",
+                         "view marked:'#{and_wait_for_view_id}'",
+                         {:timeout=>TOUCH_TRANSITION_TIMEOUT,
+                          :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+      end
+      step_pause
+    end
   end
 end

data/lib/briar/briar_core.rb

@@ -1,12 +1,11 @@
 require 'calabash-cucumber'
 
+
 module Briar
   module Core
-    STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.4).to_f
-    ANIMATION_PAUSE = (ENV['ANIMATION_PAUSE'] || 0.6).to_f
 
     def step_pause
-      sleep(STEP_PAUSE)
+      sleep(BRIAR_STEP_PAUSE)
     end
 
     def wait_for_animation
@@ -36,15 +35,12 @@ module Briar
 
 
     def should_see_view_after_animation (view_id)
-      wait_for_animation
-      should_see_view view_id
+      pending "WARN: deprecated 0.0.8 - use 'wait_for_view #{view_id}' instead"
+
     end
 
     def should_not_see_view_after_animation (view_id)
-      wait_for_animation
-      if view_exists? view_id
-        screenshot_and_raise "should not see view with id '#{view_id}'"
-      end
+      pending "WARN: deprecated 0.0.8 - use 'wait_for_view_to_disappear #{view_id}' instead"
     end
 
     def should_see_view_with_text (text)
@@ -58,6 +54,10 @@ module Briar
       touch("view marked:'#{view_id}'")
     end
 
+    def touch_and_wait_for_view(view_id, view_to_wait_for, timeout=1.0)
+      touch_view_named(view_id)
+      wait_for_view(view_to_wait_for, timeout)
+    end
 
     def wait_for_view (view_id, timeout=1.0)
       msg = "waited for '#{timeout}' seconds but did not see '#{view_id}'"
@@ -69,18 +69,49 @@ module Briar
       end
     end
 
+    def wait_for_views(views, timeout=1.0)
+      msg = "waited for '#{timeout}' seconds but did not see '#{views}'"
+      options = {:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg}
+      wait_for(options) do
+        views.all? { |view_id| view_exists?(view_id) }
+      end
+    end
+
     def wait_for_view_to_disappear(view_id, timeout=1.0)
-      views = [view_id]
       msg = "waited for '#{timeout}' seconds for '#{view_id}' to disappear but it is still visible"
-      wait_for_elements_do_not_exist(views, {:timeout => timeout,
-                                             :retry_frequency => 0.2,
-                                             :post_timeout => 0.1,
-                                             :timeout_message => msg})
+      options = {:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg}
+      wait_for(options) do
+        not view_exists? view_id
+      end
     end
 
+
     def touch_and_wait_to_disappear(view_id, timeout=1.0)
-      touch("view marked:'#{view_id}'")
+      touch_view_named(view_id)
       wait_for_view_to_disappear view_id, timeout
     end
+    
+    # backdoor helpers
+    # canonical backdoor command: 'calabash_backdoor_handle_command'
+    # selector key = :selector
+    # args key = :args
+    def send_backdoor_command(command, args=[])
+      if args.empty?
+        json = "{\":selector\" : \"#{command}\"}"
+        return backdoor('calabash_backdoor_handle_command:', json)
+      end
+
+      array = args.kind_of?(Array) ? args : [args]
+      json = "{\":selector\" : \"#{command}\", \":args\" : #{array}}"
+      backdoor('calabash_backdoor_handle_command:', json)
+    end
   end
 end
+
+