calabash-android 0.5.9.pre2.intenthook1 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2226c9b34c84a1b0422800524649f84ffefc6283
-  data.tar.gz: 5115917d4f83acdf0a2c3a7cf06edd3209020c2a
+  metadata.gz: 3765a162f326008fc737619e6d8f149c0fe8a4fd
+  data.tar.gz: f2fce1b20c9c6e69a85e328a74eb886afbd397bd
 SHA512:
-  metadata.gz: 6b667d23282054ba0f798c67565bc45741b280ac15c336712b4df38fc526dcae74b872a11ff9e7bfc18f171183741e7680bfb5d3838f5b00b6ddaa71e4153c8e
-  data.tar.gz: c52e63f05e04e0d32cff45d8988b2e74598065f97c1011d1517bf508c43bfe1a5502250962fe6e770537c91c3c03e00c3d0e180ce041f98d86a7cb7a7bdf4128
+  metadata.gz: 990a188d46509fec9345ee313cfc9d182b6f0fcaaf8e586cf2c6fea96c0a3ada74363837bbe81f6bc7423bda37d852080eb7e4d533e9a579d047f42cc3d883c2
+  data.tar.gz: 1be5b0c4f6aaf841b522623e9899c115fe28c8ebae9ea7f47a8ba764f9be4da755b64e637884198ada3903f061b427b3078292be0312269d21b1673ab6955261

data/CHANGES.txt

@@ -1,3 +1,12 @@
+0.5.9
+      Fix crosswalk queries giving wrong coordinates.
+
+      Fix client rescuing `Exceptions`
+
+      Support signing with DSA certificates
+
+      Support indexes in css/xpath queries.
+
 0.5.8
       Handle `embed` if Calabash Android was 'included' instead of added
       to the Cucumber World

data/Rakefile

@@ -15,7 +15,7 @@ def build
       "package",
       "-debug",
       "-Dtools.dir=\"#{Env.tools_dir}\"",
-      "-Dandroid.api.level=21",
+      "-Dandroid.api.level=19",
       "-Dversion=#{Calabash::Android::VERSION}",
     ]
     Dir.chdir(@test_server_dir) do

data/bin/calabash-android-build.rb

@@ -58,7 +58,7 @@ def calabash_build(app)
     keystore.sign_apk("#{workspace_dir}/TestServer.apk", test_server_file_name)
     begin
 
-    rescue Exception => e
+    rescue => e
       log e
       raise "Could not sign test server"
     end

data/lib/calabash-android/operations.rb

@@ -14,9 +14,6 @@ require 'calabash-android/touch_helpers'
 require 'calabash-android/wait_helpers'
 require 'calabash-android/version'
 require 'calabash-android/env'
-require 'calabash-android/android_intent'
-require 'calabash-android/android_component'
-require 'calabash-android/intent_hook'
 require 'retriable'
 require 'cucumber'
 require 'date'
@@ -59,14 +56,11 @@ module Calabash module Android
     end
 
     def default_device
-      unless @default_device
-        @default_device = Device.new(self, ENV["ADB_DEVICE_ARG"], ENV["TEST_SERVER_PORT"], ENV["APP_PATH"], ENV["TEST_APP_PATH"])
-      end
-      @default_device
+      @@default_device ||= Device.new(self, ENV["ADB_DEVICE_ARG"], ENV["TEST_SERVER_PORT"], ENV["APP_PATH"], ENV["TEST_APP_PATH"])
     end
 
     def set_default_device(device)
-      @default_device = device
+      @@default_device = device
     end
 
     def performAction(action, *arguments)
@@ -281,17 +275,15 @@ module Calabash module Android
     class Device
       attr_reader :app_path, :test_server_path, :serial, :server_port, :test_server_port
 
-      def initialize(cucumber_world, serial, server_port, app_path,
-                     test_server_path, test_server_port = 7102)
+      def initialize(cucumber_world, serial, server_port, app_path, test_server_path, test_server_port = 7102)
+
         @cucumber_world = cucumber_world
         @serial = serial || default_serial
         @server_port = server_port || default_server_port
         @app_path = app_path
         @test_server_path = test_server_path
         @test_server_port = test_server_port
-      end
 
-      def forward_port
         forward_cmd = "#{adb_command} forward tcp:#{@server_port} tcp:#{@test_server_port}"
         log forward_cmd
         log `#{forward_cmd}`
@@ -370,7 +362,7 @@ module Calabash module Android
         Timeout.timeout(300) do
           begin
             result = http("/", params, {:read_timeout => 350})
-          rescue Exception => e
+          rescue => e
             log "Error communicating with test server: #{e}"
             raise e
           end
@@ -383,7 +375,7 @@ module Calabash module Android
           result
         end
       rescue Timeout::Error
-        raise Exception, "Step timed out"
+        raise "Step timed out"
       end
 
       def http(path, data = {}, options = {})
@@ -405,25 +397,6 @@ module Calabash module Android
         end
       end
 
-      def http_put(path, data = {}, options = {})
-        begin
-
-          configure_http(@http, options)
-          make_http_request(
-              :method => :put,
-              :body => data,
-              :uri => url_for(path),
-              :header => {"Content-Type" => "application/octet-stream"})
-
-        rescue HTTPClient::TimeoutError,
-            HTTPClient::KeepAliveDisconnected,
-            Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED,
-            Errno::ETIMEDOUT => e
-          log "It looks like your app is no longer running. \nIt could be because of a crash or because your test script shut it down."
-          raise e
-        end
-      end
-
       def set_http(http)
         @http = http
       end
@@ -448,18 +421,18 @@ module Calabash module Android
             @http = init_request(options)
           end
           header = options[:header] || {}
-          header["Content-Type"] ||= "application/json;charset=utf-8"
+          header["Content-Type"] = "application/json;charset=utf-8"
+          options[:header] = header
+
 
           response = if options[:method] == :post
                        @http.post(options[:uri], options)
-                     elsif options[:method] == :put
-                       @http.put(options[:uri], options)
                      else
                        @http.get(options[:uri], options)
                      end
           raise Errno::ECONNREFUSED if response.status_code == 502
           response.body
-        rescue Exception => e
+        rescue => e
           if @http
             @http.reset_all
             @http=nil
@@ -617,8 +590,6 @@ module Calabash module Android
           wake_up
         end
 
-        forward_port
-
         env_options = options
 
         env_options[:target_package] ||= package_name(@app_path)
@@ -659,7 +630,7 @@ module Calabash module Android
               log "Instrumentation backend is ready!"
             end
           end
-        rescue Exception => e
+        rescue => e
 
           msg = "Unable to make connection to Calabash Test Server at http://127.0.0.1:#{@server_port}/\n"
           msg << "Please check the logcat output for more info about what happened\n"
@@ -714,7 +685,7 @@ module Calabash module Android
       def set_gps_coordinates_from_location(location)
         require 'geocoder'
         results = Geocoder.search(location)
-        raise Exception, "Got no results for #{location}" if results.empty?
+        raise "Got no results for #{location}" if results.empty?
 
         best_result = results.first
         set_gps_coordinates(best_result.latitude, best_result.longitude)
@@ -838,13 +809,13 @@ module Calabash module Android
       ni
     end
 
-    def screenshot_and_raise(msg, options = nil)
+    def screenshot_and_raise(e, options = nil)
       if options
         screenshot_embed options
       else
         screenshot_embed
       end
-      raise(msg)
+      raise e
     end
 
     def hide_soft_keyboard
@@ -874,10 +845,6 @@ module Calabash module Android
       default_device.http(path, data, options)
     end
 
-    def http_put(path, data = {}, options = {})
-      default_device.http_put(path, data, options)
-    end
-
     def html(q)
       query(q).map {|e| e['html']}
     end
@@ -1212,54 +1179,6 @@ module Calabash module Android
       result['result']
     end
 
-    def last_broadcast_intent
-      result = JSON.parse(http("/last-broadcast-intent"))
-
-      unless result['outcome'] == 'SUCCESS'
-        raise "/last-broadcast-intent failed because: #{result['reason']}\n#{result['detail']}"
-      end
-
-      json = JSON.parse(result['result'])
-
-      if json.nil?
-        nil
-      else
-        AndroidIntent.from_json(json)
-      end
-    end
-
-    def add_file(path_or_file)
-      file = File.new(path_or_file)
-
-      http_put('/add-file', File.binread(file))
-    end
-
-    def add_intent_hook(intent_hook)
-      result = JSON.parse(http('/intent-hook', intent_hook))
-
-      if result['outcome'] && result['outcome'] != 'SUCCESS'
-        raise "/intent-hook failed because: #{result['reason']}\n#{result['detail']}"
-      end
-    end
-
-    def fake_camera_with_image(path_or_file, usage_count=1)
-      file = File.new(path_or_file)
-
-      extension = File.extname(path_or_file)
-
-      if extension != '.jpg' && extension != '.jpeg'
-        raise ArgumentError, "Supplied image file must be a .jpg or .jpeg, not '#{extension}'"
-      end
-
-      file_on_device = add_file(file)
-
-      intent = Calabash::Android::AndroidIntent.with_action('android.media.action.IMAGE_CAPTURE')
-      filter = Calabash::Android::IntentHook::Filter.new(intent)
-      reaction = Calabash::Android::IntentHook::Reaction.take_picture(file_on_device)
-
-      add_intent_hook(Calabash::Android::IntentHook.new(reaction, filter, usage_count))
-    end
-
     def map(query, method_name, *method_args)
       operation_map = {
           :method_name => method_name,

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.5.9.pre2.intenthook1"
+    VERSION = "0.5.9"
   end
 end

data/lib/calabash-android/wait_helpers.rb

@@ -48,7 +48,7 @@ module Calabash
           else
             raise wait_error(msg)
           end
-        rescue Exception => e
+        rescue => e
           handle_error_with_options(e, nil, screenshot_on_error)
         end
       end
@@ -116,14 +116,13 @@ module Calabash
       end
 
       def handle_error_with_options(ex, timeout_message, screenshot_on_error)
-        msg = (timeout_message || ex)
-        if ex
-          msg = "#{msg} (#{ex.class})"
-        end
+        error_class = (ex && ex.class) || RuntimeError
+        error = error_class.new(timeout_message || ex.message)
+
         if screenshot_on_error
-          screenshot_and_raise msg
+          screenshot_and_raise error
         else
-          raise msg
+          raise error
         end
       end
 

data/test-server/AndroidManifest.xml

@@ -3,9 +3,7 @@
       package="#testPackage#"
       android:versionCode="3"
       android:versionName="0.3.0">
-    <application android:label="instrumentation_backend"
-        android:largeHeap="true">
-
+    <application android:label="instrumentation_backend">
       <uses-library android:name="android.test.runner" />
       <uses-library android:name="com.google.android.maps" android:required="false" />
       <activity
@@ -17,18 +15,8 @@
               android:stateNotNeeded="true"
               android:noHistory="false"
               android:excludeFromRecents="true"/>
-    <activity
-        android:name="sh.calaba.instrumentationbackend.FakeCameraActivity"
-        android:label="FakeCameraActivity"
-        android:exported="true"
-        android:finishOnTaskLaunch="true"
-        android:stateNotNeeded="true"
-        android:noHistory="true"
-        android:excludeFromRecents="true"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
     </application>
-    <uses-sdk android:minSdkVersion="4"
-        android:targetSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="4" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearPreferences" />
@@ -40,6 +28,5 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
 
 </manifest>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.9.pre2.intenthook1
+  version: 0.5.9
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -210,8 +210,6 @@ files:
 - irbrc
 - lib/calabash-android.rb
 - lib/calabash-android/abase.rb
-- lib/calabash-android/android_component.rb
-- lib/calabash-android/android_intent.rb
 - lib/calabash-android/calabash_steps.rb
 - lib/calabash-android/canned_steps.md
 - lib/calabash-android/color_helper.rb
@@ -222,7 +220,6 @@ files:
 - lib/calabash-android/environment_helpers.rb
 - lib/calabash-android/gestures.rb
 - lib/calabash-android/helpers.rb
-- lib/calabash-android/intent_hook.rb
 - lib/calabash-android/java_keystore.rb
 - lib/calabash-android/lib/AXMLPrinter2.jar
 - lib/calabash-android/lib/manifest_extractor.jar
@@ -269,9 +266,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.2

data/lib/calabash-android/android_component.rb

@@ -1,23 +0,0 @@
-module Calabash
-  module Android
-    class AndroidComponent
-      attr_reader :package_name, :class_name
-
-      def initialize(package_name, class_name)
-        @package_name = package_name
-        @class_name = class_name
-      end
-
-      def self.from_json(json)
-        self.new(json['packageName'], json['className'])
-      end
-
-      def to_json(*a)
-        {
-            'className' => class_name,
-            'packageName' => package_name
-        }.to_json
-      end
-    end
-  end
-end

data/lib/calabash-android/android_intent.rb

@@ -1,60 +0,0 @@
-module Calabash
-  module Android
-    class AndroidIntent
-      attr_reader :action, :data, :flags, :package, :type, :component, :extras
-      attr_reader :clip_data, :intent_index
-
-      def self.with_action(action)
-        android_intent = AndroidIntent.new
-
-        android_intent.instance_eval do
-          @action = action
-        end
-
-        android_intent
-      end
-
-      def self.from_json(json)
-        android_intent = AndroidIntent.new
-
-        intent_json = json['intent']
-        index = json['index']
-
-        android_intent.instance_eval do
-          unless intent_json.nil?
-            @action = intent_json['action']
-            @data = intent_json['data'] && URI.parse(intent_json['data'])
-            @flags = intent_json['flags']
-            @package = intent_json['package']
-            @type = intent_json['type']
-            @component =
-                intent_json['component'] && AndroidComponent.from_json(intent_json['component'])
-            @clip_data = intent_json['clipData']
-
-            @extras = intent_json['extras']
-          end
-
-          @intent_index = index
-        end
-
-        android_intent
-      end
-
-      def to_json(*a)
-        {
-            'index' => intent_index,
-            'intent' => {
-                'action' => action,
-                'data' => data,
-                'flags' => flags,
-                'package' => package,
-                'type' => type,
-                'component' => component,
-                'clipData' => clip_data,
-                'extras' => extras
-            }
-        }.to_json
-      end
-    end
-  end
-end

data/lib/calabash-android/intent_hook.rb

@@ -1,106 +0,0 @@
-module Calabash
-  module Android
-    class IntentHook
-      USAGE_COUNT_INFINITE = -1
-
-      attr_reader :reaction, :filter, :usage_count
-
-      def initialize(reaction, filter, usage_count=USAGE_COUNT_INFINITE)
-        @reaction = reaction
-        @filter = filter
-        @usage_count = usage_count.to_i
-      end
-
-      def to_json(*a)
-        {
-            'usageCount' => usage_count,
-            'type' => reaction.type.to_s,
-            'data' => reaction.data_as_hash,
-            'intentFilterData' => filter
-        }.to_json
-      end
-
-      class Filter
-        attr_reader :intent
-
-        def initialize(intent)
-          @intent = intent
-        end
-
-        def to_json(*a)
-          {
-              'action' => intent.action,
-              'component' => intent.component
-          }.to_json
-        end
-      end
-
-      class Reaction
-        attr_reader :type, :data
-
-        def data_as_hash
-          @data_hash_method.call
-        end
-
-        def self.do_nothing
-          reaction = Reaction.new
-
-          reaction.instance_eval do
-            @type = :'do-nothing'
-          end
-
-          reaction
-        end
-
-        def self.take_picture(path_on_device)
-          reaction = Reaction.new
-          data = {image_file: path_on_device}
-
-          reaction.instance_eval do
-            @type = :'take-picture'
-            @data = data
-            @data_hash_method = lambda do
-              {
-                  'imageFile' => @data[:image_file],
-              }
-            end
-          end
-
-          reaction
-        end
-
-        def self.instrumentation(data)
-          param_data = data.dup
-
-          if param_data[:test_server_port].nil? ||
-              param_data[:target_package].nil?
-            raise 'Must provide :test_server_port and :target_package'
-          end
-
-          param_data[:class] ||= 'sh.calaba.instrumentationbackend.InstrumentationBackend'
-
-          param_data[:component] ||=
-              AndroidComponent.new("#{param_data[:target_package]}.test",
-                                   'sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner')
-
-          reaction = Reaction.new
-
-          reaction.instance_eval do
-            @type = :instrumentation
-            @data = param_data
-            @data_hash_method = lambda do
-              {
-                  'testServerPort' => @data[:test_server_port],
-                  'targetPackage' => @data[:target_package],
-                  'class' => @data[:class],
-                  'mainActivity' => @data[:main_activity],
-              }
-            end
-          end
-
-          reaction
-        end
-      end
-    end
-  end
-end