calabash 2.0.0.pre6 → 2.0.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b006a1fc1ac925dc22c77ac2ecdde56b3f58f01c
-  data.tar.gz: e6c582fe3f8cf49392de98bd02187d8581776b63
+  metadata.gz: d018a4059fbc167401a00153fe9d5dd8a7660684
+  data.tar.gz: c7d01f02885927df13058ec9417dbdad8f254fc2
 SHA512:
-  metadata.gz: 20965160fbceef2499276f4144ee2856e5d9c09a9df711f8abb23525745a4c12b278430b872500f476bb21a4d31e2f027257c20b0944520c1eaca13847093cb4
-  data.tar.gz: 0b49e6a9229ea88449176a15fa5a2c242da38cec043f3038c223eb038bd11900c1b95296d0b93a98a0f3d3141c94f4c659bd7f859796fde2c2c2f679e15ebedb
+  metadata.gz: b776516069ecd91364f819286532ea841d4eb1b25ab4ed364033a7faf50f406546fd986ffbd2e64484efb9df4045911232b95c9f670a7be883c3e2cdc5633d5f
+  data.tar.gz: a973bee5a42a306303f4ac7c8304b961488e14a11f0348358fb006c6d0fb3c385c62fdbadd290a154157f202a59ae63f2e9352a6471958e8bb41708605d1648a

data/README.md

@@ -6,18 +6,6 @@
 
 Automated Acceptance Testing for Mobile Apps
 
-## Initial workflow
-
-**TL;DR**
-
-```
-$ cd calabash
-$ ./copy_repos.sh
-$ ./changing_old_files.sh
-```
-
-Before Calabash is ready to be released, the old gems will exist outside version control. To make a change run the script `copy_repos.sh`. This will copy the Android and iOS repositories and extract them as files in the directory `old`. Then execute `changing_old_files.sh`. This script will move old files into their new directories. To make changes to "old files" e.g. move them, add your steps to `changing_old_files.sh` and execute it. To make code changes to old files, change them locally first to ensure they work. Then copy the change to the branch `united` on either iOS or Android. Commit the changes and push them upstream. `copy_repos.sh` will always download the newest files.
-
 ## Rake
 
 **TODO** Release instructions for Android and iOS.

data/lib/calabash.rb

@@ -25,6 +25,7 @@ module Calabash
   require 'calabash/text'
   require 'calabash/interactions'
   require 'calabash/defaults'
+  require 'calabash/legacy'
   require 'calabash/console_helpers'
 
 

data/lib/calabash/android.rb

@@ -64,6 +64,8 @@ module Calabash
 
       file
     end
+
+    require 'calabash/android/legacy'
   end
 end
 

data/lib/calabash/android/application.rb

@@ -8,7 +8,7 @@ module Calabash
         application_path = Environment::APP_PATH
 
         if application_path.nil?
-          raise 'No application path is set'
+          raise 'No application path is set. Specify application with environment variable CAL_APP'
         end
 
         unless File.exist?(application_path)
@@ -20,8 +20,12 @@ module Calabash
         end
 
         build_test_server = Build::TestServer.new(application_path)
-        test_server_path = Environment::TEST_SERVER_PATH ||
-            build_test_server.path
+        test_server_path = Environment::TEST_SERVER_PATH
+
+        unless test_server_path
+          test_server_path = build_test_server.path
+          Logger.info "No test-server specified. Defaulting to path '#{test_server_path}'"
+        end
 
         unless File.exist?(test_server_path)
           Logger.error "Test-server '#{test_server_path}' does not exist."
@@ -38,6 +42,13 @@ module Calabash
         @test_server = Application.new(test_server_path, nil, options) if test_server_path
       end
 
+      # Is this application an android application
+      #
+      # @return [Boolean] Always returns true
+      def android_application?
+        true
+      end
+
       def extract_identifier
         package_line = aapt_dump('package').first
         raise "'package' not found in aapt output" unless package_line

data/lib/calabash/android/build/builder.rb

@@ -17,7 +17,7 @@ module Calabash
         end
 
         # @!visibility private
-        def build
+        def build(out_file = nil)
           apk_fingerprint = fingerprint_from_apk
           @logger.log "#{@application_path} was signed with a certificate with fingerprint #{apk_fingerprint}", :debug
 
@@ -49,7 +49,7 @@ module Calabash
 
           application = Calabash::Application.from_path(@application_path)
 
-          test_server_file_name = TestServer.new(@application_path).path
+          test_server_file_name = out_file || TestServer.new(@application_path).path
           FileUtils.mkdir_p File.dirname(test_server_file_name) unless File.exist? File.dirname(test_server_file_name)
 
           Dir.mktmpdir do |workspace_dir|
@@ -70,6 +70,17 @@ module Calabash
 
               Zip::File.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
               Zip::File.open("TestServer.apk") do |zip_file|
+                begin
+                  check_file("AndroidManifest.xml")
+                  manifest_exists = true
+                rescue
+                  manifest_exists = false
+                end
+
+                if manifest_exists
+                  zip_file.remove("AndroidManifest.xml")
+                end
+
                 zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
               end
             end

data/lib/calabash/android/device.rb

@@ -87,7 +87,7 @@ module Calabash
       # @!visibility private
       def test_server_responding?
         begin
-          http_client.get(HTTP::Request.new('ping'), retries: 1).body == 'pong'
+          http_client.post(HTTP::Request.new('ping'), retries: 1).body == 'pong'
         rescue HTTP::Error => _
           false
         end
@@ -96,7 +96,7 @@ module Calabash
       # @!visibility private
       def test_server_ready?
         begin
-          http_client.get(HTTP::Request.new('ready')).body == 'true'
+          http_client.post(HTTP::Request.new('ready')).body == 'true'
         rescue HTTP::Error => _
           false
         end
@@ -166,9 +166,9 @@ module Calabash
         request = HTTP::Request.new('map', params_for_request(parameters))
 
         http_result = if method_name == :flash
-                        http_client.get(request, timeout: 30)
+                        http_client.post(request, timeout: 30)
                       else
-                        http_client.get(request)
+                        http_client.post(request)
                       end
 
         result = JSON.parse(http_result.body)
@@ -185,9 +185,9 @@ module Calabash
         @logger.log "Action: #{action} - Arguments: #{arguments.join(', ')}"
 
         parameters = {command: action, arguments: arguments}
-        request = HTTP::Request.new('/', params_for_request(parameters))
+        request = HTTP::Request.new('', params_for_request(parameters))
 
-        result = JSON.parse(http_client.get(request).body)
+        result = JSON.parse(http_client.post(request).body)
 
         unless result['success']
           message = result['message'] || result['bonusInformation']
@@ -211,6 +211,17 @@ module Calabash
         perform_action('keyboard_enter_text', text)
       end
 
+      # @!visibility private
+      def md5_checksum_for_app_package(package)
+        app = installed_apps.find{|app| app[:package] == package}
+
+        unless app
+          raise "Application with package '#{app}' not installed"
+        end
+
+        md5_checksum(app[:path])
+      end
+
       # @!visibility private
       def md5_checksum(file_path)
         result = adb.shell("#{md5_binary} '#{file_path}'")
@@ -229,7 +240,7 @@ module Calabash
         json = parameters.to_json
         request = HTTP::Request.new('/backdoor', json: json)
 
-        body = http_client.get(request).body
+        body = http_client.post(request).body
         result = JSON.parse(body)
 
         if result['outcome'] != 'SUCCESS'
@@ -245,6 +256,29 @@ module Calabash
         result['result']
       end
 
+
+      # @!visibility private
+      def keyboard_visible?
+        input_method = adb.shell("dumpsys input_method")
+        input_method.lines.each do |line|
+          match = line.match(/mInputShown\s*=\s*(.*)/)
+
+          if match && match.captures.length != 0
+            shown = match.captures.first.chomp
+
+            if shown == "true"
+              return true
+            elsif shown == "false"
+              return false
+            else
+              raise "Could not detect keyboard visibility. '#{shown}'"
+            end
+          end
+        end
+
+        raise "Could not detect keyboard visibility. Could not find 'mInputShown'"
+      end
+
       # @!visibility private
       def go_home
         adb.shell("input keyevent 3")
@@ -343,7 +377,7 @@ module Calabash
         json = parameters.to_json
         request = HTTP::Request.new('/map', json: json)
 
-        body = http_client.get(request).body
+        body = http_client.post(request).body
         result = JSON.parse(body)
 
         if result['outcome'] != 'SUCCESS'
@@ -422,6 +456,8 @@ module Calabash
 
         if options[:activity]
           env_options[:main_activity] = options[:activity]
+        else
+          env_options[:main_activity] = 'null'
         end
 
         if application.test_server.nil?
@@ -436,15 +472,13 @@ module Calabash
           raise "The test-server '#{application.test_server.identifier}' is not installed"
         end
 
-        installed_app = installed_apps.find{|app| app[:package] == application.identifier}
-        installed_app_md5_checksum = md5_checksum(installed_app[:path])
+        installed_app_md5_checksum = md5_checksum_for_app_package(application.identifier)
 
         if application.md5_checksum != installed_app_md5_checksum
           raise "The specified app is not the same as the installed app (#{application.md5_checksum} != #{installed_app_md5_checksum})."
         end
 
-        installed_test_server = installed_apps.find{|app| app[:package] == application.test_server.identifier}
-        installed_test_server_md5_checksum = md5_checksum(installed_test_server[:path])
+        installed_test_server_md5_checksum = md5_checksum_for_app_package(application.test_server.identifier)
 
         if application.test_server.md5_checksum != installed_test_server_md5_checksum
           raise "The specified test-server is not the same as the installed test-server (#{application.test_server.md5_checksum} != #{installed_test_server_md5_checksum})."
@@ -477,7 +511,7 @@ module Calabash
         extras = ''
 
         env_options.each_pair do |key, val|
-          extras = "#{extras} -e \"#{key.to_s}\" \"#{val.to_s}\""
+          extras = "#{extras} -e #{key.to_s} #{val.to_s}"
         end
 
         begin
@@ -527,7 +561,7 @@ module Calabash
       def _stop_app
         Retriable.retriable(tries: 5, interval: 1) do
           begin
-            http_client.get(HTTP::Request.new('kill'), retries: 1, interval: 0)
+            http_client.post(HTTP::Request.new('kill'), retries: 1, interval: 0)
           rescue HTTP::Error => _
             # It's fine that we can't contact the test-server, as it might already have been shut down
             if test_server_responding?
@@ -719,11 +753,10 @@ module Calabash
         if installed_packages.include?(application.identifier)
           @logger.log 'Application is already installed. Ensuring right checksum'
 
-          installed_app = installed_apps.find{|app| app[:package] == application.identifier}
-          installed_app_md5_checksum = md5_checksum(installed_app[:path])
+          installed_app_md5_checksum = md5_checksum_for_app_package(application.identifier)
 
           if application.md5_checksum != installed_app_md5_checksum
-            @logger.log("The md5 checksum has changed (#{application.md5_checksum} != #{installed_app_md5_checksum}.", :info)
+            @logger.log("The md5 checksum has changed (#{application.md5_checksum} != #{installed_app_md5_checksum}).", :info)
             _install_app(application)
           end
         else
@@ -965,9 +998,9 @@ module Calabash
 
       # @!visibility private
       def execute_gesture(multi_touch_gesture)
-        request = HTTP::Request.new('gesture', json: multi_touch_gesture.to_json)
+        request = HTTP::Request.new('gesture', params_for_request(multi_touch_gesture))
 
-        body = http_client.get(request, timeout: multi_touch_gesture.timeout + 10).body
+        body = http_client.post(request, timeout: multi_touch_gesture.timeout + 10).body
         result = JSON.parse(body)
 
         if result['outcome'] != 'SUCCESS'

data/lib/calabash/android/environment.rb

@@ -15,6 +15,16 @@ module Calabash
       # @!visibility private
       class InvalidJavaSDKHome < RuntimeError; end
 
+      # A URI that points to the embedded Calabash server in the app under test.
+      #
+      # The default value is 'http://localhost:34777'.
+      #
+      # You can control the value of this variable by setting the `CAL_ENDPOINT`
+      # variable.
+      #
+      # @todo Maybe rename this to CAL_SERVER_URL or CAL_SERVER?
+      DEVICE_ENDPOINT = URI.parse((variable('CAL_ENDPOINT') || 'http://127.0.0.1:34777'))
+
       private
 
       def self.set_android_dependencies(android_dependencies)

data/lib/calabash/android/legacy.rb

@@ -0,0 +1,6 @@
+if Calabash::Environment.variable('DEVICE_ENDPOINT')
+  Calabash::Logger.warn("Deprecated use of old ENV variable 'DEVICE_ENDPOINT'")
+
+  Calabash::Android::Environment::DEVICE_ENDPOINT =
+      URI.parse(Calabash::Environment.variable('DEVICE_ENDPOINT'))
+end

data/lib/calabash/android/server.rb

@@ -4,7 +4,8 @@ module Calabash
     class Server < ::Calabash::Server
       # The default Android test server.
       def self.default
-        Server.new(URI.parse('http://127.0.0.1:33765'))
+        endpoint = Environment::DEVICE_ENDPOINT
+        Server.new(endpoint, 7102)
       end
     end
   end

data/lib/calabash/android/text.rb

@@ -42,6 +42,11 @@ module Calabash
           Device.default.perform_action('press_user_action_button', action_key.to_s)
         end
       end
+
+      # @!visibility private
+      def _keyboard_visible?
+        Device.default.keyboard_visible?
+      end
     end
   end
 end

data/lib/calabash/application.rb

@@ -21,6 +21,21 @@ module Calabash
 
     attr_reader :path
 
+    # Get the application from the default environment.
+    def self.default_from_environment
+      application_path = Environment::APP_PATH
+
+      if application_path.nil?
+        raise 'No application path is set. Specify application with environment variable CAL_APP'
+      end
+
+      unless File.exist?(application_path)
+        raise "Application '#{application_path}' does not exist"
+      end
+
+      Application.from_path(application_path)
+    end
+
     # Create an application from a path
     #
     # @return [Calabash::Android::Application, Calabash::IOS::Application] An
@@ -51,6 +66,20 @@ module Calabash
       ensure_application_path
     end
 
+    # Is this application an android application
+    #
+    # @return [Boolean] true if this application is an android application
+    def android_application?
+      false
+    end
+
+    # Is this application an iOS application
+    #
+    # @return [Boolean] true if this application is an iOS application
+    def ios_application?
+      false
+    end
+
     # @!visibility private
     def to_s
       "#<Application #{path}>"

data/lib/calabash/cli/build.rb

@@ -7,6 +7,19 @@ module Calabash
         fail('Should only build test-server for Android') unless @platform.nil? || @platform == :android
 
         application = @arguments.shift
+        test_server_path = nil
+
+        arg = @arguments.shift
+
+        if arg != nil
+          if arg == '-o'
+            test_server_path = @arguments.shift
+
+            if test_server_path == nil
+              raise 'Expected an output path for the test-server'
+            end
+          end
+        end
 
         if application.nil?
           fail('Must supply application as first parameter to build', :build)
@@ -19,7 +32,7 @@ module Calabash
           case extension
             when '.apk'
               set_platform!(:android)
-              Calabash::Android::Build::Builder.new(application_path).build
+              Calabash::Android::Build::Builder.new(application_path).build(test_server_path)
             when '.ipa', '.app'
               set_platform!(:ios)
               fail('Should only build test-server for Android')

data/lib/calabash/cli/console.rb

@@ -23,12 +23,14 @@ module Calabash
             when '.apk'
               set_platform!(:android)
 
-              # Create the test server if it does not exist
-              test_server = Android::Build::TestServer.new(application_path)
-
-              unless test_server.exists?
-                Logger.info('Test server does not exist. Creating test server.')
-                Calabash::Android::Build::Builder.new(application_path).build
+              unless Environment::TEST_SERVER_PATH
+                # Create the test server if it does not exist
+                test_server = Android::Build::TestServer.new(application_path)
+
+                unless test_server.exists?
+                  Logger.info('Test server does not exist. Creating test server.')
+                  Calabash::Android::Build::Builder.new(application_path).build
+                end
               end
 
               enter_console(application_path)

data/lib/calabash/cli/helpers.rb

@@ -68,7 +68,7 @@ EOF
       #{HELP[:resign]}
         resigns the app with the currently configured keystore.
 
-      #{HELP[:build]}
+      #{HELP[:build]} [-o <output_file>]
         builds the test server that will be used when testing the app.
 
     iOS specific commands

data/lib/calabash/cli/run.rb

@@ -31,12 +31,14 @@ module Calabash
             when '.apk'
               set_platform!(:android)
 
-              # Create the test server if it does not exist
-              test_server = Android::Build::TestServer.new(application_path)
-
-              unless test_server.exists?
-                Logger.info('Test server does not exist. Creating test server.')
-                Calabash::Android::Build::Builder.new(application_path).build
+              unless Environment::TEST_SERVER_PATH
+                # Create the test server if it does not exist
+                test_server = Android::Build::TestServer.new(application_path)
+
+                unless test_server.exists?
+                  Logger.info('Test server does not exist. Creating test server.')
+                  Calabash::Android::Build::Builder.new(application_path).build
+                end
               end
 
               run(application_path, @arguments)
@@ -90,7 +92,7 @@ module Calabash
           end
         end
 
-        arguments = ['-S', 'cucumber', '-p', @platform.to_s, *cucumber_arguments]
+        arguments = ['-S', 'cucumber', *cucumber_arguments]
 
         Logger.debug("Starting Ruby with arguments: #{arguments.join(', ')} and environment #{cucumber_environment.to_s}")
 

data/lib/calabash/device.rb

@@ -253,6 +253,11 @@ module Calabash
       abstract_method!
     end
 
+    # @!visibility private
+    def keyboard_visible?
+      abstract_method!
+    end
+
     private
 
     # @!visibility private

data/lib/calabash/http/retriable_client.rb

@@ -131,8 +131,20 @@ module Calabash
           client.receive_timeout = [time_diff, client.receive_timeout].min
 
           begin
-            return client.send(request_method, @server.endpoint + request.route,
-                               request.params, header)
+            if request_method == :get
+              return client.send(request_method, @server.endpoint + request.route,
+                                 request.params, header)
+            else
+              if request.params.is_a?(Hash)
+                if request.params.key?(:json)
+                  return client.send(request_method, @server.endpoint + request.route,
+                                     {body: request.params[:json]}.merge(header: header))
+                end
+              end
+
+              return client.send(request_method, @server.endpoint + request.route,
+                                 {body: request.params}.merge(header: header))
+            end
           rescue *RETRY_ON => e
             @logger.log "Http error: #{e}"
 

data/lib/calabash/ios.rb

@@ -44,5 +44,6 @@ module Calabash
     include Calabash::IOS::Slider
     include Calabash::IOS::DatePicker
 
+    require 'calabash/ios/legacy'
   end
 end

data/lib/calabash/ios/application.rb

@@ -27,7 +27,7 @@ module Calabash
         application_path = Environment::APP_PATH
 
         if application_path.nil?
-          raise 'No application path is set'
+          raise 'No application path is set. Specify application with environment variable CAL_APP'
         end
 
         Application.new(application_path)
@@ -67,6 +67,13 @@ module Calabash
         @device_binary
       end
 
+      # Is this application an iOS application
+      #
+      # @return [Boolean] Always returns true
+      def ios_application?
+        true
+      end
+
       # Returns the sha1 of the directory or binary of this app's path.
       # @return [String] A checksum.
       def sha1

data/lib/calabash/ios/legacy.rb

@@ -0,0 +1,6 @@
+if Calabash::Environment.variable('DEVICE_ENDPOINT')
+  Calabash::Logger.warn("Deprecated use of old ENV variable 'DEVICE_ENDPOINT'")
+
+  Calabash::IOS::Environment::DEVICE_ENDPOINT =
+      URI.parse(Calabash::Environment.variable('DEVICE_ENDPOINT'))
+end

data/lib/calabash/ios/text.rb

@@ -73,43 +73,6 @@ module Calabash
         Device.default.split_keyboard_visible?
       end
 
-      # Returns true if there is a visible keyboard.
-      #
-      # @return [Boolean] Returns true if there is a visible keyboard.
-      def keyboard_visible?
-        docked_keyboard_visible? || undocked_keyboard_visible? || split_keyboard_visible?
-      end
-
-      # Waits for a keyboard to appear.
-      #
-      # @see Calabash::Wait.default_options
-      #
-      # @param [Number] timeout How long to wait for the keyboard.
-      # @raise [Calabash::Wait::TimeoutError] Raises error if no keyboard
-      #  appears.
-      def wait_for_keyboard(timeout=nil)
-        keyboard_timeout = keyboard_wait_timeout(timeout)
-        message = "Timed out after #{keyboard_timeout} seconds waiting for the keyboard to appear"
-        wait_for(message, timeout: keyboard_timeout) do
-          keyboard_visible?
-        end
-      end
-
-      # Waits for the keyboard to disappear.
-      #
-      # @see Calabash::Wait.default_options
-      #
-      # @param [Number] timeout How log to wait for the keyboard to disappear.
-      # @raise [Calabash::Wait::TimeoutError] Raises error if any keyboard is
-      #  visible after the `timeout`.
-      def wait_for_no_keyboard(timeout=nil)
-        keyboard_timeout = keyboard_wait_timeout(timeout)
-        message = "Timed out after #{keyboard_timeout} seconds waiting for the keyboard to disappear"
-        wait_for(message, timeout: keyboard_timeout) do
-          !keyboard_visible?
-        end
-      end
-
       # Touches the keyboard action key.
       #
       # The action key depends on the keyboard.  Some examples include:
@@ -137,6 +100,11 @@ module Calabash
         Device.default.uia_route("uia.keyboard().typeString('#{char_sequence}')")
       end
 
+      # @!visibility private
+      def _keyboard_visible?
+        docked_keyboard_visible? || undocked_keyboard_visible? || split_keyboard_visible?
+      end
+
       # Touches the keyboard delete key.
       #
       # The 'delete' key difficult to find and touch because its behavior
@@ -242,14 +210,6 @@ module Calabash
               #'International' => nil,
               #'More' => nil,
           }
-
-      def keyboard_wait_timeout(timeout)
-        if timeout.nil?
-          Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
-        else
-          timeout
-        end
-      end
     end
   end
 end

data/lib/calabash/legacy.rb

@@ -0,0 +1,10 @@
+if Calabash::Environment.variable('TEST_APP_PATH')
+  Calabash::Logger.warn("Deprecated use of old ENV variable 'TEST_APP_PATH'")
+  Calabash::Environment::TEST_SERVER_PATH =
+      Calabash::Environment.variable('TEST_APP_PATH')
+end
+
+if Calabash::Environment.variable('APP_PATH')
+  Calabash::Logger.warn("Deprecated use of old ENV variable 'APP_PATH'")
+  Calabash::Environment::APP_PATH = Calabash::Environment.variable('APP_PATH')
+end

data/lib/calabash/lib/skeleton/config/cucumber.yml

@@ -1,6 +1,4 @@
 # config/cucumber.yml
 ##YAML Template
 ---
-# Platform
-android: PLATFORM=android -r features
-ios: PLATFORM=ios -r features
+default: -r features

data/lib/calabash/lib/skeleton/features/support/env.rb

@@ -1,7 +1,21 @@
 require 'calabash'
+require 'calabash/android/application'
+require 'calabash/ios/application'
 
 platform = ENV['PLATFORM']
 
+unless platform
+  application = Calabash::Application.default_from_environment
+
+  if application.android_application?
+    platform = 'android'
+  elsif application.ios_application?
+    platform = 'ios'
+  else
+    raise "Application '#{application}' is neither an Android app or an iOS app"
+  end
+end
+
 case platform
   when 'android'
     require 'calabash/android'
@@ -26,7 +40,7 @@ case platform
         [
             'ERROR! Unable to start the cucumber test:',
             message,
-            "Use the profile 'android' or 'ios', or run cucumber using $ calabash run"
+            "Run cucumber with the ENV variable 'CAL_APP', or run cucumber using $ calabash run"
         ]
 
     Calabash::Logger.error(failure_messages.join("\n"))

data/lib/calabash/text.rb

@@ -93,6 +93,45 @@ module Calabash
       Text.escape_single_quotes(string)
     end
 
+    # Returns true if there is a visible keyboard.
+    # On Android, if a physical keyboard is connected, this method will always
+    # return true.
+    #
+    # @return [Boolean] Returns true if there is a visible keyboard.
+    def keyboard_visible?
+      _keyboard_visible?
+    end
+
+    # Waits for a keyboard to appear.
+    #
+    # @see Calabash::Wait.default_options
+    #
+    # @param [Number] timeout How long to wait for the keyboard.
+    # @raise [Calabash::Wait::TimeoutError] Raises error if no keyboard
+    #  appears.
+    def wait_for_keyboard(timeout=nil)
+      keyboard_timeout = keyboard_wait_timeout(timeout)
+      message = "Timed out after #{keyboard_timeout} seconds waiting for the keyboard to appear"
+      wait_for(message, timeout: keyboard_timeout) do
+        keyboard_visible?
+      end
+    end
+
+    # Waits for the keyboard to disappear.
+    #
+    # @see Calabash::Wait.default_options
+    #
+    # @param [Number] timeout How log to wait for the keyboard to disappear.
+    # @raise [Calabash::Wait::TimeoutError] Raises error if any keyboard is
+    #  visible after the `timeout`.
+    def wait_for_no_keyboard(timeout=nil)
+      keyboard_timeout = keyboard_wait_timeout(timeout)
+      message = "Timed out after #{keyboard_timeout} seconds waiting for the keyboard to disappear"
+      wait_for(message, timeout: keyboard_timeout) do
+        !keyboard_visible?
+      end
+    end
+
     # @!visibility private
     def _enter_text(text)
       abstract_method!
@@ -118,9 +157,23 @@ module Calabash
       abstract_method!
     end
 
+    # @!visibility private
+    def _keyboard_visible?
+      abstract_method!
+    end
+
     # @!visibility private
     def self.escape_single_quotes(string)
       string.gsub("'", "\\\\'")
     end
+
+    # @!visibility private
+    def keyboard_wait_timeout(timeout)
+      if timeout.nil?
+        Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
+      else
+        timeout
+      end
+    end
   end
 end

data/lib/calabash/version.rb

@@ -1,5 +1,5 @@
 module Calabash
 
   # @!visibility private
-  VERSION = "2.0.0.pre6"
+  VERSION = "2.0.0.pre9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre6
+  version: 2.0.0.pre9
 platform: ruby
 authors:
 - Jonas Maturana Larsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -389,6 +389,7 @@ files:
 - lib/calabash/android/environment.rb
 - lib/calabash/android/gestures.rb
 - lib/calabash/android/interactions.rb
+- lib/calabash/android/legacy.rb
 - lib/calabash/android/lib/.irbrc
 - lib/calabash/android/lib/AndroidManifest.xml
 - lib/calabash/android/lib/TestServer.apk
@@ -463,6 +464,7 @@ files:
 - lib/calabash/ios/environment.rb
 - lib/calabash/ios/gestures.rb
 - lib/calabash/ios/interactions.rb
+- lib/calabash/ios/legacy.rb
 - lib/calabash/ios/lib/.irbrc
 - lib/calabash/ios/lib/recordings/rotate_left_home_down_ipad.base64
 - lib/calabash/ios/lib/recordings/rotate_left_home_down_iphone.base64
@@ -487,6 +489,7 @@ files:
 - lib/calabash/ios/slider.rb
 - lib/calabash/ios/text.rb
 - lib/calabash/ios/uia.rb
+- lib/calabash/legacy.rb
 - lib/calabash/lib/skeleton/.gitignore
 - lib/calabash/lib/skeleton/Gemfile
 - lib/calabash/lib/skeleton/config/cucumber.yml
@@ -530,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Automated Acceptance Testing for Mobile Apps