calabash-cucumber 0.9.116 → 0.9.117

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.115)
+    calabash-cucumber (0.9.117)
       CFPropertyList
       bundler (~> 1.1)
       cucumber

data/bin/calabash-ios

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'fileutils'
 require 'cfpropertylist'
 require 'rexml/document'

data/features/step_definitions/calabash_steps.rb

@@ -230,7 +230,7 @@ Then /^I pinch to zoom (in|out) on "([^\"]*)"$/ do |in_out, name|
   sleep(STEP_PAUSE)
 end
 
-#   Note "up/left/right" seems to be missing on the web page
+#   Note "up/left/right" seems to be missing on the web base
 Then /^I scroll (left|right|up|down)$/ do |dir|
   scroll("scrollView index:0", dir)
   sleep(STEP_PAUSE)

data/lib/calabash-cucumber/ibase.rb

@@ -0,0 +1,37 @@
+require 'calabash-cucumber/core'
+require 'calabash-cucumber/operations'
+
+class Calabash::IBase
+  include Calabash::Cucumber::Operations
+
+  def initialize(world)
+    @world = world
+  end
+
+  def embed(*args)
+    @world.send(:embed,*args)
+  end
+
+  def puts(*args)
+    @world.send(:puts, *args)
+  end
+
+  def trait
+    "navigationItemView marked:'#{self.title}'"
+  end
+
+  def base(clz,*args)
+    clz.new(@world,*args)
+  end
+
+  def await(opts={})
+    wait_for_elements_exist([trait], opts)
+    self
+  end
+
+  def await_screenshot(wait_opts={},screenshot_opts={})
+    await(wait_opts)
+    screenshot_embed(screenshot_opts)
+  end
+
+end

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -81,6 +81,11 @@ module Calabash
         end
       end
 
+      def await_keyboard
+        wait_for_elements_exist(["view:'UIKBKeyplaneView'"])
+        sleep(0.3)
+      end
+
       def keyboard_enter_text(text)
         fail("No visible keyboard") if element_does_not_exist("view:'UIKBKeyplaneView'")
 

data/lib/calabash-cucumber/operations.rb

@@ -27,6 +27,15 @@ module Calabash
       include Calabash::Cucumber::Location
 
 
+
+      def page(clz,*args)
+        clz.new(self,*args)
+      end
+
+      def await_page(clz,*args)
+        clz.new(self,*args).await
+      end
+
       def home_direction
         @current_rotation = @current_rotation || :down
       end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.116"
-    FRAMEWORK_VERSION = "0.9.115"
+    VERSION = "0.9.117"
+    FRAMEWORK_VERSION = "0.9.117"
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -49,6 +49,11 @@ module Calabash
 
       def wait_poll(opts, &block)
         test = opts[:until]
+        if test.nil?
+          cond = opts[:until_exists]
+          raise "Must provide :until or :until_exists" unless cond
+          test = lambda { element_exists(cond) }
+        end
         wait_for(opts) do
           if test.call()
             true
@@ -109,6 +114,7 @@ module Calabash
       end
 
       def wait_for_none_animating(options = {})
+        #sleep(0.3)
         options[:condition] = CALABASH_CONDITIONS[:none_animating]
         wait_for_condition(options)
       end

metadata

@@ -1,151 +1,153 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: calabash-cucumber
-version: !ruby/object:Gem::Version 
-  hash: 211
+version: !ruby/object:Gem::Version
+  version: 0.9.117
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 116
-  version: 0.9.116
 platform: ruby
-authors: 
+authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: CFPropertyList
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sim_launcher
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sim_launcher
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.4.6
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: slowhandcuke
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.6
+- !ruby/object:Gem::Dependency
+  name: slowhandcuke
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: location-one
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: location-one
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 0
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.8
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 2
-        - 7
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.2.7
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.7
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id008
-description: calabash-cucumber drives tests for native iOS apps. You must link your app with calabash-ios-server framework to execute tests.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+description: calabash-cucumber drives tests for native iOS apps. You must link your
+  app with calabash-ios-server framework to execute tests.
+email:
 - karl@lesspainful.com
-executables: 
+executables:
 - calabash-ios
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGES.txt
 - Gemfile
@@ -177,6 +179,7 @@ files:
 - lib/calabash-cucumber/calabash_steps.rb
 - lib/calabash-cucumber/core.rb
 - lib/calabash-cucumber/cucumber.rb
+- lib/calabash-cucumber/ibase.rb
 - lib/calabash-cucumber/keyboard_helpers.rb
 - lib/calabash-cucumber/launch/simulator_helper.rb
 - lib/calabash-cucumber/location.rb
@@ -264,36 +267,27 @@ files:
 - scripts/reset_simulator.scpt
 homepage: http://calaba.sh
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client for calabash-ios-server for automated functional testing on iOS
-test_files: 
+test_files:
 - features/step_definitions/calabash_steps.rb