calabash 2.0.0.pre10 → 2.0.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1788f3f3e1bfd128768042749d0b7d5dbdebb8ab
-  data.tar.gz: 68d92c0989f89f7b4d4cf55a23a0daed83fa25e1
+  metadata.gz: f3765e67e7cec21052896d43ad8e3b52ab873aa9
+  data.tar.gz: a25e627e951abd1f87d3aae55745fb3451853a75
 SHA512:
-  metadata.gz: f46b1426f57a039bebe2ac8e59c015f6ad2720217cb37b0e8df118614fa958a4d2cb2ec62890dee52dbb41980c5111c435567c7756ae746487bf69797ceae898
-  data.tar.gz: 5ed96dfbd5603d13ba3dbbc4a976bb7839641b74d514c178c71f0c2fe6f26f9f8e1cae7bd11b5acc6b5f1bbbf7ffd58037c95180ba0fcb3d99b5a384565061a9
+  metadata.gz: b4bf50f53dc792ff9854f068761d3ab3f464a4028c777292529a3172c5dd681a489b74ac1467aec1fa3954073e7425b27b43a39a2cab1e8e30a4a551f5043c06
+  data.tar.gz: 331293d4107302ccd412ef857d3a274977fe872ad93b642f00eb12689e16a1a889b157c6f13cf80493d34b6ed9c96993f6516ee9ab6ab18a09aae2cb681db537

data/README.md

@@ -4,7 +4,7 @@
 
 ## Calabash
 
-Automated Acceptance Testing for Mobile Apps
+Automated Acceptance Testing for Mobile Apps.
 
 ## Rake
 
@@ -29,25 +29,13 @@ rake yard:publish      # Generate and publish docs
 
 ```
 $ be rake unit # All unit tests.
-$ be rake spec # All tests.  Launches iOS Simulators, etc.
 $ be guard     # Run unit tests as you develop.
 ```
 
-### Cucumber Android
-
-**NOTE** If you find you cannot launch on Android, be sure you run the
-`copy\_repos` and `changing\_old\_files.sh` script.
+### Integration tests
 
 ```
-$ bundle update
-$ rake android:build
-$ cd cucumber/android
-$ be calabash resign ../../spec/resources/android/xtc-android-sample.apk
-$ be calabash build ../../spec/resources/android/xtc-android-sample.apk
-$ be cucumber
+$ rake integration:page-object-model  # Run POM tests
+$ rake integration:ruby               # Run tests ensuing correct Ruby interfacing
+$ rake integration:cli                # Run command line interface tests
 ```
-
-### Cucumber iOS
-
-See `cucumber/ios/README.md`.
-

data/bin/calabash

@@ -11,7 +11,6 @@ module Calabash
       include Calabash::CLI::Console
       include Calabash::CLI::Generate
       include Calabash::CLI::Resign
-      include Calabash::CLI::Run
       include Calabash::CLI::SetupKeystore
 
       def initialize(arguments)
@@ -69,12 +68,12 @@ module Calabash
               parse_resign_arguments!
             when 'console'
               parse_console_arguments!
-            when 'generate'
+            when 'generate-cucumber'
               parse_generate_arguments!
-            when 'run'
-              parse_run_arguments!
             when 'setup-keystore'
               parse_setup_keystore_arguments!
+            when 'used-bundler' # For testing purposes
+              puts Calabash::Utility.used_bundler?
             when 'help'
               argument = @arguments.shift
 

data/lib/calabash.rb

@@ -1,14 +1,18 @@
-# Calabash is a Behavior-driven development (BDD) framework for Android and
-# iOS. It supports both native and hybrid app testing.
+# Calabash is a mobile automation tool used for automatic UI-testing.
+# It supports Android and iOS, both native and hybrid app testing.
 #
 # It is developed and maintained by Xamarin and is released under the Eclipse
 # Public License.
 module Calabash
+  class RequiredBothPlatformsError < LoadError
+  end
+
   require 'calabash/version'
   require 'calabash/environment'
   require 'calabash/logger'
   require 'calabash/color'
   require 'calabash/utility'
+  require 'calabash/retry'
   require 'calabash/application'
   require 'calabash/device'
   require 'calabash/http'
@@ -24,9 +28,11 @@ module Calabash
   require 'calabash/query'
   require 'calabash/text'
   require 'calabash/interactions'
+  require 'calabash/web'
   require 'calabash/defaults'
   require 'calabash/legacy'
   require 'calabash/console_helpers'
+  require 'calabash/internal'
 
 
   require 'calabash/patch'
@@ -42,6 +48,7 @@ module Calabash
   include Calabash::Orientation
   include Calabash::Text
   include Calabash::Interactions
+  include Calabash::Web
   extend Calabash::Defaults
 
   require 'calabash/page'
@@ -54,9 +61,9 @@ module Calabash
   # @example
   #  # android/pages/my_page.rb
   #  class Android::MyPage < Calabash::Page
-  #    include Calabash::Android
-  #
-  #    # [...]
+  #    def method
+  #      # [...]
+  #    end
   #  end
   #
   #  # step definition
@@ -71,7 +78,7 @@ module Calabash
   #  # pages/abstract_login_page.rb
   #  class AbstractLoginPage < Calabash::Page
   #    def login(username, password)
-  #     enter_text_in(username_field, username)
+  #     cal.enter_text_in(username_field, username)
   #     # [...]
   #    end
   #
@@ -84,8 +91,6 @@ module Calabash
   #
   #  # pages/android_login_page.rb
   #  class Android::LoginPage < SharedLoginPage
-  #    include Calabash::Android
-  #
   #    private
   #
   #    def username_field
@@ -122,8 +127,9 @@ module Calabash
       if page_class.is_a?(Class)
         modules = page_class.included_modules.map(&:to_s)
 
-        unless modules.include?("Calabash::#{platform_module}")
-          raise "Page '#{page_class}' does not include Calabash::#{platform_module}"
+        if modules.include?("Calabash::#{platform_module}")
+          Logger.warn("Page '#{page_class}' includes Calabash::#{platform_module}. It is recommended not to include Calabash.")
+          Logger.warn("Use cal.<method> for cross-platform methods, cal_android.<method> for Android-only and cal_ios.<method> for iOS-only")
         end
 
         if modules.include?('Calabash::Android') &&
@@ -131,6 +137,10 @@ module Calabash
           raise "Page '#{page_class}' includes both Calabash::Android and Calabash::IOS"
         end
 
+        unless page_class.ancestors.include?(Calabash::Page)
+          raise "Page '#{page_class}' is not a Calabash::Page"
+        end
+
         page = page_class.send(:new, self)
 
         if page.is_a?(Calabash::Page)
@@ -317,3 +327,36 @@ if Calabash::Environment::DEBUG_CALLED_METHODS
 
   set_trace_func(trace_func)
 end
+
+# @!visibility private
+class CalabashMethodsInternal
+  include ::Calabash
+end
+
+# @!visibility private
+class CalabashMethods < BasicObject
+  include ::Calabash
+
+  instance_methods.each do |method_name|
+    define_method(method_name) do |*args, &block|
+      ::CalabashMethodsInternal.new.send(method_name, *args, &block)
+    end
+  end
+end
+
+# Returns a object that exposes all of the public Calabash cross-platform API.
+# This method should *always* be used to access the Calabash API. By default,
+# all methods are executed using the default device and the default
+# application.
+#
+# For OS specific methods use {cal_android} and {cal_ios}
+#
+# All API methods are available with documentation in {Calabash}
+#
+# @see {Calabash}
+#
+# @return [Object] Instance responding to all cross-platform Calabash methods
+#  in the API.
+def cal
+  CalabashMethods.new
+end

data/lib/calabash/android.rb

@@ -1,4 +1,35 @@
 module Calabash
+  # @!visibility private
+  module AndroidInternal
+    require 'calabash'
+
+    require 'calabash/android/environment'
+    require 'calabash/android/application'
+    require 'calabash/android/build'
+    require 'calabash/android/device'
+    require 'calabash/android/screenshot'
+    require 'calabash/android/server'
+    require 'calabash/android/adb'
+    require 'calabash/android/gestures'
+    require 'calabash/android/interactions'
+    require 'calabash/android/orientation'
+    require 'calabash/android/physical_buttons'
+    require 'calabash/android/text'
+    require 'calabash/android/web'
+    require 'calabash/android/console_helpers'
+    require 'calabash/android/life_cycle'
+    require 'calabash/android/scroll'
+
+    include Calabash::Android::Gestures
+    include Calabash::Android::Interactions
+    include Calabash::Android::LifeCycle
+    include Calabash::Android::Orientation
+    include Calabash::Android::PhysicalButtons
+    include Calabash::Android::Text
+    include Calabash::Android::Scroll
+    include Calabash::Android::Web
+  end
+
   # Contains the Android implementations of the Calabash APIs.
   module Android
     # @!visibility private
@@ -12,9 +43,6 @@ module Calabash
     # @!visibility private
     HELPER_APPLICATION_TEST_SERVER = File.join(File.dirname(__FILE__), 'android', 'lib', 'HelperApplicationTestServer.apk')
 
-    require 'calabash'
-    include Calabash
-
     # @!visibility private
     def self.extended(base)
       Calabash.send(:extended, base)
@@ -25,32 +53,14 @@ module Calabash
       Calabash.send(:included, base)
     end
 
+    require 'calabash'
+    # Hide from documentation
+    send(:include, Calabash)
+
     require 'calabash/android/defaults'
     extend Calabash::Android::Defaults
 
-    require 'calabash/android/environment'
-    require 'calabash/android/application'
-    require 'calabash/android/build'
-    require 'calabash/android/device'
-    require 'calabash/android/screenshot'
-    require 'calabash/android/server'
-    require 'calabash/android/adb'
-    require 'calabash/android/gestures'
-    require 'calabash/android/interactions'
-    require 'calabash/android/orientation'
-    require 'calabash/android/physical_buttons'
-    require 'calabash/android/text'
-    require 'calabash/android/console_helpers'
-    require 'calabash/android/life_cycle'
-    require 'calabash/android/scroll'
-
-    include Calabash::Android::Gestures
-    include Calabash::Android::Interactions
-    include Calabash::Android::LifeCycle
-    include Calabash::Android::Orientation
-    include Calabash::Android::PhysicalButtons
-    include Calabash::Android::Text
-    include Calabash::Android::Scroll
+    include ::Calabash::AndroidInternal
 
     # @!visibility private
     def self.binary_location(name, abi, using_pie)
@@ -73,5 +83,56 @@ module Calabash
   end
 end
 
-# Setup environment on load
-Calabash::Android::Environment.setup
+unless Calabash::Environment.variable("CAL_NO_DEPENDENCIES") == "1"
+  # Setup environment on load
+  Calabash::Android::Environment.setup
+end
+
+# @!visibility private
+class CalabashAndroidMethodsInternal
+  include ::Calabash::Android
+end
+
+# @!visibility private
+class CalabashAndroidMethods < BasicObject
+  include ::Calabash::AndroidInternal
+
+  instance_methods.each do |method_name|
+    define_method(method_name) do |*args, &block|
+      ::CalabashAndroidMethodsInternal.new.send(method_name, *args, &block)
+    end
+  end
+end
+
+# Returns a object that exposes all of the public Calabash Android API.
+# This method should *always* be used to access the Calabash API. By default,
+# all methods are executed using the default device and the default
+# application.
+#
+# For iOS specific methods use {cal_ios}. For cross-platform methods use {cal}.
+#
+# All Android API methods are available with documentation in
+# {Calabash::Android}
+#
+# @see Calabash::Android
+#
+# @return [Object] Instance responding to all Calabash Android methods
+#  in the API.
+def cal_android
+  CalabashAndroidMethods.new
+end
+
+# We also want to patch `cal` to invoke the Android implementations
+class CalabashMethodsInternal
+  include ::Calabash::Android
+
+  instance_methods.each do |method_name|
+    define_method(method_name) do |*args, &block|
+      ::CalabashAndroidMethodsInternal.new.send(method_name, *args, &block)
+    end
+  end
+end
+
+if defined?(::Calabash::IOSInternal)
+  raise Calabash::RequiredBothPlatformsError, "Cannot require both calabash/android and calabash/ios"
+end

data/lib/calabash/android/adb.rb

@@ -182,34 +182,40 @@ module Calabash
         # exit_code_s =
         # [6] "0\r\n"
 
-        index = result.lines.index {|line| line.start_with?(shell_name)}
+        unless shell_name.empty?
+          index = result.lines.index {|line| line.start_with?(shell_name)}
 
-        if index.nil?
-          raise ADBCallError.new("Could not parse output #{ADB.dot_string(result, 100)}", result)
-        end
+          if index.nil?
+            raise ADBCallError.new("Could not parse output #{ADB.dot_string(result, 100)}", result)
+          end
 
-        # Remove the commands
-        out = result.lines[index+1..-1]
+          # Remove the commands
+          out = result.lines[index+1..-1]
 
-        last_line = out.last
-        end_index = nil
+          last_line = out.last
+          end_index = nil
 
-        15.times do |i|
-          if last_line[-(END_STRING.length+i-1)..-i] == END_STRING
-            end_index = -i
-            break
+          15.times do |i|
+            if last_line[-(END_STRING.length+i-1)..-i] == END_STRING
+              end_index = -i
+              break
+            end
           end
-        end
 
-        if end_index.nil?
-          raise ADBCallError.new("Could not parse output #{ADB.dot_string(result, 100)}", result)
-        end
+          if end_index.nil?
+            raise ADBCallError.new("Could not parse output #{ADB.dot_string(result, 100)}", result)
+          end
 
-        # Get the result from the command
-        command_result = out[0..-2].join + last_line[0..(end_index - END_STRING.length)]
+          # Get the result from the command
+          command_result = out[0..-2].join + last_line[0..(end_index - END_STRING.length)]
 
-        # Get the exit code
-        exit_code_s = out[-1][end_index+1..-1]
+          # Get the exit code
+          exit_code_s = out[-1][end_index+1..-1]
+        else # Some devices (like Android N) have started just giving us the result without all the spam
+          out = result.lines
+          command_result = out[0..-2].join
+          exit_code_s = out[-1][END_STRING.length..-1]
+        end
 
         unless options[:no_exit_code_check]
           unless exit_code_s.to_i.to_s == exit_code_s.chomp
@@ -271,6 +277,12 @@ module Calabash
 
           #result.lines.index {|line| !line.start_with?('echo')}
 
+          # Some devices (like Android N) have started just giving us the results
+          if result.strip == "test"
+            @shell_name = ""
+            return @shell_name
+          end
+
           # "shell@hammerhead:/ $ echo \"foo\"; exit 0\r\r\n"
           shell_name_line = result.lines[-2]
 

data/lib/calabash/android/application.rb

@@ -29,7 +29,7 @@ module Calabash
 
         unless File.exist?(test_server_path)
           Logger.error "Test-server '#{test_server_path}' does not exist."
-          Logger.error "Build it using: 'calabash build \"#{application_path}\"'"
+          Logger.error "Build it using: '#{Calabash::Utility.bundle_exec_prepend}calabash build \"#{application_path}\"'"
           Logger.error ''
           raise "Test-server '#{test_server_path}' does not exist."
         end

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

@@ -38,7 +38,7 @@ module Calabash
             end
             @logger.log ""
             @logger.log "You can resign the app with #{keystores.first.location} by running:
-      calabash resign \"#{@application_path}\""
+      #{Calabash::Utility.bundle_exec_prepend}calabash resign \"#{@application_path}\""
 
             @logger.log ""
             @logger.log "Notice that resigning an app might break some functionality."

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

@@ -155,7 +155,7 @@ module Calabash
             begin
               keystore = JSON.parse(IO.read(CALABASH_KEYSTORE_SETTINGS_FILENAME))
             rescue JSON::ParserError => e
-              Logger.error('Could not parse keystore settings. Please run calabash setup-keystore again')
+              Logger.error("Could not parse keystore settings. Please run #{Calabash::Utility.bundle_exec_prepend}calabash setup-keystore again")
 
               raise e
             end

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

@@ -67,7 +67,7 @@ module Calabash
           java_keystore = JavaKeystore.get_keystores.first
 
           if java_keystore.nil?
-            raise 'No keystores found. You can specify the keystore location and credentials using calabash setup-keystore'
+            raise "No keystores found. You can specify the keystore location and credentials using #{Calabash::Utility.bundle_exec_prepend}calabash setup-keystore"
           end
 
           java_keystore.sign_apk(app_path, dest_path)