briar 0.0.9 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGUwMTZlM2YwODZmMTIwMzI3YjBiYWIzYjcwNGRiYjcxMzRmNjQ2NQ==
+    MmNiZGVhYTAwYTllYWE2NGU1Njg2MmY2NThhN2MyOGE2MTRlMjk0Zg==
   data.tar.gz: !binary |-
-    YjM4NWExMzEyNGU3Nzk3MWFlZjdhYmRkYTg5ZWExOWFhNzZjODA5MA==
+    M2U0ZWJkNDBmZjljNzJiZTM3ZmY3ZWVjZTViNGY0NDdhY2VmMmI1YQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGQ3NmUzYTQwY2M0YzU4Y2Q0OThhMDIzYWVlNzU0NTA5MDZlOWIxYmQ4OWQz
-    YzQ3YmI1NDg3OWRiMGRlYjQ5ZmRkODU0MmViMDE4YWNkMTg5NWRhYTZjZmI0
-    NmE5MzNhMGVmNDc3YTE5YjdiMmZkYjZhOTc0NmY1YWM3MDM5Njc=
+    NThkZDk3YjUxNDI1MGE4NWRiZDdlMWVkZjcwYzcyMGE3NDU1MTY2ZmI4Yzcz
+    MjM1Njk0NDMzZDY2YmVhYWIwNjdjZTM3MjRlMWFkMzZmM2FlYmZjOTRmMTFi
+    MTYwYWM4MmE3Y2Q4ZGViMDI4OGYxMTNlZjYwN2ZlMWE4M2MwMTI=
   data.tar.gz: !binary |-
-    YTNhNGQ1OTg3NjFlNmMzNGI3NjBiOWUwZDE1MzZjNmZhYmI3ODc1MDUzNGVk
-    Yzg2NDNmZTFhNzU2ODFmMmNmNTVmMDYwOWNjNGJkYjZlOGMzZTRjZTMzNTVl
-    YWIzMWE5MjkzMDIwYzNlNWYwMjhlMjYyOTU2YTY1NThkNjc1MTQ=
+    Mjc5MjIyYzQwY2ZkZGMyZjU3NGQyNDIwM2EwZGY2MzMxMmJhZmYzYTAzMDJk
+    ZWM0NDlmOTg0NmU5NmFlN2ViNjRkYjRiZWNhYzlmOGIwM2FmN2UxMDM5YjRi
+    Y2E0OGY3ZWRhMDBjYzliZWYxM2Y0YTE1OTQ0MTc2ZjYyYTBiZDM=

data/features/step_definitions/email_steps.rb

@@ -5,7 +5,7 @@ Then /^I should see email body that contains "([^"]*)"$/ do |text|
 end
 
 Then /^I should see email view with body that contains "([^"]*)"$/ do |text|
-  unless device.ios5?
+  if not device.ios5?
     warn_about_no_ios5_email_view
   else
     wait_for_animation
@@ -23,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
-    unless device.ios5?
+    if not device.ios5?
       warn_about_no_ios5_email_view
     else
       should_see_mail_view
@@ -34,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|
-  unless device.ios5?
+  if not device.ios5?
     warn_about_no_ios5_email_view
   else
     wait_for_animation
@@ -46,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|
-  unless device.ios5?
+  if not device.ios5?
     warn_about_no_ios5_email_view
   else
     should_see_recipients comma_sep_addrs
@@ -59,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|
-  unless device.ios5?
+  if not device.ios5?
     warn_about_no_ios5_email_view
   else
     should_see_mail_view
@@ -71,7 +71,7 @@ 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|
-  unless device.ios5?
+  if not device.ios5?
     delete_draft_and_wait_for view_id
   else
     warn_about_no_ios5_email_view

data/features/step_definitions/table_steps.rb

@@ -91,6 +91,7 @@ Then /^I should see that the "([^"]*)" row has text "([^"]*)" in the "([^"]*)" l
 end
 
 Then /^I should see that the text I just entered is in the "([^"]*)" row "([^"]*)" label$/ do |row_id, label_id|
+  #noinspection RubyResolve
   should_see_row_with_label_with_text row_id, label_id, @text_entered_by_keyboard
 end
 
@@ -159,8 +160,10 @@ 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
+  should_see_row_with_label_that_has_no_text row_id, label_id
 end
 
+
+
+

data/lib/briar/control/button.rb

@@ -38,10 +38,10 @@ module Briar
         touch("button marked:'#{button_id}'")
       end
 
-      def touch_button_and_wait_for_view (button_id, view_id)
+      def touch_button_and_wait_for_view (button_id, view_id, timeout=BRIAR_WAIT_TIMEOUT)
         touch_button(button_id)
         unless view_id.nil?
-          wait_for_view view_id
+          wait_for_view view_id, timeout
         end
       end
 

data/lib/briar/control/slider.rb

@@ -1,6 +1,38 @@
 module Briar
   module Control
     module Slider
+
+      def briar_args_for_slider_set_value(options)
+        args = []
+        if options.has_key?(:notify_targets)
+          args << options[:notify_targets] ? 1 : 0
+        else
+          args << 1
+        end
+
+        if options.has_key?(:animate)
+          args << options[:animate] ? 1 : 0
+        else
+          args << 1
+        end
+        args
+      end
+
+      def briar_slider_set_value(slider_id, value,  options = {:animate => true,
+                                                         :notify_targets => true})
+        value_str = value.to_f.to_s
+        args = briar_args_for_slider_set_value(options)
+        query_str =  "slider marked:'#{slider_id}'"
+        views_touched = map(query_str, :changeSlider, value_str, *args)
+        if views_touched.empty? or views_touched.member? '<VOID>'
+          screenshot_and_raise "could not slider marked '#{slider_id}' to '#{value}' using query '#{query_str}' with options '#{options}'"
+        end
+
+        views_touched
+      end
+
+
+
       # WARNING: requires a tap gesture recognizer on the slider
       # you have been warned
       def change_slider_value_to(slider_id, value)

data/lib/briar/keyboard.rb

@@ -106,12 +106,13 @@ module Briar
       end
     end
 
-    def briar_clear_text(view_id)
+    def briar_clear_text(view_id, timeout=5)
       wait_for_view view_id
+      step_pause
       touch("view marked:'#{view_id}'")
-      wait_for_button 'Select All'
+      wait_for_button 'Select All', timeout
       step_pause
-      touch_button_and_wait_for_view 'Select All', 'Cut'
+      touch_button_and_wait_for_view 'Select All', 'Cut', timeout
       step_pause
       touch_button 'Cut'
       step_pause

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
@@ -155,10 +155,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
-summary: briar-0.0.9
+summary: briar-0.1.0
 test_files:
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb