calabash 2.0.0.pre1 → 2.0.0.prelegacy2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5f1a37cf3cb44cfb343b2824ad867a43b8ada5b
-  data.tar.gz: 37184436097bcf66b89307857ccddb35e014ecbc
+  metadata.gz: 7eec9905c00a2b1822fe2023e350f2f62c419c0a
+  data.tar.gz: 6e04cfd68a0a182b63344fdf5656afc35613bf59
 SHA512:
-  metadata.gz: 0737e9ced39e5c585a8a030f1072c537f456bcf3d08f3e11a92fc99c794677fa10f8cbde32a79266ad2dbe25b2081e4abc3c3bca924c9f3162b7f25d423c1d94
-  data.tar.gz: 257460621c5e711e222e84e91f52c070da2ae1a12bda33386bd01ebb7148f9b9c5d05231dc3561bb4adee216f73f6d9bf14464dffdbebed5bfe8728fefc71cc0
+  metadata.gz: 8fb4d1de04c47649ceade147f1977eef6ce298c2f4216f0d0861bef340ed57bbc49dfac5626d0932bb4827629aa81989db7d5d51f640a1bc5cf4856ec391e2e8
+  data.tar.gz: 67fd7bdd4c7f84483ed9424ec9540e8acbff3add8dfc5ce4f5d3813c3507c38a4b49cc1ee50cbb41cd4cd72d90ebf72df97a14d6dd189ec1abaae652f039b1ef

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.
@@ -27,8 +15,6 @@ $ rake -T
 rake android:build     # Build the Android test server
 rake build             # Build calabash-1.9.9.pre2.gem into the pkg directory
 rake ctags             # Generate ctags in ./git/tags
-rake cucumber:android  # Run Android cucumber tests
-rake cucumber:ios      # Run iOS cucumber tests
 rake install           # Build and install calabash-1.9.9.pre2.gem into system gems
 rake release           # Create tag v1.9.9.pre2 and build and push calabash-1.9.9.pre2.gem to Rubygems
 rake spec              # Run RSpec code examples
@@ -63,28 +49,5 @@ $ be cucumber
 
 ### Cucumber iOS
 
-```
-$ cd cucumber/ios
-$ bundle update
-$ rake ensure_app  # Optional. See note below.
-$ be cucumber
-```
-
-The rake task `ensure_app` checks the `cucumber/ios` directory for
-CalSmoke-cal.app. If it exists, it will do nothing.  If it does not exist,
-it will pull the latest sources from the CalSmoke repo, build the
-CalSmoke-cal.app from the master branch, and install it in the
-`cucumber/ios` directory.
-
-If you want to use a different CalSmoke-cal.app, drop it into `cucumber/ios`
-or call cucumber with `CAL\_APP` set.
-
-```
-$ CAL_APP=/path/to/your/CalSmoke-cal.app be cucumber
-```
-
-The rake task `ensure_ipa` does the same thing, but for the CalSmoke-cal.ipa.
-
-Testing against physical devices requires that you have ideviceinstaller
-installed in /usr/local/bin/ideviceinstaller.
+See `cucumber/ios/README.md`.
 

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'
 
 
@@ -112,7 +113,6 @@ module Calabash
       raise ArgumentError, "Expected a 'Class', got '#{page_class.class}'"
     end
 
-
     page_name = page_class.name
     full_page_name = "#{platform_module}::#{page_name}"
 
@@ -120,6 +120,17 @@ module Calabash
       page_class = platform_module.const_get(page_name, false)
 
       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}"
+        end
+
+        if modules.include?('Calabash::Android') &&
+            modules.include?('Calabash::IOS')
+          raise "Page '#{page_class}' includes both Calabash::Android and Calabash::IOS"
+        end
+
         page = page_class.send(:new, self)
 
         if page.is_a?(Calabash::Page)
@@ -241,6 +252,7 @@ module Calabash
       @@has_set_embedding_context
     end
 
+    # @!visibility private
     def self.new_embed_method(method)
       define_method(:embed) do |*args|
         method.call(*args)
@@ -249,6 +261,7 @@ module Calabash
       @@has_set_embedding_context = true
     end
 
+    # @!visibility private
     def embed(*_)
       Logger.warn 'Embed is not available in this context. Will not embed.'
     end
@@ -264,9 +277,9 @@ unless Object.const_defined?(:IOS)
 end
 
 if Calabash::Environment::DEBUG_CALLED_METHODS
-  $stdout.puts "#{Calabash::Color.red("Will print every Calabash method called!")}"
-  $stdout.puts "#{Calabash::Color.red("Warning: This might slow down your test drastically")}"
-  $stdout.puts "#{Calabash::Color.red("and is an experimental feature.")}"
+  $stdout.puts "#{Calabash::Color.red('Will print every Calabash method called!')}"
+  $stdout.puts "#{Calabash::Color.red('Warning: This might slow down your test drastically')}"
+  $stdout.puts "#{Calabash::Color.red('and is an experimental feature.')}"
 
   calabash_file = Calabash.method(:extended).source_location.first
   $__calabash_dir_name = File.dirname(calabash_file)
@@ -274,7 +287,7 @@ if Calabash::Environment::DEBUG_CALLED_METHODS
   trace_func = lambda do |event, file, line, id, binding, classname|
     if event == 'call'
       if classname.to_s.split('::').first == 'Calabash'
-        binding_caller_locations = binding.eval("caller_locations")
+        binding_caller_locations = binding.eval('caller_locations')
         files = binding_caller_locations[3..-1].map(&:path)
 
         calabash_not_in_stacktrace = files.none? do |file|

data/lib/calabash/android.rb

@@ -38,6 +38,8 @@ module Calabash
     require 'calabash/android/text'
     require 'calabash/android/console_helpers'
     require 'calabash/android/life_cycle'
+    require 'calabash/android/scroll'
+    require 'calabash/android/legacy'
 
     include Calabash::Android::Gestures
     include Calabash::Android::Interactions
@@ -45,6 +47,7 @@ module Calabash
     include Calabash::Android::Orientation
     include Calabash::Android::PhysicalButtons
     include Calabash::Android::Text
+    include Calabash::Android::Scroll
 
     # @!visibility private
     def self.binary_location(name, abi, using_pie)

data/lib/calabash/android/adb.rb

@@ -17,8 +17,10 @@ module Calabash
         end
       end
 
+      # @!visibility private
       PROCESS_WAIT_TIME = 10
 
+      # @!visibility private
       def self.open_pipe_with_timeout(timeout, *cmd, &block)
         begin
           i, o, e, t, pid = nil
@@ -52,6 +54,7 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def self.open_adb_pipe(*cmd, **options, &block)
         timeout = options.fetch(:timeout, PROCESS_WAIT_TIME)
 
@@ -60,11 +63,23 @@ module Calabash
         end
       end
 
+      # @!visibility private
       DAEMON_STARTED_MESSAGE = "* daemon not running. starting it now on port 5037 *\n* daemon started successfully *\n"
 
       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
@@ -121,10 +136,12 @@ module Calabash
 
       attr_reader :serial
 
+      # @!visibility private
       def initialize(serial)
         @serial = serial
       end
 
+      # @!visibility private
       def command(*argv, **args)
         cmd = argv.dup
 
@@ -135,9 +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__'
 
-      def shell(shell_cmd, options={})
+      # @!visibility private
+      def old_shell(shell_cmd, options={})
         if shell_cmd.nil? || shell_cmd.empty?
           raise ArgumentError, "Invalid shell command '#{shell_cmd}'"
         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

@@ -16,7 +16,8 @@ module Calabash
           end
         end
 
-        def build
+        # @!visibility private
+        def build(out_file = nil)
           apk_fingerprint = fingerprint_from_apk
           @logger.log "#{@application_path} was signed with a certificate with fingerprint #{apk_fingerprint}", :debug
 
@@ -48,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|
@@ -69,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
@@ -83,6 +95,7 @@ module Calabash
           @logger.log "Done signing the test server. Moved it to #{test_server_file_name}"
         end
 
+        # @!visibility private
         def fingerprint_from_apk
           application_path = File.expand_path(@application_path)
 

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

@@ -5,6 +5,7 @@ module Calabash
     module Build
       # @!visibility private
       class JavaKeystore
+        # @!visibility private
         CALABASH_KEYSTORE_SETTINGS_FILENAME = 'calabash_keystore_settings.json'
 
         attr_reader :errors, :location, :keystore_alias, :store_password
@@ -68,6 +69,7 @@ module Calabash
           @logger.log "Signature algorithm name: #{signature_algorithm_name}", :debug
         end
 
+        # @!visibility private
         def sign_apk(apk_path, dest_path)
           raise "Cannot sign with a miss configured keystore" if errors
           raise "No such file: #{apk_path}" unless File.exists?(apk_path)
@@ -86,6 +88,7 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def system_with_stdout_on_success(cmd, *args)
           a = Escape.shell_command(args)
           cmd = "#{cmd} #{a.gsub("'", '"')}"
@@ -98,10 +101,12 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def fail_wrong_info
           raise "Could not read keystore with the given credentials. Please ensure "
         end
 
+        # @!visibility private
         def self.read_keystore_with_default_password_and_alias(path)
           path = File.expand_path path
 
@@ -128,6 +133,7 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def self.get_keystores
           if keystore = keystore_from_settings
             [ keystore ]
@@ -141,6 +147,7 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def self.keystore_from_settings
           if File.exist?(CALABASH_KEYSTORE_SETTINGS_FILENAME)
             Logger.info "Reading keystore information specified in #{CALABASH_KEYSTORE_SETTINGS_FILENAME}"
@@ -157,16 +164,19 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def self.fail_if_key_missing(map, key)
           raise "Found #{CALABASH_KEYSTORE_SETTINGS_FILENAME} but no #{key} defined." unless map[key]
         end
 
+        # @!visibility private
         def self.extract_md5_fingerprint(fingerprints)
           m = fingerprints.scan(/MD5.*((?:[a-fA-F\d]{2}:){15}[a-fA-F\d]{2})/).flatten
           raise "No MD5 fingerprint found:\n #{fingerprints}" if m.empty?
           m.first
         end
 
+        # @!visibility private
         def self.extract_signature_algorithm_name(fingerprints)
           m = fingerprints.scan(/Signature algorithm name: (.*)/).flatten
           raise "No signature algorithm names found:\n #{fingerprints}" if m.empty?

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

@@ -14,6 +14,7 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def resign!
           Dir.mktmpdir do |tmp_dir|
             @logger.log 'Resigning apk', :debug
@@ -26,6 +27,7 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def unsign(unsigned_path)
           meta_files = `"#{Environment.aapt_path}" list "#{unsigned_path}"`.lines.collect(&:strip).grep(/^META-INF\//)
 
@@ -53,12 +55,14 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def zipalign(unaligned_path, app_path)
           cmd = %Q("#{Environment.zipalign_path}" -f 4 "#{unaligned_path}" "#{app_path}")
           @logger.log "Zipaligning using: #{cmd}", :debug
           system(cmd)
         end
 
+        # @!visibility private
         def sign(app_path, dest_path)
           java_keystore = JavaKeystore.get_keystores.first
 

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

@@ -7,10 +7,12 @@ module Calabash
           @application_path = application_path
         end
 
+        # @!visibility private
         def path
           File.expand_path("test_servers/#{checksum(@application_path)}_#{VERSION}.apk")
         end
 
+        # @!visibility private
         def exists?
           File.exists?(path)
         end

data/lib/calabash/android/defaults.rb

@@ -1,5 +1,6 @@
 module Calabash
   module Android
+    # Runtime defaults for Android.
     module Defaults
       # Sets up the default device and the default application based on the
       # environment.

data/lib/calabash/android/device.rb

@@ -22,6 +22,7 @@ module Calabash
         port_forward(new_server.endpoint.port, new_server.test_server_port)
       end
 
+      # @!visibility private
       def self.default_serial
         serials = list_serials
 
@@ -46,6 +47,7 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def self.list_serials
         output = ADB.command('devices')
         lines = output.lines
@@ -62,12 +64,14 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def installed_packages
         adb.shell('pm list packages').lines.map do |line|
           line.sub('package:', '').chomp
         end
       end
 
+      # @!visibility private
       def installed_apps
         adb.shell('pm list packages -f').lines.map do |line|
           # line will be package:<path>=<package>
@@ -80,6 +84,7 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def test_server_responding?
         begin
           http_client.get(HTTP::Request.new('ping'), retries: 1).body == 'pong'
@@ -88,6 +93,7 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def test_server_ready?
         begin
           http_client.get(HTTP::Request.new('ready')).body == 'true'
@@ -96,6 +102,7 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def port_forward(host_port, test_server_port = nil)
         if test_server_port.nil?
           test_server_port = server.test_server_port
@@ -105,6 +112,7 @@ module Calabash
         adb.command(*adb_forward_cmd)
       end
 
+      # @!visibility private
       def make_map_parameters(query, map_method_name, *method_args)
         converted_args = []
 
@@ -172,6 +180,7 @@ module Calabash
         Calabash::QueryResult.create(result['results'], query)
       end
 
+      # @!visibility private
       def perform_action(action, *arguments)
         @logger.log "Action: #{action} - Arguments: #{arguments.join(', ')}"
 
@@ -197,10 +206,12 @@ module Calabash
         result
       end
 
+      # @!visibility private
       def enter_text(text)
         perform_action('keyboard_enter_text', text)
       end
 
+      # @!visibility private
       def md5_checksum(file_path)
         result = adb.shell("#{md5_binary} '#{file_path}'")
         captures = result.match(/(\w+)/).captures
@@ -234,15 +245,41 @@ 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")
       end
 
+      # @!visibility private
       def set_location(location)
         perform_action('set_gps_coordinates',
                        location[:latitude], location[:longitude])
       end
 
+      # @!visibility private
       def resume_app(path_or_application)
         application = parse_path_or_app_parameters(path_or_application)
 
@@ -263,6 +300,7 @@ module Calabash
         true
       end
 
+      # @!visibility private
       def resume_activity(package, activity)
         if package_running?(package)
           if info[:sdk_version] >= 11
@@ -279,12 +317,14 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def app_running?(path_or_application)
         application = parse_path_or_app_parameters(path_or_application)
 
         package_running?(application.identifier)
       end
 
+      # @!visibility private
       def current_focus
         # Example: mFocusedApp=AppWindowToken{42c52610 token=Token{42b5d048 ActivityRecord{42a7bcc8 u0 com.example/.MainActivity t3}}}
         result = adb.shell('dumpsys window windows')
@@ -314,6 +354,7 @@ module Calabash
         raise "Unexpected output from `dumpsys window windows`"
       end
 
+      # @!visibility private
       def evaluate_javascript_in(query, javascript)
         parameters =
             {
@@ -705,7 +746,7 @@ module Calabash
           installed_app_md5_checksum = md5_checksum(installed_app[:path])
 
           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