calabash-android 0.5.0.pre2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95f21eb2f0a76991155542d6963043ead614f372
-  data.tar.gz: 879b905878e095cd1547dc808c6088d0815ef89c
+  metadata.gz: da10e47ee0890ecd2b419637e87e39c926689c9e
+  data.tar.gz: 3fb9435c2c925d99664b28b957a7ebcc64419da3
 SHA512:
-  metadata.gz: b966369b4d9f8d27e46e1059466f54d809f93a6ad9ff76e1a2550497bf8797f27b4161e4795931a1c3e4f6253a49d1549bb456e099c9ca285577512645b5851d
-  data.tar.gz: d095a2a9ef2a3a5ef7c473615f19b103760f4b0df831e8fe2a7b2f4afc32dc6361de05e05450a44b6b5cb1db6184893cc51476a4dba10b37c3cd2fd47d3ef212
+  metadata.gz: 7aed25ef751962b9f4396d3a323f0ff1a2234605e38ba88f72f96f05bb725b8edfdb52c9ab8c200dc7f7a41b69ee71f420fbf8d0ae72c0a3b0afb20191a35126
+  data.tar.gz: 82a7b377a02228b37d9fcc82cd3628666210b045c8bb50dee71ee9ec7ca220fa3e3a2681f9af67d37c63d115b40dfaca6c093c2d9ad8e32419eb8cc8069c2754

data/CHANGES.txt

@@ -1,3 +1,23 @@
+0.5.0:
+      Removed many actions. They all have equivalent ruby wrappers/queries.
+      
+      Added new ruby wrappers for scrolling and more complex gestures that would requre an action before.
+      
+      Implemented flash method. It 'flashes' all found elements visually on the device to help the tester locate a view.
+      Its syntax is equivalent to query.
+      
+      Added keyboard_enter_text/enter_text methods.
+      
+      Updated all predefined steps. Their implementation is now more alike their naming.
+      
+      Backoor method to invoke methods in the tested app.
+      
+      Fixed visibility bugs:
+            - Views that were invisible were returned as visible in some cases.
+            - No visibility filtering on webviews.
+      
+      Fixed various small bugs.
+      
 0.3.7:
       Added calabash-android resign command
 

data/lib/calabash-android/operations.rb

@@ -7,8 +7,9 @@ require 'json'
 require 'socket'
 require 'timeout'
 require 'calabash-android/helpers'
-require 'calabash-android/wait_helpers'
+require 'calabash-android/text_helpers'
 require 'calabash-android/touch_helpers'
+require 'calabash-android/wait_helpers'
 require 'calabash-android/version'
 require 'calabash-android/env'
 require 'retriable'
@@ -18,8 +19,9 @@ require 'cucumber'
 module Calabash module Android
 
 module Operations
-  include Calabash::Android::WaitHelpers
+  include Calabash::Android::TextHelpers
   include Calabash::Android::TouchHelpers
+  include Calabash::Android::WaitHelpers
 
   def current_activity
     `#{default_device.adb_command} shell dumpsys window windows`.each_line.grep(/mFocusedApp.+[\.\/]([^.\s\/\}]+)/){$1}.first
@@ -59,8 +61,9 @@ module Operations
     @removed_actions.map! &:chomp
 
     if @removed_actions.include?(action)
-      puts "Error: The action '#{action}' was removed in calabash-android x.x.x"
-      puts 'For more information visit: https://github.com/calabash-android/foo/bar'
+      puts "\e[31mError: The action '#{action}' was removed in calabash-android 0.5\e[0m"
+      puts 'Solutions that do not require the removed action can be found on:'
+      puts "\e[36mhttps://github.com/calabash/calabash-android/blob/master/migrating_to_calabash_0.5.md\##{action}\e[0m"
     end
     
     default_device.perform_action(action, *arguments)
@@ -162,6 +165,10 @@ module Operations
     map(uiquery,:query,*converted_args)
   end
 
+  def flash(query_string)
+    map(query_string, :flash)
+  end
+
   def each_item(opts={:query => "android.widget.ListView", :post_scroll => 0.2}, &block)
     uiquery = opts[:query] || "android.widget.ListView"
     skip_if = opts[:skip_if] || lambda { |i| false }
@@ -501,7 +508,6 @@ module Operations
       env_options = {:target_package => package_name(@app_path),
                      :main_activity => main_activity(@app_path),
                      :test_server_port => @test_server_port,
-                     :debug => false,
                      :class => "sh.calaba.instrumentationbackend.InstrumentationBackend"}
 
       env_options = env_options.merge(options)
@@ -724,81 +730,10 @@ module Operations
     raise(msg)
   end
 
-  def has_text?(text)
-    !query("* {text CONTAINS[c] '#{text}'}").empty?
-  end
-
-  def assert_text(text, should_find = true)
-    raise "Text \"#{text}\" was #{should_find ? 'not ' : ''}found." if has_text?(text) ^ should_find
-
-    true
-  end
-
-  def double_tap(uiquery, options = {})
-    center_x, center_y = find_coordinate(uiquery)
-
-    perform_action("double_tap_coordinate", center_x, center_y)
-  end
-
-  # Performs a "long press" operation on a selected view
-  # Params:
-  # +uiquery+: a uiquery identifying one view
-  # +options[:length]+: the length of the long press in milliseconds (optional)
-  #
-  # Examples:
-  #   - long_press("* id:'my_id'")
-  #   - long_press("* id:'my_id'", {:length=>5000})
-  def long_press(uiquery, options = {})
-    center_x, center_y = find_coordinate(uiquery)
-    length = options[:length]
-    perform_action("long_press_coordinate", center_x, center_y, *(length unless length.nil?))
-  end
-
-  def touch(uiquery, options = {})
-    center_x, center_y = find_coordinate(uiquery)
-
-    perform_action("touch_coordinate", center_x, center_y)
-  end
-
-  def keyboard_enter_text(text, options = {})
-    perform_action('keyboard_enter_text', text)
-  end
-
-  def keyboard_enter_char(character, options = {})
-    keyboard_enter_text(character[0,1], options)
-  end
-
-  def enter_text(uiquery, text, options = {})
-    tap_when_element_exists(uiquery, options)
-    sleep 0.5
-    keyboard_enter_text(text, options)
-  end
-
-  def clear_text(query_string, options={})
-    result = query(query_string, setText: '')
-
-    raise "No elements found. Query: #{query_string}" if result.empty?
-
-    true
-  end
-
   def hide_soft_keyboard
     perform_action('hide_soft_keyboard')
   end
 
-  def find_coordinate(uiquery)
-    raise "Cannot find nil" unless uiquery
-
-    element = execute_uiquery(uiquery)
-
-    raise "No elements found. Query: #{uiquery}" if element.nil?
-
-    center_x = element["rect"]["center_x"]
-    center_y = element["rect"]["center_y"]
-
-    [center_x, center_y]
-  end
-
   def execute_uiquery(uiquery)
     if uiquery.instance_of? String
       elements = query(uiquery)
@@ -854,26 +789,6 @@ module Operations
     touch(combined_query_string)
   end
 
-  def tap_when_element_exists(query_string, options={})
-    options.merge!({action: lambda {|q| touch(q)}})
-
-    if options[:scroll] == true
-      scroll_to(query_string, options)
-    else
-      when_element_exists(query_string, options)
-    end
-  end
-
-  def long_press_when_element_exists(query_string, options={})
-    options.merge!({action: lambda {|q| long_press(q)}})
-
-    if options[:scroll] == true
-      scroll_to(query_string, options)
-    else
-      when_element_exists(query_string, options)
-    end
-  end
-
   def swipe(dir,options={})
       ni
   end
@@ -943,7 +858,12 @@ module Operations
     raise "No elements found. Query: #{all_query_string}" if element.nil?
     element_center_y = element['rect']['center_y']
 
-    scroll_view_query_string = "#{all_query_string} parent android.widget.ScrollView index:0"
+    if element.has_key?('html')
+      scroll_view_query_string = element['webView']
+    else
+      scroll_view_query_string = "#{all_query_string} parent android.widget.ScrollView index:0"
+    end
+
     scroll_element = query(scroll_view_query_string).first
 
     raise "Could not find parent scroll view. Query: #{scroll_view_query_string}" if element.nil?
@@ -1067,7 +987,6 @@ module Operations
   def make_http_request(options)
     default_device.make_http_request(options)
   end
-
 end
 
 

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

@@ -1,5 +1,5 @@
 Then /^I wait for progress$/ do
-  wait_for_element_do_not_exist("android.widget.ProgressBar")
+  wait_for_element_does_not_exist("android.widget.ProgressBar")
 end
 
 Then /^I wait$/ do

data/lib/calabash-android/text_helpers.rb

@@ -0,0 +1,41 @@
+module Calabash
+  module Android
+    module TextHelpers
+      def has_text?(text)
+        !query("* {text CONTAINS[c] '#{text}'}").empty?
+      end
+
+      def assert_text(text, should_find = true)
+        raise "Text \"#{text}\" was #{should_find ? 'not ' : ''}found." if has_text?(text) ^ should_find
+
+        true
+      end
+
+      def keyboard_enter_text(text, options = {})
+        perform_action('keyboard_enter_text', text)
+      end
+
+      def keyboard_enter_char(character, options = {})
+        keyboard_enter_text(character[0,1], options)
+      end
+
+      def enter_text(uiquery, text, options = {})
+        tap_when_element_exists(uiquery, options)
+        sleep 0.5
+        keyboard_enter_text(text, options)
+      end
+
+      def clear_text(query_string, options={})
+        result = query(query_string, setText: '')
+
+        raise "No elements found. Query: #{query_string}" if result.empty?
+
+        true
+      end
+
+      def escape_quotes(str)
+        str.gsub("'", "\\\\'")
+      end
+    end
+  end
+end

data/lib/calabash-android/touch_helpers.rb

@@ -4,6 +4,70 @@ module Calabash
       def tap(mark, *args)
         touch("* marked:'#{mark}'", *args)
       end
+
+      def double_tap(uiquery, options = {})
+        center_x, center_y = find_coordinate(uiquery, options)
+
+        perform_action("double_tap_coordinate", center_x, center_y)
+      end
+
+      # Performs a "long press" operation on a selected view
+      # Params:
+      # +uiquery+: a uiquery identifying one view
+      # +options[:length]+: the length of the long press in milliseconds (optional)
+      #
+      # Examples:
+      #   - long_press("* id:'my_id'")
+      #   - long_press("* id:'my_id'", {:length=>5000})
+      def long_press(uiquery, options = {})
+        center_x, center_y = find_coordinate(uiquery, options)
+        length = options[:length]
+        perform_action("long_press_coordinate", center_x, center_y, *(length unless length.nil?))
+      end
+
+      def touch(uiquery, options = {})
+        center_x, center_y = find_coordinate(uiquery, options)
+
+        perform_action("touch_coordinate", center_x, center_y)
+      end
+
+      def find_coordinate(uiquery, options={})
+        raise "Cannot find nil" unless uiquery
+
+        element = execute_uiquery(uiquery)
+
+        raise "No elements found. Query: #{uiquery}" if element.nil?
+
+        x = element["rect"]["center_x"]
+        y = element["rect"]["center_y"]
+
+        if options[:offset]
+          x += options[:offset][:x] || 0
+          y += options[:offset][:y] || 0
+        end
+
+        [x, y]
+      end
+
+      def tap_when_element_exists(query_string, options={})
+        options.merge!({action: lambda {|q| touch(q, options)}})
+
+        if options[:scroll] == true
+          scroll_to(query_string, options)
+        else
+          when_element_exists(query_string, options)
+        end
+      end
+
+      def long_press_when_element_exists(query_string, options={})
+        options.merge!({action: lambda {|q| long_press(q, options)}})
+
+        if options[:scroll] == true
+          scroll_to(query_string, options)
+        else
+          when_element_exists(query_string, options)
+        end
+      end
     end
   end
 end

data/lib/calabash-android/version.rb

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

data/lib/calabash-android/wait_helpers.rb

@@ -100,7 +100,7 @@ module Calabash
       end
 
       #options for wait_for apply
-      def wait_for_element_do_not_exist(uiquery, options={})
+      def wait_for_element_does_not_exist(uiquery, options={})
         wait_for_elements_do_not_exist([uiquery], options)
       end
 
@@ -176,7 +176,7 @@ module Calabash
       # Example usage: when_element_exists("Button", :timeout => 10)
       def when_element_exists(uiquery, opts = {})
         action = { :action => lambda { touch uiquery } }
-        opts = DEFAULT_OPTS.merge(action).merge(opts)
+        opts = action.merge(opts)
         wait_for_elements_exist([uiquery], opts)
 
         if opts[:action].parameters.length == 0
@@ -191,7 +191,7 @@ module Calabash
       end
 
       def wait_for_text_to_disappear(text, options={})
-        wait_for_element_do_not_exist("* {text CONTAINS[c] '#{text}'}", options)
+        wait_for_element_does_not_exist("* {text CONTAINS[c] '#{text}'}", options)
       end
 
       def wait_for_activity(activity_name, options={})

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/CalabashInstrumentationTestRunner.java

@@ -26,7 +26,18 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
         HttpServer.instantiate(Integer.parseInt(arguments.getString("test_server_port")));
 
         InstrumentationBackend.testPackage = arguments.getString("target_package");
-        InstrumentationBackend.extras = arguments;
+
+        Bundle extras = (Bundle)arguments.clone();
+        extras.remove("target_package");
+        extras.remove("main_activity");
+        extras.remove("test_server_port");
+        extras.remove("class");
+
+        if (extras.isEmpty()) {
+            extras = null;
+        }
+
+        InstrumentationBackend.extras = extras;
 
         try {
             InstrumentationBackend.mainActivityName = arguments.getString("main_activity");

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java

@@ -69,7 +69,12 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2<Act
         Intent i = new Intent(Intent.ACTION_MAIN);
         i.setClassName(testPackage, mainActivityName);
         i.addCategory("android.intent.category.LAUNCHER");
-        i.putExtras(extras);
+        i.addFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+
+        if (extras != null) {
+            i.putExtras(extras);
+        }
+
         setActivityIntent(i);
 
         actions = new Actions(getInstrumentation(), this);

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/HttpServer.java

@@ -6,9 +6,13 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.InterruptedException;
+import java.lang.Override;
+import java.lang.Runnable;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
+import java.util.HashMap;
 import java.util.Properties;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
@@ -22,9 +26,12 @@ import sh.calaba.instrumentationbackend.json.JSONUtils;
 import sh.calaba.instrumentationbackend.query.Query;
 import sh.calaba.instrumentationbackend.query.QueryResult;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+
 import android.graphics.Bitmap;
 import android.util.Log;
 import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AlphaAnimation;
 
 public class HttpServer extends NanoHTTPD {
 	private static final String TAG = "InstrumentationBackend";
@@ -127,17 +134,53 @@ public class HttpServer extends NanoHTTPD {
 				String uiQuery = (String) command.get("query");
 				uiQuery = uiQuery.trim();
 				Map op = (Map) command.get("operation");
-				@SuppressWarnings("unused") //TODO: support other methods, e.g., flash
-				String methodName = (String) op.get("method_name");
-				List arguments = (List) op.get("arguments");
-				
-				//For now we only support query
-				
-				
-				QueryResult queryResult = new Query(uiQuery,arguments).executeQuery();
+                String methodName = (String) op.get("method_name");
+                List arguments = (List) op.get("arguments");
+
+                if (methodName.equals("flash")) {
+                    QueryResult queryResult = new Query(uiQuery, java.util.Collections.emptyList()).executeQuery();
+                    List<View> views = queryResult.getResult();
+
+                    if (views.isEmpty()) {
+                        return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8",
+                                FranklyResult.failedResult("Could not find view to flash", "").asJson());
+                    }
+
+                    final Object firstItem = views.get(0);
+
+                    if (!(firstItem instanceof View)) {
+                        return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8",
+                                FranklyResult.failedResult("Only views can be flashed", "").asJson());
+                    }
+
+                    for (final View view : views) {
+                        InstrumentationBackend.solo.runOnMainSync(new Runnable() {
+                            @Override
+                            public void run() {
+                                Animation animation = new AlphaAnimation(1, 0);
+                                animation.setRepeatMode(Animation.REVERSE);
+                                animation.setDuration(200);
+                                animation.setRepeatCount(5);
+                                view.startAnimation(animation);
+                            }
+                        });
+
+                        try {
+                            Thread.sleep(1200);
+                        } catch (InterruptedException e) {
+                            return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8",
+                                    FranklyResult.failedResult("Interrupted while flashing", "").asJson());
+                        }
+                    }
+
+                    return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8",
+                            FranklyResult.successResult(queryResult).asJson());
+                } else {
+                    QueryResult queryResult = new Query(uiQuery,arguments).executeQuery();
 
-				return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", 
-						FranklyResult.successResult(queryResult).asJson());
+                    return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8",
+                            FranklyResult.successResult(queryResult).asJson());
+                }
 			} catch (Exception e ) {
 				e.printStackTrace();
                 errorResult = FranklyResult.fromThrowable(e);

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/KeyboardEnterText.java

@@ -22,6 +22,10 @@ public class KeyboardEnterText implements Action {
 
         final InputConnection inputConnection = getInputConnection();
 
+        if (inputConnection == null) {
+            return Result.failedResult("Could not enter text. No element has focus.");
+        }
+
         final String textToEnter = args[0];
         InstrumentationBackend.solo.runOnMainSync(new Runnable() {
             @Override

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -198,6 +198,7 @@ files:
 - lib/calabash-android/steps/search_steps.rb
 - lib/calabash-android/steps/spinner_steps.rb
 - lib/calabash-android/steps/time_picker_steps.rb
+- lib/calabash-android/text_helpers.rb
 - lib/calabash-android/touch_helpers.rb
 - lib/calabash-android/version.rb
 - lib/calabash-android/wait_helpers.rb
@@ -839,9 +840,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.1.10