briar 0.0.8 → 0.0.9

data/briar.gemspec

@@ -14,15 +14,12 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/jmoody/briar'
   gem.license       = 'MIT'
 
-  #gem.add_runtime_dependency 'calabash-cucumber'
-  gem.add_runtime_dependency 'calabash-cucumber', '0.9.151'
-  gem.add_runtime_dependency 'rake', '10.1.0'
-  gem.add_runtime_dependency 'bundler'
-  gem.add_runtime_dependency 'lesspainful'
+  gem.add_runtime_dependency 'calabash-cucumber'
+  #gem.add_runtime_dependency 'calabash-cucumber', '0.9.159'
+  gem.add_runtime_dependency 'rake'
   gem.add_runtime_dependency 'syntax' 
   gem.add_runtime_dependency 'rspec'
 
-
   # rubymine is not picking up development dependencies in the gemspec
   #gem.add_development_dependency 'rspec'
 

data/cucumber.yml.example

@@ -1,4 +1,21 @@
-default: NO_LAUNCH=1 OS=ios5 SCREENSHOT_PATH=./cucumber-screenshots/ -f 'Slowhandcuke::Formatter' -f rerun -o rerun.txt
-slowhand: NO_LAUNCH=1 OS=ios5 SCREENSHOT_PATH=./cucumber-screenshots/ -f 'Slowhandcuke::Formatter' -f rerun -o rerun.txt
-wip: NO_LAUNCH=1 OS=ios5 SCREENSHOT_PATH=./cucumber-screenshots/ -f 'Slowhandcuke::Formatter' -f rerun -o rerun.txt --tags @wip:3 --wip --require features
+<%
+
+date = Time.now.strftime('%Y-%m-%d-%H%M-%S')
+default_report = "./reports/calabash-#{date}.html"
+
+ss_path = "#{Dir.pwd}/screenshots/"
+
+`mkdir ./screenshots` unless File.exists?("./screenshots")
+`mkdir ./reports` unless File.exists?("./reports")
+
+%>
+
+ss_path: SCREENSHOT_PATH=<%= ss_path %>
+html_report:  -f html -o <%= default_report %>
+
+uai: DEVICE_TARGET=simulator
+
+default: -p ss_path -p html_report -p uai
+
+
 

data/features/step_definitions/briar_core_steps.rb

@@ -1,4 +1,3 @@
-#include Briar::Core
 
 Then /^I should (see|not see) (?:the|) "([^\"]*)" view$/ do |visibility, view_id|
   if visibility.eql? 'see'
@@ -7,3 +6,4 @@ Then /^I should (see|not see) (?:the|) "([^\"]*)" view$/ do |visibility, view_id
     should_not_see_view view_id
   end
 end
+

data/features/step_definitions/control/button_steps.rb

@@ -1,5 +1,5 @@
 
-When /^I touch (?:the|a) "([^"]*)" button, then I should see the "([^"]*)" view$/ do |button_id, view_id|
+When /^I touch (?:the|a) "([^"]*)" button, (?:then I|I) should see (?:the|a) "([^"]*)" view$/ do |button_id, view_id|
   touch_button_and_wait_for_view button_id, view_id
 end
 

data/features/step_definitions/control/slider_steps.rb

@@ -1,7 +1,9 @@
 #include Briar::Control::Slider
 
 When /^I change the "([^"]*)" slider to (\d+)$/ do |slider_id, value|
+  wait_for_query("slider marked:'#{slider_id}'")
   change_slider_value_to slider_id, value
+  step_pause
   @slider_that_was_changed = slider_id
   @slider_new_value = value
 end

data/features/step_definitions/email_steps.rb

@@ -5,8 +5,8 @@ Then /^I should see email body that contains "([^"]*)"$/ do |text|
 end
 
 Then /^I should see email view with body that contains "([^"]*)"$/ do |text|
-  if !device.ios5?
-    warn_about_ios6_email_view
+  unless device.ios5?
+    warn_about_no_ios5_email_view
   else
     wait_for_animation
     unless email_body_contains? text
@@ -23,8 +23,8 @@ Then /^I touch the "([^"]*)" row and wait to see the email view$/ do |row_id|
     should_see_row row_id
     touch("tableViewCell marked:'#{row_id}'")
     wait_for_animation
-    if !device.ios5?
-      warn_about_ios6_email_view
+    unless device.ios5?
+      warn_about_no_ios5_email_view
     else
       should_see_mail_view
     end
@@ -34,8 +34,8 @@ Then /^I touch the "([^"]*)" row and wait to see the email view$/ do |row_id|
 end
 
 Then /^I should see email view with "([^"]*)" in the subject$/ do |text|
-  if !device.ios5?
-    warn_about_ios6_email_view
+  unless device.ios5?
+    warn_about_no_ios5_email_view
   else
     wait_for_animation
     should_see_mail_view
@@ -46,8 +46,8 @@ Then /^I should see email view with "([^"]*)" in the subject$/ do |text|
 end
 
 Then /^I should see email view with recipients? "([^"]*)"$/ do |comma_sep_addrs|
-  if !device.ios5?
-    warn_about_ios6_email_view
+  unless device.ios5?
+    warn_about_no_ios5_email_view
   else
     should_see_recipients comma_sep_addrs
   end
@@ -59,8 +59,8 @@ Then /^I should see email view with to field set to "([^"]*)"$/ do |text|
 end
 
 Then /^I should see email view with text like "([^"]*)" in the subject$/ do |text|
-  if !device.ios5?
-    warn_about_ios6_email_view
+  unless device.ios5?
+    warn_about_no_ios5_email_view
   else
     should_see_mail_view
     wait_for_animation
@@ -71,10 +71,10 @@ Then /^I should see email view with text like "([^"]*)" in the subject$/ do |tex
 end
 
 When /^I cancel email editing I should see the "([^"]*)" view$/ do |view_id|
-  if device.ios5?
+  unless device.ios5?
     delete_draft_and_wait_for view_id
   else
-    warn_about_ios6_email_view
+    warn_about_no_ios5_email_view
   end
 end
 

data/features/step_definitions/keyboard_steps.rb

@@ -36,4 +36,5 @@ Then /^I am done text editing$/ do
   else
     touch_button 'done text editing'
   end
+  2.times { step_pause }
 end

data/features/step_definitions/label_steps.rb

@@ -9,7 +9,7 @@ Then /^I should (see|not see) "([^"]*)" in label "([^"]*)"$/ do |visibility, tex
 end
 
 Then /^I should (see|not see) label "([^"]*)" with text "([^"]*)"$/ do |visibility, name, text|
-  if visibility.eql? "see"
+  if visibility.eql? 'see'
     should_see_label_with_text(name, text)
   else
     should_not_see_label_with_text(name, text)

data/features/step_definitions/picker/date_picker_steps.rb

@@ -39,9 +39,23 @@ Then /^I change the picker date time to "([^"]*)"$/ do |target_time|
 end
 
 
-Then /^I should see that the date picker is in time mode$/ do
-  unless picker_is_in_time_mode
-    screenshot_and_raise 'expected to see picker with time mode'
+Then /^I should see that the date picker is in (time|date|date and time) mode$/ do |mode|
+  if mode.eql? 'time'
+    unless picker_is_in_time_mode
+      screenshot_and_raise 'expected to see picker with time mode'
+    end
+  end
+
+  if mode.eql? 'date'
+    unless picker_is_in_date_mode
+      screenshot_and_raise 'expected to see picker with date mode'
+    end
+  end
+
+  if mode.eql? 'date and time'
+    unless picker_is_in_date_and_time_mode
+      screenshot_and_raise 'expected to see picker with date and time mode'
+    end
   end
 end
 
@@ -55,6 +69,11 @@ Then /^I should see that the "([^"]*)" row has the time I just entered in the "(
   should_see_row_has_time_i_just_entered row_id, label_id
 end
 
+When(/^I change the time on the picker to "([^"]*)", I should see the "([^"]*)" label has the correct time$/) do |time_str, label_id|
+  change_time_on_picker_with_time_str time_str
+  should_see_label_has_time_i_just_entered label_id
+end
+
 # does not require a time or date change. picker needs to be visible
 Then /^I should see that the "([^"]*)" row has the same time as the picker in the "([^"]*)" label$/ do |row_id, label_id|
   should_see_row_has_label_with_time_on_picker row_id, label_id

data/features/step_definitions/table_steps.rb

@@ -20,6 +20,7 @@ end
 
 Then /^I touch (?:the) "([^"]*)" row and wait for (?:the) "([^"]*)" view to appear$/ do |row_id, view_id|
   wait_for_row row_id
+  step_pause
   touch_row_and_wait_to_see row_id, view_id
 end
 
@@ -94,12 +95,17 @@ Then /^I should see that the text I just entered is in the "([^"]*)" row "([^"]*
 end
 
 Then /^I move the "([^"]*)" row (up|down) (\d+) times? using the reorder edit control$/ do |row_id, dir, n|
+  if device.ios7?
+    pending 'reordering on iOS 7 (more specifically playback) is not supported'
+  end
+
   should_see_row row_id
   dir_str = (dir.eql?('up')) ? 'drag_row_up' : 'drag_row_down'
-  n.to_i.times do (
-  playback(dir_str,
-           {:query => "tableViewCell marked:'#{row_id}' descendant tableViewCellReorderControl"})
-  step_pause)
+  n.to_i.times do
+    (
+    playback(dir_str,
+             {:query => "tableViewCell marked:'#{row_id}' descendant tableViewCellReorderControl"})
+    step_pause)
   end
 end
 
@@ -113,13 +119,13 @@ end
 
 Then /^I should see a "([^"]*)" button in the "([^"]*)" row$/ do |button_id, row_id|
   should_see_row row_id
-  arr = query("tableViewCell marked:'#{row_id}' descendant child tableViewCellContentView child button marked:'#{button_id}'", AI)
+  arr = query("tableViewCell marked:'#{row_id}' descendant button marked:'#{button_id}'", AI)
   (arr.length == 1)
 end
 
 Then /^I touch the "([^"]*)" button in the "([^"]*)" row$/ do |button_id, row_id|
   should_see_row row_id
-  touch("tableViewCell marked:'#{row_id}' child tableViewCellContentView child button marked:'#{button_id}'")
+  touch("tableViewCell marked:'#{row_id}' descendant button marked:'#{button_id}'")
 end
 
 Then /^I should see a switch for "([^"]*)" in the "([^"]*)" row that is in the "([^"]*)" position$/ do |switch_id, row_id, on_off|
@@ -153,3 +159,8 @@ Then /^I should see that the "([^"]*)" row has image "([^"]*)"$/ do |row_id, ima
   should_see_row_with_image row_id, image_id
 end
 
+
+Then(/^I should see that the "([^"]*)" row has no text in the "([^"]*)" label$/) do |row_id, label_id|
+  should_see_row_with_label_that_has_no_text
+end
+

data/features/step_definitions/text_view_steps.rb

@@ -1,8 +1,6 @@
-Then /^I clear text view named "([^\"]*)"$/ do |name|
-  res = query("textView marked:'#{name}'")
-  if res
-    clear_text("textView marked:'#{name}'")
-  end
+Then /^I clear (?:text|the text) view named "([^\"]*)"$/ do |name|
+  wait_for_query "textView marked:'#{name}'"
+  briar_clear_text(name)
 end
 
 Then /^I should not see "([^"]*)" text view$/ do |name|
@@ -10,11 +8,7 @@ Then /^I should not see "([^"]*)" text view$/ do |name|
 end
 
 Then /^I should see the text I just entered in the "([^"]*)" text view$/ do |text_view_id|
-  should_see_text_view text_view_id
-  text = query("textView marked:'#{text_view_id}'", :text).first
-  unless @text_entered_by_keyboard.eql? text
-    screenshot_and_raise "i expected to see '#{@text_entered_by_keyboard}' in text view '#{text_view_id}' but found '#{text}'"
-  end
+  should_see_text_view_with_text text_view_id, @text_entered_by_keyboard
 end
 
 Then /^I should see text view "([^"]*)" with placeholder text "([^"]*)"$/ do |text_view, placeholder|

data/lib/briar.rb

@@ -3,9 +3,12 @@
 DEVICE_ENDPOINT = (ENV['DEVICE_ENDPOINT'] || 'http://localhost:37265')
 TOUCH_TRANSITION_TIMEOUT = 30.0
 TOUCH_TRANSITION_RETRY_FREQ = 0.5
-BRIAR_STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.4).to_f
+BRIAR_STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
+BRIAR_WAIT_TIMEOUT = (ENV['WAIT_TIMEOUT'] || 2.0).to_f
 ANIMATION_PAUSE = (ENV['ANIMATION_PAUSE'] || 0.6).to_f
+#noinspection RubyConstantNamingConvention
 AI = :accessibilityIdentifier
+#noinspection RubyConstantNamingConvention
 AL = :accessibilityLabel
 
 require 'briar/version'
@@ -60,6 +63,12 @@ def device ()
   end
 end
 
+def uia_available?
+  launcher = Calabash::Cucumber::Launcher.launcher
+  return false if launcher.nil?
+  launcher.active?
+end
+
 #noinspection RubyDefParenthesesInspection
 def gestalt ()
   pending("deprecated 0.0.8: replaced with Calabash::Cucumber::Device implementation - from now on use use 'device.*'")

data/lib/briar/alerts_and_sheets/action_sheet.rb

@@ -33,7 +33,7 @@ module Briar
       end
     end
 
-    def wait_for_sheet (sheet_id, timeout=1.0)
+    def wait_for_sheet (sheet_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see '#{sheet_id}'"
       wait_for(:timeout => timeout,
                :retry_frequency => 0.2,
@@ -43,7 +43,7 @@ module Briar
       end
     end
 
-    def wait_for_sheet_to_disappear(sheet_id, timeout=1.0)
+    def wait_for_sheet_to_disappear(sheet_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds for '#{sheet_id}' to disappear but it is still visible"
       options = {:timeout => timeout,
                  :retry_frequency => 0.2,

data/lib/briar/alerts_and_sheets/alert_view.rb

@@ -1,27 +1,88 @@
 module Briar
   module Alerts_and_Sheets
+
+
+    # of interest
+    # touch("view:'_UIModalItemAlertContentView' descendant view:'_UIModalItemTableViewCell'  marked:'OK'")
+
     def alert_exists? (alert_id=nil)
-      if alert_id.nil?
-        !query('alertView').empty?
+      if device.ios7?
+        res = send_uia_command command:'uia.alert() != null'
+        res['value']
       else
-        !query("alertView marked:'#{alert_id}'").empty?
+        if alert_id.nil?
+          !query('alertView').empty?
+        else
+          !query("alertView marked:'#{alert_id}'").empty?
+        end
       end
     end
 
     def should_see_alert (alert_id=nil)
       unless alert_exists? alert_id
-        screenshot_and_raise "should see alert view marked '#{alert_id}'"
+        if alert_id.nil?
+          screenshot_and_raise 'should see alert view'
+        else
+          screenshot_and_raise "should see alert view marked '#{alert_id}'"
+        end
       end
     end
 
     def should_not_see_alert (alert_id=nil)
       if alert_exists? alert_id
-        screenshot_and_raise "should not see alert view marked '#{alert_id}'"
+        if alert_id.nil?
+          screenshot_and_raise 'should not see alert view'
+        else
+          screenshot_and_raise "should not see alert view marked '#{alert_id}'"
+        end
+      end
+    end
+
+    def should_see_alert_with_title (title, timeout=BRIAR_WAIT_TIMEOUT)
+      warn 'cannot distinguish between alert titles and messages'
+      if device.ios7?
+        should_see_alert()
+        if uia_query(:view, marked:"#{title}").empty?
+          screenshot_and_raise "expected to see alert with title '#{title}'"
+        end
+      else
+        qstr = 'alertView child label'
+        msg = "waited for '#{timeout}' for alert with title '#{title}'"
+        wait_for(:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg) do
+          query(qstr, :text).include?(title)
+        end
+      end
+    end
+
+    def should_see_alert_with_message (message)
+      warn 'cannot distinguish between alert titles and messages'
+      if device.ios7?
+        should_see_alert()
+        if uia_query(:view, marked:"#{message}").empty?
+          screenshot_and_raise "expected to see alert with title '#{message}'"
+        end
+      else
+        qstr = 'alertView child label'
+        msg = "waited for '#{timeout}' for alert with message '#{message}'"
+        wait_for(:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg) do
+          query(qstr, :text).include?(title)
+        end
       end
     end
 
     def alert_button_exists? (button_id)
-      query('alertView child button child label', :text).include?(button_id)
+      if device.ios7?
+        should_see_alert()
+        not uia_query(:view, marked:"#{button_id}").empty?
+      else
+        query('alertView child button child label', :text).include?(button_id)
+      end
     end
 
     def should_see_alert_button (button_id)
@@ -31,24 +92,22 @@ module Briar
     end
 
     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}'"
+      touch_alert_button(button_label)
+      if device.ios7?
+        wait_for_view_to_disappear button_label
+      else
+        wait_for_view_to_disappear 'alertView'
       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}'")
+      should_see_alert()
+      if device.ios7?
+        touch("view marked:'#{button_title}'")
+      else
+        touch("alertView child button marked:'#{button_title}'")
+      end
       step_pause
     end
   end