briar 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjI4ZTI0ZWZlZWJkMTdlYmIwYjY5ZmVlY2IwYjJkZmU1M2I1YjgzOA==
+    YWQxYjFjZTk0YzdhM2U1ZDE1OGNhMGJiMTM1YzdiM2ViNDJjN2I3Ng==
   data.tar.gz: !binary |-
-    NWU2YTZhOGM4YmFjNjg5ZDdjOGNhOGQ3NDY2MjQxNGIyNjRkMjhmZQ==
+    YzUwZTIwMzg1YjRlMjllYjhiZDhiNzkzYzcyZTliOWI3ZDYzNWM3Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDhhZjU2OGZhNzFhMWU3MDMzNWIyNjgxYjMwNTNlZTE2ZjU5NzExYjQ3Mzc5
-    YTk5ZjQyZDhjNGE3YmYzNzI0Nzc1ZDY3ODg4MDRjYjNkM2I0OTNmMGRkMzMw
-    M2UzZGM3ZTY0YWEzNDllYTU2NTg0N2UzNmQwODY2NjU4YjBjZjA=
+    MTc4NzUwMzUxYjc3OTkwOGYxNjdhNWEwZDYwZTQ3OGM3ZDFmODlhM2Q5Nzg4
+    ZGVjZTJhMWU3NDcxMGIxNzExMzk3MzFiNDE4OTUzNjYxMTM0MzkxY2ViY2Zk
+    YTIzNTU4MDBhOWE5NWQ1NTM2ZDBjZjQzNzMyMjlkZjMxZGM3ZjA=
   data.tar.gz: !binary |-
-    ZmY3OTgzMjlhYzRmNDU1MzdkZGU2MDY1OThiOGI0NmU4YTJkZGRiZTRmMjIz
-    ZWIxMjQ3MDRhN2NiMjRhODg0MmM2YTBjYmQ2YjU3MGEyOWQ2ZTA5MjExM2U3
-    ZGRjYWRjNTRhZjU0ZWFhMmQyNmJkNzcxZDQyYWY2MDVjNjhlNmI=
+    YjA3YTRhNTFlODZlMGU1ODJhMzMzM2Q1ZTZhYjg0ZWUxN2E4ZmQ4ZTI2YzE4
+    OGRiMTA4YjM4MDZiZWRkZjE3MjdlMzI0OWM3MDRjOGUyMjk1MThkYzYxNWFi
+    NGY3NTg3OWZkOTNmOTk5MWU0N2Y2ZWQxMGM3YzQ3YjUzMDFmMzM=

data/Rakefile

@@ -5,14 +5,9 @@ task :show_simulator do
   sh "/usr/bin/osascript -e 'tell application \"RubyMine\" to activate'"
 end
 
-#task :gem do
-#  sh 'rm -f *.gem'
-#  sh 'gem build briar.gemspec --verbose'
-#  sh "gem install briar-#{Briar::VERSION}.gem"
-#end
-#
-#task :push do
-#  sh 'gem update'
-#  sh 'gem build briar.gemspec'
-#  sh "gem push briar-#{Briar::VERSION}.gem"
-#end
+# let us try to use gem_tasks
+#$ rake -T
+#rake build    # Build briar-0.0.7.gem into the pkg directory.
+#rake install  # Build and install briar-0.0.7.gem into system gems.
+#rake release  # Create tag v0.0.7 and build and push briar-0.0.7.gem to Rubygems
+

data/bin/briar

@@ -38,6 +38,64 @@ elsif cmd == BRIAR_RM_CAL_TARGETS
     FileUtils.rm_r path
   end
 
+elsif cmd == BRIAR_INSTALL_CALABASH_GEM
+  puts 'will install calabash-cucumber gem'
+  gem_dir = "#{ENV['HOME']}/git/calabash-ios/calabash-cucumber"
+  unless File.exists?(gem_dir)
+    puts "expected gem '#{gem_dir}' - cannot install the calabash-cucumber gem"
+    exit 1
+  end
+  system("cd #{gem_dir}; rake install")
+
+elsif cmd == BRIAR_INSTALL_GEM
+    puts 'will install briar gem'
+  gem_dir = "#{ENV['HOME']}/git/briar"
+  unless File.exists?(gem_dir)
+    puts "expected gem '#{gem_dir}' - cannot install the briar gem"
+    exit 1
+  end
+  system("cd #{gem_dir}; rake install")
+
+elsif cmd == BRIAR_INSTALL_CALABASH_SERVER
+  puts 'will install calabash-ios server'
+  cal_framework = 'calabash.framework'
+  unless File.exists?(cal_framework)
+    puts "expected '#{cal_framework}' to be in the local directory."
+    puts "run this command in the directory that contins '#{cal_framework}'"
+    exit 1
+  end
+  
+  gem_dir = "#{ENV['HOME']}/git/calabash-ios/calabash-cucumber"
+  unless File.exists?(gem_dir)
+    puts "expected gem '#{gem_dir}' - cannot install the calabash server"
+    exit 1
+  end
+
+  server_dir = "#{ENV['HOME']}/git/calabash-ios-server"
+  unless File.exists?(server_dir)
+    puts "expected calabash-ios server to be in dir '#{server_dir}'"
+    puts "will not be able run '#{gem_dir}/rake build_server'"
+    exit 1
+  end
+
+  version_file = File.read("#{server_dir}/calabash/Classes/FranklyServer/Routes/LPVersionRoute.h")
+  tokens = version_file.split(/define kLPCALABASHVERSION/)
+  line = tokens[1].split("\n").first
+  version = line.tr('^A-Za-z0-9.\-\_', '')
+
+  puts "building calabash server using 'rake build_server'"
+  system("cd #{gem_dir}; rake build_server")
+  puts 'remove old cal simulator targets'
+  system('briar rm-cal-targets')
+  puts 'copying new framework to ./'
+  system("cp #{gem_dir}/staticlib/#{cal_framework}.zip ./")
+  puts 'removing old framework'
+  system("rm -rf #{cal_framework}")
+  puts 'unzipping new framework'
+  system("unzip #{cal_framework}.zip")
+  puts 'cleaning up'
+  system("rm -rf #{cal_framework}.zip")
+  puts "installed new server version '#{version}'"
 else
   print_usage
   exit 1

data/bin/briar_helpers.rb

@@ -1,14 +1,40 @@
 require 'briar'
 
 BRIAR_RM_CAL_TARGETS='rm-cal-targets'
+BRIAR_INSTALL_CALABASH_GEM='install-calabash-gem'
+BRIAR_INSTALL_CALABASH_SERVER='install-calabash-server'
+BRIAR_INSTALL_GEM='gem'
 
 def print_usage
   puts <<EOF
   briar #{Briar::VERSION}
-  Usage: briar #{BRIAR_RM_CAL_TARGETS}
-    WARN: this is a destructive operation! you have been warned.
+
+  briar #{BRIAR_RM_CAL_TARGETS}
+    WARN: this is a destructive operation!
+          * deletes all *-cal targets from simulator
+          you have been warned.
     searches the ~/Library/Application Support/iPhone Simulator for *-cal.app
     targets and deletes the enclosing directory.  useful for clearing out old
     calabash targets when the framework needs to be updated.
+
+  briar #{BRIAR_INSTALL_GEM}
+    looks for ~/git/briar and runs 'rake install'. useful for developing and
+    testing the briar gem
+
+  briar #{BRIAR_INSTALL_CALABASH_GEM}
+    looks for ~/git/calabash-ios/calabash-cucumber directory and runs
+    'rake install' to install the calabash-cucumber gem.  useful for developing
+    and testing the calabash-cucumber gem.
+
+  briar #{BRIAR_INSTALL_CALABASH_SERVER}
+    WARN: this is a destructive operation!
+          * replaces calabash.framework in current directory
+          * deletes all *-cal targets from simulator
+          you have been warned.
+
+    builds and installs the calabash server using calabash-cucumber rake task
+    'rake rake build_server', removes all *-cal targets from simulator, and
+    replaces calabash.framework in local directory.  useful for developing and
+    testing the calabash-ios-server.
 EOF
 end

data/briar.gemspec

@@ -14,8 +14,9 @@ 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 'rake', '10.0.3'
+  #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 'syntax' 

data/features/step_definitions/alerts_and_sheets/action_sheet_steps.rb

@@ -1,6 +1,12 @@
 Then /^I touch the "([^"]*)" button on the action sheet$/ do |button_title|
-  wait_for_animation
-  wait_for_animation
-  touch("actionSheet child button marked:'#{button_title}'")
-  wait_for_animation
+  timeout = 1.0
+  msg = "waited for '#{timeout}' seconds but did not see sheet with button '#{button_title}'"
+  options = {:timeout => timeout,
+             :retry_frequency => 0.2,
+             :post_timeout => 0.1,
+             :timeout_message => msg}
+  wait_for(options) do
+    not query('actionSheet').empty?
+  end
+  touch_sheet_button button_title
 end

data/features/step_definitions/alerts_and_sheets/alert_view_steps.rb

@@ -3,20 +3,13 @@ Then /^I should see alert with "([^"]*)" button$/ do |button_id|
 end
 
 Then /^I should see alert with title "([^"]*)"$/ do |title|
-  unless query('alertView child label', :text).include?(title)
-    screenshot_and_raise "i do not see an alert view with title '#{title}'"
-  end
+  should_see_alert_with_title title
 end
 
 Then /^I should see alert with message "([^"]*)"$/ do |message|
-  unless query('alertView child label', :text).include?(message)
-    screenshot_and_raise "i do not see an alert view with message '#{message}'"
-  end
+  should_see_alert_with_message message
 end
 
 Then /^I should not see an alert$/ do
-  res = query('alertView')
-  unless res.empty?
-    screenshot_and_raise "i expected to see no alert view, but found '#{res}'"
-  end
+  should_not_see_alert
 end

data/features/step_definitions/bars/navbar_steps.rb

@@ -40,15 +40,7 @@ Then /^I should (not see|see) (?:the|an?) "([^"]*)" button in the navbar$/ do |v
 end
 
 When /^I touch the "([^"]*)" navbar button, then I should see the "([^"]*)" view$/ do |button_name, view_id|
-  idx = index_of_navbar_button button_name
-  if idx
-    touch_transition("navigationButton index:#{idx}",
-                     "view marked:'#{view_id}'",
-                     {:timeout=>TOUCH_TRANSITION_TIMEOUT,
-                      :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
-  else
-    screenshot_and_raise "could not find navbar item '#{button_name}'"
-  end
+  touch_navbar_item_and_wait_for_view button_name, view_id
 end
 
 Then /^I go back after waiting$/ do

data/features/step_definitions/bars/tabbar_steps.rb

@@ -6,7 +6,7 @@ end
 
 Then /^the tabbar is visible$/ do
   pending "deprecated 0.0.5 - use 'Then I should see the tabbar'"
-  macro 'that the tabbar is visible'
+  should_see_tabbar
 end
 
 
@@ -23,9 +23,7 @@ Then /I touch (?:the) "([^"]*)" tab$/ do |name|
 end
 
 When /^I touch the "([^"]*)" tab I should see the "([^"]*)" view$/ do |tab_label, view_id|
-  should_see_tabbar
-  touch_tabbar_item tab_label
-  should_see_view_after_animation view_id
+  touch_tabbar_item tab_label, view_id
 end
 
 Then /^I should see "([^"]*)" tabs$/ do |list_of_tabs|

data/features/step_definitions/bars/toolbar_steps.rb

@@ -1,17 +1,8 @@
-#include Briar::Bars
-#include Briar::Core
-
 Then /^I touch the "([^"]*)" toolbar button$/ do |name|
-  should_see_toolbar_button name
-  touch("toolbar descendant view marked:'#{name}'")
-  step_pause
+  touch_toolbar_button name
 end
 
 When /^I touch the "([^"]*)" toolbar button, then I should see the "([^"]*)" view$/ do |button_name, view_id|
-  should_see_toolbar_button button_name
-  touch_transition("toolbar descendant view marked:'done with info'",
-                     "view marked:'#{view_id}'",
-                     {:timeout=>TOUCH_TRANSITION_TIMEOUT,
-                      :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+  touch_toolbar_button button_name, view_id
 end
 

data/features/step_definitions/control/button_steps.rb

@@ -1,16 +1,10 @@
 
 When /^I touch (?:the|a) "([^"]*)" button, then I should see the "([^"]*)" view$/ do |button_id, view_id|
-  touch_transition("button marked:'#{button_id}'",
-                   "view marked:'#{view_id}'",
-                   {:timeout=>TOUCH_TRANSITION_TIMEOUT,
-                    :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+  touch_button_and_wait_for_view button_id, view_id
 end
 
 Then /^I touch (?:the|a) "([^"]*)" button and wait for (?:the|a) "([^"]*)" view$/ do |button_id, view_id|
-  touch_transition("button marked:'#{button_id}'",
-                   "view marked:'#{view_id}'",
-                   {:timeout=>TOUCH_TRANSITION_TIMEOUT,
-                    :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+  touch_button_and_wait_for_view button_id, view_id
 end
 
 Then /^I should see (?:the|a) "([^"]*)" button has title "([^"]*)"$/ do |button_id, title|
@@ -19,6 +13,7 @@ end
 
 # as of 0.9.136 - I should (not)? see a ... button
 #  conflicts with calabash predefined steps
+#Then /^I should( not)? see (?:the|an?) "([^"]*)" button$/ do |visibility, button_id|
 Then /^I should( not)? see (?:the|an) "([^"]*)" button$/ do |visibility, button_id|
   visibility ? should_not_see_button(button_id) : should_see_button(button_id)
 end

data/features/step_definitions/control/segmented_control_steps.rb

@@ -1,85 +1,47 @@
-#include Briar::Control::Segmented_Control
 
-Then /^I should see segmented control "([^"]*)" with titles "([^"]*)"$/ do |control_name, titles|
-  @control_name = control_name
-  should_see_view control_name
-  tokens = titles.split(",")
-  tokens.each do |token|
-    token.strip!
-  end
-  idx = index_of_control_with_name control_name
-  if idx
-    actual_titles = query("segmentedControl index:#{idx} child segment child segmentLabel", :text).reverse
-    counter = 0
-    tokens.zip(actual_titles).each do |expected, actual|
-      unless actual.eql? expected
-        screenshot_and_raise "when inspecting #{control_name} i expected title: #{expected} but found: #{actual} at index #{counter}"
-      end
-      counter = counter + 1
-    end
-  else
-    screenshot_and_raise "could not find segmented control with name #{control_name}"
-  end
+Then /^I should see segmented control "([^"]*)" with titles "([^"]*)"$/ do |control_id, titles|
+  should_see_control_with_segment_titles control_id, titles
 end
 
-Then /^I touch segment "([^"]*)" in segmented control "([^"]*)"$/ do |segment_name, control_name|
-  @segment_name = segment_name
-  @control_name = control_name
-  idx = index_of_control_with_name control_name
-  if idx
-    touch("segmentedControl index:#{idx} child segment child segmentLabel marked:'#{segment_name}'")
-    wait_for_animation
-  else
-    screenshot_and_raise "could not find segmented control with name #{control_name}"
-  end
+Then /^I touch segment "([^"]*)" in segmented control "([^"]*)"$/ do |segment_id, control_id|
+  touch_segment segment_id, control_id
 end
 
 
-Then /^I should see segment "([^"]*)" in segmented control "([^"]*)" (is|is not) selected$/ do |segment_name, control_name, selectedness|
-  @segment_name = segment_name
-  @control_name = control_name
-  control_idx = index_of_control_with_name control_name
-  if control_idx
-    segment_idx = index_of_segment_with_name_in_control_with_name(segment_name, control_name)
-    if segment_idx
-      selected_arr = query("segmentedControl index:#{control_idx} child segment", :isSelected).reverse
-      res = selected_arr[segment_idx]
-      target = selectedness.eql?("is") ? 1 : 0
-      unless res.to_i == target
-        screenshot_and_raise "found segment named #{segment_name} in  #{control_name}, but it was _not_ selected"
-      end
-    else
-      screenshot_and_raise "could not find #{segment_name} in #{control_name}"
-    end
-  else
-    screenshot_and_raise "could not find control named #{control_name}"
-  end
+Then /^I should see segment "([^"]*)" in segmented control "([^"]*)" (is|is not) selected$/ do |segment_id, control_id, selectedness|
+  should_see_segment_with_selected_state control_id, segment_id, selectedness.eql?('is') ? 1 : 0
 end
 
 Then /^I should see the segment I touched (is|is not) selected and the "([^"]*)" should be set correctly$/ do |selectedness, label_id|
   @associated_label = label_id
-  wait_for_animation
-  macro %Q|I should see segment "#{@segment_name}" in segmented control "#{@control_name}" #{selectedness} selected|
-  macro %Q|I should see label "#{label_id}" with text "#{@segment_name}"|
+  should_see_segment_with_selected_state @control_id, @segment_id, selectedness.eql?('is') ? 1 : 0
+  # unexpected!
+  # this is a label outside the control that is set by touching the segment
+  # not so good because it conflates segment_id and the title of the segment
+  should_see_label_with_text label_id, @segment_id
 end
 
 Then /^I touch the segment again$/ do
-  macro %Q|I touch segment "#{@segment_name}" in segmented control "#{@control_name}"|
+  touch_segment @segment_id, @control_id
 end
 
 Then /^I should see the segment is not selected and the detail label is cleared$/ do
-  macro %Q|I should see segment "#{@segment_name}" in segmented control "#{@control_name}" is not selected|
+  # ugh - that @associated_label variable needs to be set
+  macro %Q|I should see segment "#{@segment_id}" in segmented control "#{@control_id}" is not selected|
   macro %Q|I should see label "#{@associated_label}" with text ""|
 end
 
 Then /^I should see the segment I touched (is|is not) selected and the "([^"]*)" in the "([^"]*)" row should be set correctly$/ do |selectedness, label_id, row_id|
+  # ugh - that @associated_label variable needs to be set
   @associated_label = label_id
   @associated_row = row_id
-  macro %Q|I should see segment "#{@segment_name}" in segmented control "#{@control_name}" #{selectedness} selected|
-  should_see_row_with_label_with_text @associated_row, @associated_label, "#{@segment_name}"
+  macro %Q|I should see segment "#{@segment_id}" in segmented control "#{@control_id}" #{selectedness} selected|
+  should_see_row_with_label_with_text @associated_row, @associated_label, "#{@segment_id}"
 end
 
 Then /^I should see the segment is not selected and the label in the row is cleared$/ do
-  macro %Q|I should see segment "#{@segment_name}" in segmented control "#{@control_name}" is not selected|
+  # ugh - difficult to extract to a function because we need the
+  # @associated_row and @associated_label to be set
+  macro %Q|I should see segment "#{@segment_id}" in segmented control "#{@control_id}" is not selected|
   should_see_row_with_label_with_text @associated_row, @associated_label, ""
 end

data/features/step_definitions/email_steps.rb

@@ -5,9 +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 gestalt.is_ios6?
+  if !device.ios5?
     warn_about_ios6_email_view
-    puts 'WARN: iOS6 detected - cannot test for email views on iOS simulator or devices'
   else
     wait_for_animation
     unless email_body_contains? text
@@ -24,7 +23,7 @@ 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 gestalt.is_ios6?
+    if !device.ios5?
       warn_about_ios6_email_view
     else
       should_see_mail_view
@@ -35,7 +34,7 @@ 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 gestalt.is_ios6?
+  if !device.ios5?
     warn_about_ios6_email_view
   else
     wait_for_animation
@@ -47,7 +46,7 @@ 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 gestalt.is_ios6?
+  if !device.ios5?
     warn_about_ios6_email_view
   else
     should_see_recipients comma_sep_addrs
@@ -60,7 +59,7 @@ 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 gestalt.is_ios6?
+  if !device.ios5?
     warn_about_ios6_email_view
   else
     should_see_mail_view
@@ -72,7 +71,11 @@ 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|
-  delete_draft_and_wait_for view_id
+  if device.ios5?
+    delete_draft_and_wait_for view_id
+  else
+    warn_about_ios6_email_view
+  end
 end
 
 Given(/^we are testing on the simulator or a device configured to send emails$/) do