calabash 2.0.0.pre11 → 2.0.0.prelegacy

data/lib/calabash.rb

@@ -1,18 +1,14 @@
-# Calabash is a mobile automation tool used for automatic UI-testing.
-# It supports Android and iOS, both native and hybrid app testing.
+# Calabash is a Behavior-driven development (BDD) framework for Android and
+# iOS. It supports 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'
@@ -28,11 +24,9 @@ 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'
@@ -48,7 +42,6 @@ module Calabash
   include Calabash::Orientation
   include Calabash::Text
   include Calabash::Interactions
-  include Calabash::Web
   extend Calabash::Defaults
 
   require 'calabash/page'
@@ -61,9 +54,9 @@ module Calabash
   # @example
   #  # android/pages/my_page.rb
   #  class Android::MyPage < Calabash::Page
-  #    def method
-  #      # [...]
-  #    end
+  #    include Calabash::Android
+  #
+  #    # [...]
   #  end
   #
   #  # step definition
@@ -78,7 +71,7 @@ module Calabash
   #  # pages/abstract_login_page.rb
   #  class AbstractLoginPage < Calabash::Page
   #    def login(username, password)
-  #     cal.enter_text_in(username_field, username)
+  #     enter_text_in(username_field, username)
   #     # [...]
   #    end
   #
@@ -91,6 +84,8 @@ module Calabash
   #
   #  # pages/android_login_page.rb
   #  class Android::LoginPage < SharedLoginPage
+  #    include Calabash::Android
+  #
   #    private
   #
   #    def username_field
@@ -127,9 +122,8 @@ module Calabash
       if page_class.is_a?(Class)
         modules = page_class.included_modules.map(&:to_s)
 
-        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")
+        unless modules.include?("Calabash::#{platform_module}")
+          raise "Page '#{page_class}' does not include Calabash::#{platform_module}"
         end
 
         if modules.include?('Calabash::Android') &&
@@ -137,10 +131,6 @@ 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)
@@ -327,36 +317,3 @@ 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

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: calabash
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre11
+  version: 2.0.0.prelegacy
 platform: ruby
 authors:
+- Jonas Maturana Larsen
 - Karl Krukow
 - Tobias Røikjer
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -92,7 +93,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -102,7 +103,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -238,6 +239,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -308,20 +323,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
@@ -351,12 +352,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
-  Calabash is a mobile automation tool used for automatic UI-testing.
-  It supports Android and iOS, both native and hybrid app testing.
+  Calabash is a Behavior-driven development (BDD)
+  framework for Android and iOS. It supports both native and hybrid app testing.
 
   It is developed and maintained by Xamarin and is released under the Eclipse
   Public License.
 email:
+- jonaspec.larsen@xamarin.com
 - karl.krukow@xamarin.com
 - tobias.roikjer@xamarin.com
 - joshua.moody@xamarin.com
@@ -384,15 +386,12 @@ files:
 - lib/calabash/android/console_helpers.rb
 - lib/calabash/android/defaults.rb
 - lib/calabash/android/device.rb
-- lib/calabash/android/device/helper_application.rb
 - 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/HelperApplication.apk
-- lib/calabash/android/lib/HelperApplicationTestServer.apk
 - lib/calabash/android/lib/TestServer.apk
 - lib/calabash/android/lib/calmd5/arm64-v8a/calmd5
 - lib/calabash/android/lib/calmd5/arm64-v8a/calmd5-pie
@@ -416,7 +415,6 @@ files:
 - lib/calabash/android/scroll.rb
 - lib/calabash/android/server.rb
 - lib/calabash/android/text.rb
-- lib/calabash/android/web.rb
 - lib/calabash/application.rb
 - lib/calabash/cli.rb
 - lib/calabash/cli/build.rb
@@ -434,17 +432,11 @@ files:
 - lib/calabash/gestures.rb
 - lib/calabash/http.rb
 - lib/calabash/http/error.rb
-- lib/calabash/http/forwarding_client.rb
 - lib/calabash/http/request.rb
 - lib/calabash/http/retriable_client.rb
 - lib/calabash/interactions.rb
-- lib/calabash/internal.rb
 - lib/calabash/ios.rb
 - lib/calabash/ios/application.rb
-- lib/calabash/ios/automator.rb
-- lib/calabash/ios/automator/automator.rb
-- lib/calabash/ios/automator/coordinates.rb
-- lib/calabash/ios/automator/device_agent.rb
 - lib/calabash/ios/conditions.rb
 - lib/calabash/ios/console_helpers.rb
 - lib/calabash/ios/date_picker.rb
@@ -466,12 +458,12 @@ files:
 - lib/calabash/ios/device/routes/uia_route_mixin.rb
 - lib/calabash/ios/device/runtime_attributes.rb
 - lib/calabash/ios/device/status_bar_mixin.rb
+- lib/calabash/ios/device/text_mixin.rb
 - lib/calabash/ios/device/uia_keyboard_mixin.rb
 - lib/calabash/ios/device/uia_mixin.rb
 - 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
@@ -496,16 +488,15 @@ files:
 - lib/calabash/ios/slider.rb
 - lib/calabash/ios/text.rb
 - lib/calabash/ios/uia.rb
-- lib/calabash/ios/web.rb
 - lib/calabash/legacy.rb
 - lib/calabash/lib/skeleton/.gitignore
-- lib/calabash/lib/skeleton/Gemfile.skeleton
-- lib/calabash/lib/skeleton/config/cucumber.yml.skeleton
-- lib/calabash/lib/skeleton/features/sample.feature.skeleton
-- lib/calabash/lib/skeleton/features/step_definitions/sample_steps.rb.skeleton
-- lib/calabash/lib/skeleton/features/support/dry_run.rb.skeleton
-- lib/calabash/lib/skeleton/features/support/env.rb.skeleton
-- lib/calabash/lib/skeleton/features/support/hooks.rb.skeleton
+- lib/calabash/lib/skeleton/Gemfile
+- lib/calabash/lib/skeleton/config/cucumber.yml
+- lib/calabash/lib/skeleton/features/sample.feature
+- lib/calabash/lib/skeleton/features/step_definitions/calabash_steps.rb
+- lib/calabash/lib/skeleton/features/support/dry_run.rb
+- lib/calabash/lib/skeleton/features/support/env.rb
+- lib/calabash/lib/skeleton/features/support/hooks.rb
 - lib/calabash/life_cycle.rb
 - lib/calabash/location.rb
 - lib/calabash/logger.rb
@@ -515,15 +506,12 @@ files:
 - lib/calabash/patch/array.rb
 - lib/calabash/query.rb
 - lib/calabash/query_result.rb
-- lib/calabash/retry.rb
 - lib/calabash/screenshot.rb
 - lib/calabash/server.rb
-- lib/calabash/stubs.rb
 - lib/calabash/text.rb
 - lib/calabash/utility.rb
 - lib/calabash/version.rb
 - lib/calabash/wait.rb
-- lib/calabash/web.rb
 homepage: https://xamarin.com/test-cloud
 licenses:
 - EPL-1.0
@@ -544,8 +532,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Automated Acceptance Testing for Mobile Apps
 test_files: []
+has_rdoc: 

data/lib/calabash/android/device/helper_application.rb

@@ -1,95 +0,0 @@
-require 'json'
-
-module Calabash
-  module Android
-    class Device
-      module HelperApplication
-        def ensure_helper_application_started
-          unless $_calabash_helper_application_started
-            $stdout.puts "NEW DEBUG: IN HERE"
-            $stdout.puts "NEW DEBUG: INSTALLING"
-            install_helper_application
-            $stdout.puts "NEW DEBUG: STARTING"
-            begin
-              start_helper_application
-            rescue => e
-              $stdout.puts "NEW DEBUG EXCERPICON: #{e.backtrace.join("\n")}"
-              raise e
-            end
-
-            $stdout.puts "NEW DEBUG: DONE STARTING"
-            $_calabash_helper_application_started = true
-          end
-        end
-
-        def helper_application_server
-          Calabash::Android::Server.default_helper
-        end
-
-        def helper_application
-          Calabash::Android::Application.new(Calabash::Android::HELPER_APPLICATION,
-                                             Calabash::Android::HELPER_APPLICATION_TEST_SERVER)
-        end
-
-        def helper_application_http_client
-          @helper_application_http_client ||= lambda do
-            server = Calabash::HTTP::RetriableClient.new(helper_application_server)
-            port_forward(helper_application_server.endpoint, helper_application_server.test_server_port)
-
-            server.on_error(Errno::ECONNREFUSED) do |s|
-              port_forward(s.endpoint.port, s.test_server_port)
-            end
-
-            server
-          end.call
-        end
-
-        # @!visibility private
-        def install_helper_application
-          begin
-            @logger.log "Ensuring helper application is installed"
-            ensure_app_installed(helper_application)
-          rescue => e
-            @logger.log("Unable to install helper application!", :error)
-            raise e
-          end
-
-          $_calabash_helper_application_installed = true
-        end
-
-        # @!visibility private
-        def has_installed_helper_application?
-          $_calabash_helper_application_installed
-        end
-
-        # @!visibility private
-        def helper_application_responding?
-          begin
-            helper_application_http_client.post(HTTP::Request.new('ping'), retries: 1).body == 'pong'
-          rescue HTTP::Error => e
-            $stdout.puts "SH NEW DEBUG: PING ERROR #{e.backtrace.join("\n")}"
-            false
-          end
-        end
-
-        def start_helper_application
-          cmd = ["am start",
-                 "-e testServerPort 0",
-                 "-e port 8081",
-                 "sh.calaba.calabashhelper/sh.calaba.calabashhelper.MainActivity"].join(" ")
-
-          adb.shell(cmd)
-
-          100.times do |i|
-            if i == 99
-              raise "Unable to start helper application"
-            end
-
-            break if helper_application_responding?
-            sleep 1
-          end
-        end
-      end
-    end
-  end
-end

data/lib/calabash/android/web.rb

@@ -1,12 +0,0 @@
-module Calabash
-  module Android
-    module Web
-      # @!visibility private
-      define_method(:_evaluate_javascript_in) do |query, javascript|
-        Calabash::Internal.with_default_device(required_os: :android) do |device|
-          device.evaluate_javascript_in(query, javascript)
-        end
-      end
-    end
-  end
-end

data/lib/calabash/http/forwarding_client.rb

@@ -1,23 +0,0 @@
-module Calabash
-  module HTTP
-    class ForwardingClient
-      HEADER_FORWARD = 'X-FORWARD-PORT'
-      ROUTES = [:get, :post, :put, :delete]
-
-      def initialize(client, forward_to_port)
-        @client = client
-        @forward_to_port = forward_to_port
-      end
-
-      ROUTES.each do |route|
-        define_method(route) do |request, options = {}|
-          new_options = options.clone
-          new_options[:header] ||= {}
-          new_options[:header][HEADER_FORWARD] = @forward_to_port.to_s
-
-          @client.send(route, request, new_options)
-        end
-      end
-    end
-  end
-end

data/lib/calabash/internal.rb

@@ -1,48 +0,0 @@
-module Calabash
-  # @!visibility private
-  # Internal usage, NOT a public API
-  module Internal
-    def self.with_default_device(required_os: nil, &block)
-      unless block
-        raise ArgumentError, "No block given"
-      end
-
-      device = Calabash.default_device
-
-      if device.nil?
-        raise "The default device is not set. Set it using Calabash.default_device = ..."
-      end
-
-      if required_os
-        required_class = nil
-        required_type = nil
-        current_type = nil
-
-        case required_os
-          when :ios
-            required_class = Calabash::IOS::Device
-            required_type = 'iOS'
-          when :android
-            required_class = Calabash::Android::Device
-            required_type = 'Android'
-          else
-            raise ArgumentError, "Unknown OS '#{required_os}'"
-        end
-
-        if Calabash::Android.const_defined?(:Device, false) && device.is_a?(Calabash::Android::Device)
-            current_type = 'Android'
-        elsif Calabash::IOS.const_defined?(:Device, false) && device.is_a?(Calabash::IOS::Device)
-            current_type = 'iOS'
-        else
-            current_type = 'unknown'
-        end
-
-        unless device.is_a?(required_class)
-          raise "The default device is not set to an #{required_type} device, it is an #{current_type} device."
-        end
-      end
-
-      block.call(device)
-    end
-  end
-end