calabash 2.0.0.pre11 → 2.0.0.prelegacy

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3765e67e7cec21052896d43ad8e3b52ab873aa9
-  data.tar.gz: a25e627e951abd1f87d3aae55745fb3451853a75
+  metadata.gz: c9918df9dac58e62b8dd1f98df5e15bc1397e45c
+  data.tar.gz: da8b89437c9d0081fd3e95ea87f6f9fdb622a816
 SHA512:
-  metadata.gz: b4bf50f53dc792ff9854f068761d3ab3f464a4028c777292529a3172c5dd681a489b74ac1467aec1fa3954073e7425b27b43a39a2cab1e8e30a4a551f5043c06
-  data.tar.gz: 331293d4107302ccd412ef857d3a274977fe872ad93b642f00eb12689e16a1a889b157c6f13cf80493d34b6ed9c96993f6516ee9ab6ab18a09aae2cb681db537
+  metadata.gz: dbf27f752dabd23e53ed70a7562314d6affe0cb14e770d46e97d1c59c4c5836f58c26cdb75cb23ebd38ce50a3e662e9aac7edb6a334dd764169d49d0f80ad0db
+  data.tar.gz: fd52b4f6b2d24111cf62d015a833d9eded491b5dd926fa72c114eaf7a2c83598865803e7ddaa960a164db0fd42115c786f862765c3039071ad2a8852c9bb6aee

data/README.md

@@ -4,7 +4,7 @@
 
 ## Calabash
 
-Automated Acceptance Testing for Mobile Apps.
+Automated Acceptance Testing for Mobile Apps
 
 ## Rake
 
@@ -29,13 +29,25 @@ 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.
 ```
 
-### Integration tests
+### Cucumber Android
+
+**NOTE** If you find you cannot launch on Android, be sure you run the
+`copy\_repos` and `changing\_old\_files.sh` script.
 
 ```
-$ 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
+$ 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
 ```
+
+### Cucumber iOS
+
+See `cucumber/ios/README.md`.
+

data/bin/calabash

@@ -11,6 +11,7 @@ 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)
@@ -68,12 +69,12 @@ module Calabash
               parse_resign_arguments!
             when 'console'
               parse_console_arguments!
-            when 'generate-cucumber'
+            when 'generate'
               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/android/adb.rb

@@ -66,10 +66,20 @@ module Calabash
       # @!visibility private
       DAEMON_STARTED_MESSAGE = "* daemon not running. starting it now on port 5037 *\n* daemon started successfully *\n"
 
-      # @!visibility private
       def self.command(*cmd, **args)
         Logger.debug("ADB Command: #{cmd.join(', ')}")
         Logger.debug("ADB input: #{args[:input]}")
+
+        cmd_s = "#{Environment.adb_path} #{cmd.join(' ')}"
+
+        Logger.debug("Going to execute: #{cmd_s}")
+        `#{cmd_s}`
+      end
+
+      # @!visibility private
+      def self.old_command(*cmd, **args)
+        Logger.debug("ADB Command: #{cmd.join(', ')}")
+        Logger.debug("ADB input: #{args[:input]}")
         stderr = nil
         stdout = nil
         exit_code = nil
@@ -142,11 +152,16 @@ module Calabash
         ADB.command(*cmd, args)
       end
 
+      # @!visibility private
+      def shell(shell_cmd, options={})
+        command('shell', shell_cmd)
+      end
+
       # @!visibility private
       END_STRING = '__CAL_END__'
 
       # @!visibility private
-      def shell(shell_cmd, options={})
+      def old_shell(shell_cmd, options={})
         if shell_cmd.nil? || shell_cmd.empty?
           raise ArgumentError, "Invalid shell command '#{shell_cmd}'"
         end
@@ -182,40 +197,34 @@ module Calabash
         # exit_code_s =
         # [6] "0\r\n"
 
-        unless shell_name.empty?
-          index = result.lines.index {|line| line.start_with?(shell_name)}
+        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
-            end
+        15.times do |i|
+          if last_line[-(END_STRING.length+i-1)..-i] == END_STRING
+            end_index = -i
+            break
           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]
-        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
+        # Get the exit code
+        exit_code_s = out[-1][end_index+1..-1]
 
         unless options[:no_exit_code_check]
           unless exit_code_s.to_i.to_s == exit_code_s.chomp
@@ -277,12 +286,6 @@ 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::Utility.bundle_exec_prepend}calabash build \"#{application_path}\"'"
+          Logger.error "Build it using: '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::Utility.bundle_exec_prepend}calabash resign \"#{@application_path}\""
+      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::Utility.bundle_exec_prepend}calabash setup-keystore again")
+              Logger.error('Could not parse keystore settings. Please run 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::Utility.bundle_exec_prepend}calabash setup-keystore"
+            raise 'No keystores found. You can specify the keystore location and credentials using calabash setup-keystore'
           end
 
           java_keystore.sign_apk(app_path, dest_path)