briar 0.0.5 → 0.0.6

data/lib/briar/table.rb

@@ -1,4 +1,4 @@
-require "calabash-cucumber"
+#require 'calabash-cucumber'
 
 module Briar
   module Table
@@ -10,13 +10,13 @@ module Briar
 
     def query_str_rows_in_table (table_id = nil)
       table_id == nil ?
-            "tableViewCell" :
+            'tableViewCell' :
             "tableView marked:'#{table_id}' child tableViewCell"
     end
 
     def query_str_table (table_id = nil)
       table_id == nil ?
-            "tableView" :
+            'tableView' :
             "tableView marked:'#{table_id}'"
     end
 
@@ -34,11 +34,11 @@ module Briar
 
       if index == 0 or index == (all_rows.length - 1)
         # collect information about the table, row, and content offset
-        content_offset_y = query("tableView", :contentOffset).first["Y"]
-        frame = query(query_str).first["frame"]
-        cell_h = frame["height"].to_f
-        cell_y = frame["y"].to_f
-        table_h = query(query_str_table(table_id)).first["frame"]["height"]
+        content_offset_y = query('tableView', :contentOffset).first['Y']
+        frame = query(query_str).first['frame']
+        cell_h = frame['height'].to_f
+        cell_y = frame['y'].to_f
+        table_h = query(query_str_table(table_id)).first['frame']['height']
 
         # if the row is the first row and there has been no scrolling, just return true
         return true if index == 0 and content_offset_y == 0
@@ -62,7 +62,7 @@ module Briar
       end
     end
 
-    def query_str_for_label_and_text_exists (row_id, label_id, text, table_id = nil)
+    def query_str_for_label_and_text_exists (row_id, label_id, table_id = nil)
       table_id == nil ?
             "tableViewCell marked:'#{row_id}' isHidden:0 descendant label marked:'#{label_id}'" :
             "tableView marked:'#{table_id}' child tableViewCell marked:'#{row_id}' isHidden:0 descendant label marked:'#{label_id}'"
@@ -107,17 +107,14 @@ module Briar
     end
 
 
-    def scroll_until_i_see_row (dir, row_id, limit)
-      unless row_exists? row_id
-        count = 0
-        begin
-          scroll("scrollView index:0", dir)
-          step_pause
-          count = count + 1
-        end while ((not row_exists?(row_id)) and count < limit.to_i)
+    def scroll_until_i_see_row (dir, row_id)
+      wait_poll({:until_exists => "tableView descendant tableViewCell marked:'#{row_id}'",
+                 :timeout => 2}) do
+        scroll('tableView index:0', dir)
       end
+
       unless row_exists?(row_id)
-        screenshot_and_raise "i scrolled '#{dir}' '#{limit}' times but did not see '#{row_id}'"
+        screenshot_and_raise "i scrolled '#{dir}' but did not see '#{row_id}'"
       end
     end
 
@@ -130,7 +127,7 @@ module Briar
         cells = query(query_str_rows_in_table, :accessibilityIdentifier)
         #puts "cells = #{cells} is #{row_id} last? ==> #{cells.last.eql?(row_id)}"
         if cells.last.eql?(row_id)
-          row_h = query(query, :frame).first["Height"].to_i
+          row_h = query(query, :frame).first['Height'].to_i
           offset = -1 * (row_h/3)
           #puts "offset = #{offset}"
         end
@@ -200,7 +197,7 @@ module Briar
 
     def edit_mode_delete_button_exists? (row_name)
       #!query("tableViewCell marked:'#{row_name}' child tableViewCellEditControl").empty?
-      !query_all("tableViewCell marked:'#{row_name}' child tableViewCellEditControl").empty?
+      !query("all tableViewCell marked:'#{row_name}' child tableViewCellEditControl").empty?
     end
 
     def should_see_edit_mode_delete_button (row_name)
@@ -218,7 +215,7 @@ module Briar
     def reorder_button_exists? (row_name)
       #TableViewCellReorderControl
       #!query("tableViewCell marked:'#{row_name}' child tableViewCellReorderControl").empty?
-      !query_all("tableViewCell marked:'#{row_name}' child tableViewCellReorderControl").empty?
+      !query("all tableViewCell marked:'#{row_name}' child tableViewCellReorderControl").empty?
     end
 
     def should_see_reorder_button (row_name)

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = "0.0.5"
+  VERSION = '0.0.6'
 end

data/run-tests.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+bundle update
+bundle install
+bundle exec rspec spec

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,39 +20,62 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: lesspainful
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rvm
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +83,8 @@ dependencies:
 description: extends calabash-ios steps
 email:
 - joshuajmoody@gmail.com
-executables: []
+executables:
+- briar
 extensions: []
 extra_rdoc_files: []
 files:
@@ -71,7 +93,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/briar
+- bin/briar_helpers.rb
 - briar.gemspec
+- cucumber.yml.example
 - dotirbc+briar
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb
@@ -119,32 +144,33 @@ files:
 - lib/briar/text_field.rb
 - lib/briar/text_view.rb
 - lib/briar/version.rb
+- run-tests.sh
 - spec/briar/gestalt_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jmoody/briar
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: briar-0.0.5
+specification_version: 4
+summary: briar-0.0.6
 test_files:
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb