calabash-android 0.5.15 → 0.5.16.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5fc3c80afa4803ad6a80ab1de3bdddbe3edfeb4
-  data.tar.gz: cf60c09fd25bf0c5b7006b0d8e096769815f2892
+  metadata.gz: 1bb7b1d479f70d02d21cb13ac79c342a4636d8a1
+  data.tar.gz: a0054f26ac58558e5a93060ec6ba07819a522e16
 SHA512:
-  metadata.gz: f591a4b557f3111921375940cd7b38a8f6383abd57fba7a29c044b95defcccec082fc95ad92168423563b553075a0883231e244601c91c91248675f5ce99d1ba
-  data.tar.gz: 9a1f33abccf7d7c9ba1d75b59803816ba430477a69461bc964c13837aeea4765bdf2d10d562cc00fcb149bec52c73f13e40f7394569a4838cb9d002febe29800
+  metadata.gz: 412afba1c956f1390cb7516125cbf4f56853bb0c153bd5c68215c70ba5d551e4a981f6899b380f7dc092532eb66c4c7f51ca6498591d627dcdc6010499d61017
+  data.tar.gz: ebb6d1a2a0cdd7d9837c9ce19d931d3a716adfd6ccf9a0977c1710d18fd3319f267b96b1ec81a481f73676271c3f943695298e99ae8fda3954ca76f7803ed69e

data/bin/calabash-android-build.rb

@@ -52,6 +52,17 @@ def calabash_build(app)
 
       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

data/lib/calabash-android/canned_steps.md

@@ -208,19 +208,19 @@ To use a set of concrete GPS cordinates
 Internationalization
 --------------------
 
-	Then /^I press text of translated l10key (\d+)$/ 
+	Then /^I press text of translated l10nkey "?([^\"]*)"?$/ 
 Simulates that the user pressed the text of the l10nkey.	
 
-	Then /^I press button of translated l10key (\d+)$/
+	Then /^I press button of translated l10nkey "?([^\"]*)"?$/
 Simulates that the user pressed the button with the label text of the l10nkey.
 
-	Then /^I press menu item of translated l10key (\d+)$/
+	Then /^I press menu item of translated l10nkey "?([^\"]*)"?$/
 Simulates that the user pressed the menu item with the label text of the l10nkey.
 
-	Then /^I press toggle button of translated l10key (\d+)$/ 
+	Then /^I press toggle button of translated l10nkey "?([^\"]*)?"$/ 
 Simulates that the user pressed the toggle button with the label text of the l10nkey.	
 
-	Then /^I wait for the translated "([^\"]*)" l10nkey to appear$/ 
+	Then /^I wait for the translated "?([^\"]*)"? l10nkey to appear$/ 
 Waits until the text of the translated l10nkey is displayed.
 
 Note: you can assert or press interface elements using [Android's String resources](http://developer.android.com/reference/android/R.string.html) by passing a package in a custom step:

data/lib/calabash-android/operations.rb

@@ -19,6 +19,7 @@ require 'retriable'
 require 'cucumber'
 require 'date'
 require 'time'
+require 'shellwords'
 
 
 module Calabash module Android
@@ -42,7 +43,7 @@ module Calabash module Android
     end
 
     def current_activity
-      `#{default_device.adb_command} shell dumpsys window windows`.each_line.grep(/mFocusedApp.+[\.\/]([^.\s\/\}]+)/){$1}.first
+      `#{default_device.adb_command} shell dumpsys window windows`.force_encoding('UTF-8').each_line.grep(/mFocusedApp.+[\.\/]([^.\s\/\}]+)/){$1}.first
     end
 
     def log(message)
@@ -777,7 +778,8 @@ module Calabash module Android
           params = hash.map {|k,v| "-e \"#{k}\" \"#{v}\""}.join(" ")
 
           logcat_id = get_logcat_id()
-          cmd = "#{adb_command} shell am instrument -e logcat #{logcat_id} -e name \"#{name}\" #{params} #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.SetPreferences"
+          am_cmd = Shellwords.escape("am instrument -e logcat #{logcat_id} -e name \"#{name}\" #{params} #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.SetPreferences")
+          cmd = "#{adb_command} shell #{am_cmd}"
 
           raise "Could not set preferences" unless system(cmd)
 

data/lib/calabash-android/steps/l10n_steps.rb

@@ -1,19 +1,19 @@
-Then /^I press text of translated l10key (\d+)$/ do |l10key|
-  perform_action('press_l10n_element', l10key)
+Then /^I press text of translated l10n?key "?([^\"]*)"?$/ do |l10nkey|
+  perform_action('press_l10n_element', l10nkey)
 end
 
-Then /^I press button of translated l10key (\d+)$/ do |l10key|
-  perform_action('press_l10n_element', l10key,'button')
+Then /^I press button of translated l10n?key "?([^\"]*)"?$/ do |l10nkey|
+  perform_action('press_l10n_element', l10nkey,'button')
 end
 
-Then /^I press menu item of translated l10key (\d+)$/ do |l10key|
-  perform_action('press_l10n_element', l10key,'menu_item')
+Then /^I press menu item of translated l10n?key "?([^\"]*)"?$/ do |l10nkey|
+  perform_action('press_l10n_element', l10nkey,'menu_item')
 end
 
-Then /^I press toggle button of translated l10key (\d+)$/ do |l10key|
-  perform_action('press_l10n_element', l10key,'toggle_button')
+Then /^I press toggle button of translated l10n?key "?([^\"]*)"?$/ do |l10nkey|
+  perform_action('press_l10n_element', l10nkey,'toggle_button')
 end
 
-Then /^I wait for the translated "([^\"]*)" l10nkey to appear$/ do |l10nkey|
+Then /^I wait for the translated "?([^\"]*)"? l10n?key to appear$/ do |l10nkey|
   perform_action('wait_for_l10n_element', l10nkey)
 end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.5.15"
+    VERSION = "0.5.16.pre1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.16.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -267,9 +267,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1