briar 0.1.3.b6 → 0.1.3.b7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d47641a74475402a7cfb4cc6a7693cdff83477e0
-  data.tar.gz: 26d1f06f4739a772aa599b507811838cd34d95f6
+  metadata.gz: 64cfb8af1d1f6f49f08a52b1ad05ddea03652fa6
+  data.tar.gz: 153e16ff005812af6f6f7c6442ff1b169ad86a2b
 SHA512:
-  metadata.gz: 099614b3ee8a07ae8c790ee5d866bfc5710db0a28453c838dae80ad08d9f222f8642cece6d0181840aef0768e42dd1733e264ee9772d07d48aaae9c5e40f7bf7
-  data.tar.gz: 8e51149e59fd615ee0df09d827ead49ad8217d20bc317b5adcab906fa1f43f9bda5b6dbb8010bab6e33cf31f694882060807720931b38cd49f34658fd8cb79d6
+  metadata.gz: eba1da164fd5b0d7e2f58c5a36432ea7a2119bc8f581be538c97aa21339868df381fa47dd9ac45108ec0f7500f8a555d0c1a01bb4b5fea38d47cdb0c05aa7021
+  data.tar.gz: 181817f3977856a0d2b9cb30171d1a77d42733be2e081275559987bf74ac1988f290ba61fab7de6ac4a218de5985fd59ee0b3f29a6adb42785cf3c4410be8b42

data/README.md

@@ -15,7 +15,7 @@ DRY: I have several iOS projects that use calabash-cucumber and I found I was re
 
 ## Installation 
 
-Requires ruby >= 1.9.2
+Requires ruby >= 1.8.7; ruby 2.0 is recommended.
 
 In your Gemfile:
 

data/briar.gemspec

@@ -1,5 +1,16 @@
 # -*- encoding: utf-8 -*-
-require_relative 'lib/briar/version'
+
+# ==> require_relative 'lib/briar/version' <==
+# bundler on 1.9.3 complains
+# 'Does it try to require a relative path? That's been removed in Ruby 1.9'
+# 
+# this is the current _best_ solution
+$:.push File.expand_path("../lib", __FILE__)
+require 'briar/version'
+
+# experimental
+# not yet
+# $:.push File.expand_path("../features", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = 'briar'
@@ -11,8 +22,10 @@ Gem::Specification.new do |gem|
   gem.homepage = 'https://github.com/jmoody/briar'
   gem.license = 'MIT'
 
-  gem.required_ruby_version = Gem::Requirement.new('>= 1.9.2')
+  gem.platform = Gem::Platform::RUBY
+  gem.required_ruby_version = '>= 1.8.7'
 
+  gem.add_runtime_dependency 'rbx-require-relative', "~> 0.0.9"
   gem.add_runtime_dependency 'calabash-cucumber', '>= 0.9.164'
   gem.add_runtime_dependency 'rake', '~>10.1'
   gem.add_runtime_dependency 'syntax', '~>1.2'

data/lib/briar.rb

@@ -1,11 +1,11 @@
 #$:.unshift File.dirname(__FILE__)
 
-DEVICE_ENDPOINT = (ENV['DEVICE_ENDPOINT'] || 'http://localhost:37265')
-
-# will deprecate soon
+# will deprecate soon (starting 0.1.3)
 TOUCH_TRANSITION_TIMEOUT = 30.0
 TOUCH_TRANSITION_RETRY_FREQ = 0.5
-ANIMATION_PAUSE = (ENV['ANIMATION_PAUSE'] || 0.6).to_f
+
+# deprecated 0.1.3
+# ANIMATION_PAUSE = (ENV['ANIMATION_PAUSE'] || 0.6).to_f
 
 # see below for replacements
 BRIAR_RETRY_FREQ=0.1
@@ -15,12 +15,16 @@ BRIAR_POST_TIMEOUT=0.5
 BRIAR_STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
 
 # we need an insanely long time out because of some changes in 0.9.163
-# the waits succeed after a short amount of time (visually < 1 sec),
-# but fail if the wait time out is too short (4s)
+#
+# the waits succeed after a short amount of time (visually < 1 sec), but fail if
+# the wait time out is too short (4s)
+#
 # 8 seconds works most of the time
 # 10 seconds seems safe
-# the problem with a long time out is that during development you want the
-# tests to fail fast.
+# 14 seconds is safe
+#
+# the problem with a long time out is that during development you want the tests
+# to fail fast.
 BRIAR_WAIT_TIMEOUT = (ENV['WAIT_TIMEOUT'] || 14.0).to_f
 BRIAR_WAIT_RETRY_FREQ = (ENV['RETRY_FREQ'] || 0.1).to_f
 

data/lib/briar/alerts_and_sheets/action_sheet.rb

@@ -10,12 +10,12 @@ module Briar
       end
     end
 
-    def sheet_exists? (sheet_id)
+    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)
+    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
 
@@ -29,7 +29,7 @@ module Briar
     end
 
     def should_not_see_sheet(sheet_id)
-      if sheet_exists? (sheet_id)
+      if sheet_exists?(sheet_id)
         screenshot_and_raise "should not see sheet marked '#{sheet_id}'"
       end
     end

data/lib/briar/alerts_and_sheets/alert_view.rb

@@ -9,7 +9,7 @@ module Briar
 
     def alert_exists? (alert_id=nil)
       if uia_available?
-        res = send_uia_command command: 'uia.alert() != null'
+        res = uia('uia.alert() != null')
         res['value']
       else
         if alert_id.nil?
@@ -47,7 +47,7 @@ module Briar
         msg = "waited for '#{timeout}' but did not see an alert"
         opts = wait_opts(msg, timeout)
         wait_for(opts) do
-          not uia_query(:view, marked: "#{title}").empty?
+          not uia_query(:view, {:marked => "#{title}"}).empty?
         end
       else
         qstr = 'alertView child label'
@@ -63,7 +63,7 @@ module Briar
       if ios7?
         warn 'WARN: cannot distinguish between alert titles and messages'
         should_see_alert
-        if uia_query(:view, marked: "#{message}").empty?
+        if uia_query(:view, {:marked => "#{message}"}).empty?
           screenshot_and_raise "expected to see alert with title '#{message}'"
         end
       else
@@ -81,7 +81,7 @@ module Briar
     def alert_button_exists? (button_id)
       if uia_available?
         should_see_alert
-        not uia_query(:view, marked: "#{button_id}").empty?
+        not uia_query(:view, {:marked => "#{button_id}"}).empty?
       else
         query('alertView child button child label', :text).include?(button_id)
       end

data/lib/briar/briar_core.rb

@@ -13,7 +13,7 @@ module Briar
 
     def wait_for_animation
       _deprecated('0.1.3', "use any of the 'wait_*' functions instead", :warn)
-      sleep(ANIMATION_PAUSE)
+      sleep(0.6)
     end
 
     def view_exists? (view_id)

data/lib/briar/control/segmented_control.rb

@@ -22,7 +22,7 @@ module Briar
         num_segs = query(qstr, :numberOfSegments).first.to_i
         idx = 0
         while idx < num_segs
-          title = query(qstr, {titleForSegmentAtIndex: idx}).first
+          title = query(qstr, {:titleForSegmentAtIndex =>  idx}).first
           return idx if title.eql?(segment_id)
           idx = idx + 1
         end
@@ -61,7 +61,7 @@ module Briar
         tokens.each do |expected|
           idx = index_of_segment_with_name_in_control_with_id expected, control_id
           unless idx == counter
-            actual = query("segmentedControl marked:'#{control_id}'", {titleForSegmentAtIndex: counter}).first
+            actual = query("segmentedControl marked:'#{control_id}'", {:titleForSegmentAtIndex => counter}).first
             screenshot_and_raise "expected to see segment '#{expected}' at index '#{counter}' but found '#{actual}'"
           end
           counter = counter + 1

data/lib/briar/cucumber.rb

@@ -1,4 +1,6 @@
-require 'briar'
+require 'require_relative'
+
+require_relative '../briar'
 
 World(Briar)
 World(Briar::Core)
@@ -26,6 +28,7 @@ World(Briar::Table)
 World(Briar::TextField)
 World(Briar::TextView)
 
+
 require_relative '../../features/step_definitions/alerts_and_sheets/action_sheet_steps'
 require_relative '../../features/step_definitions/alerts_and_sheets/alert_view_steps'
 

data/lib/briar/email.rb

@@ -153,7 +153,7 @@ module Briar
                  :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
                  :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg) do
-          uia_element_exists?(:view, marked: 'Cancel')
+          uia_element_exists?(:view, {:marked => 'Cancel'})
         end
 
         uia_tap_mark('Cancel')
@@ -162,7 +162,7 @@ module Briar
                  :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
                  :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg) do
-          uia_element_exists?(:view, marked: 'Delete Draft')
+          uia_element_exists?(:view, {:marked => 'Delete Draft'})
         end
 
         uia_tap_mark('Delete Draft')
@@ -180,7 +180,7 @@ module Briar
         screenshot_and_raise 'UIA needs to be available'
       end
 
-      res = uia_query(:view, marked: 'To:').first
+      res = uia_query(:view, {:marked => 'To:'}).first
       rect = res['rect']
       point = {:x => rect['x'] + (2 * rect['width']),
                :y => rect['y']}

data/lib/briar/keyboard/keyboard.rb

@@ -2,8 +2,6 @@ require 'calabash-cucumber'
 
 module Briar
   module Keyboard
-    # dismiss the keyboard on iPad
-    # send_uia_command command:"uia.keyboard().buttons()['Hide keyboard'].tap()"
 
     UITextAutocapitalizationTypeNone = 0
     UITextAutocapitalizationTypeWords = 1

data/lib/briar/label.rb

@@ -7,7 +7,7 @@ module Briar
     end
 
     def should_see_label (name)
-      res = label_exists? (name)
+      res = label_exists?(name)
       unless res
         screenshot_and_raise "i could not find label with access id #{name}"
       end

data/lib/briar/picker/date_picker.rb

@@ -46,7 +46,7 @@ module Briar
 
       def change_minute_interval_on_picker (target_interval, picker_id=nil)
         query_str = should_see_date_picker picker_id
-        res = query(query_str, [{setMinuteInterval: target_interval.to_i}])
+        res = query(query_str, [{:setMinuteInterval => target_interval.to_i}])
         if res.empty?
           screenshot_and_raise "could not change the minute interval with query '#{query_str}'"
         end

data/lib/briar/picker/picker_shared.rb

@@ -3,7 +3,7 @@ require 'calabash-cucumber'
 module Briar
   module Picker_Shared
     def picker_current_index_for_column (column)
-      arr = query("pickerTableView", :selectionBarRow)
+      arr = query('pickerTableView', :selectionBarRow)
       arr[column]
     end
     # methods common to generic and date pickers
@@ -22,12 +22,16 @@ module Briar
     def picker_scroll_down_on_column(column)
       new_row = previous_index_for_column column
       #scroll_to_row("pickerTableView index:#{column}", new_row)
-      query("pickerTableView index:'#{column}'", [{selectRow:new_row}, {animated:1}, {notify:1}])
+      query("pickerTableView index:'#{column}'", [{:selectRow => new_row},
+                                                  {:animated => 1},
+                                                  {:notify => 1}])
     end
 
     def picker_scroll_up_on_column(column)
       new_row = picker_next_index_for_column column
-      query("pickerTableView index:'#{column}'", [{selectRow:new_row}, {animated:1}, {notify:1}])
+      query("pickerTableView index:'#{column}'", [{:selectRow => new_row},
+                                                  {:animated => 1},
+                                                  {:notify => 1}])
     end
   end
 end

data/lib/briar/table.rb

@@ -27,13 +27,6 @@ module Briar
             "tableView marked:'#{table_id}'"
     end
 
-    def table_has_calabash_additions
-      success_value = '1'
-      res = query('tableView', [{hasCalabashAdditions: success_value}])
-      screenshot_and_raise 'table is not visible' if res.empty?
-      res.first.eql? success_value
-    end
-
     def row_visible? (row_id, table_id = nil)
       query_str = query_str_for_row row_id, table_id
       !query(query_str, AI).empty?

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '0.1.3.b6'
+  VERSION = '0.1.3.b7'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.1.3.b6
+  version: 0.1.3.b7
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rbx-require-relative
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>'
@@ -145,6 +159,6 @@ rubyforge_project:
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
-summary: briar-0.1.3.b6
+summary: briar-0.1.3.b7
 test_files:
 - spec/spec_helper.rb