calabash-android 0.2.1 → 0.2.2

data/CHANGES.txt

@@ -1,3 +1,6 @@
+0.2.2:
+      Fixed path problems with Ant on Windows.
+
 0.2.1:
       Path to custom keystores can now be relative.
       Setup only deals with custom keystores.

data/bin/calabash-android-build.rb

@@ -19,9 +19,9 @@ def calabash_build(app)
         "package",
         "-Dtested.package_name=#{package_name(app)}",
         "-Dtested.main_activity=#{main_activity(app)}",
-        "-Dtested.project.apk='#{app}'",
+        "-Dtested.project.apk=\"#{app}\"",
         "-Dandroid.api.level=#{api_level}",
-        "-Dkey.store='#{File.expand_path keystore["keystore_location"]}'",
+        "-Dkey.store=\"#{File.expand_path keystore["keystore_location"]}\"",
         "-Dkey.store.password=#{keystore["keystore_password"]}",
         "-Dkey.alias=#{keystore["keystore_alias"]}",
         "-Dkey.alias.password=#{keystore["keystore_alias_password"]}",

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.2.1"
-    FRAMEWORK_VERSION = "0.2.1"
+    VERSION = "0.2.2"
+    FRAMEWORK_VERSION = "0.2.2"
   end
 end

metadata

@@ -1,75 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: calabash-android
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-01 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: slowhandcuke
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: slowhandcuke
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: "calabash-android drives tests for native  and hybrid Android apps. "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'calabash-android drives tests for native  and hybrid Android apps. '
+email:
 - jonas@lesspainful.com
-executables: 
+executables:
 - calabash-android
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .calabash_settings
 - CHANGES.txt
 - Gemfile
@@ -606,41 +603,28 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/TokenBuffer.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/VersionUtil.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/package-info.java
-- test-server/calabash-js/src/calabash.js
-- test-server/calabash-js/src/set_text.js
-has_rdoc: true
 homepage: http://github.com/calabash
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
-

data/test-server/calabash-js/src/calabash.js

@@ -1,125 +0,0 @@
-(function () {
-    /** David Mark's isHostMethod function,
-      * http://peter.michaux.ca/articles/feature-detection-state-of-the-art-browser-scripting
-      * Modified to use strict equality
-      */
-    function isHostMethod (object, property)
-    {
-      var t = typeof object[property];
-      return t==='function' ||
-             (!!(t==='object' && object[property])) ||
-             t==='unknown';
-    }
-    //http://www.w3.org/TR/DOM-Level-2-Core/core.html
-    var NODE_TYPES = {
-        /*ELEMENT_NODE                   : */ 1 : 'ELEMENT_NODE',
-        /*ATTRIBUTE_NODE                 : */ 2: 'ATTRIBUTE_NODE',
-        /*TEXT_NODE                      : */ 3 : 'TEXT_NODE',
-        /*DOCUMENT_NODE                  : */ 9 : 'DOCUMENT_NODE'
-    };
-
-    function computeRectForNode(object)
-    {
-        var res = {}, boundingBox;
-        if (isHostMethod(object,'getBoundingClientRect'))
-        {
-           boundingBox = object.getBoundingClientRect();
-           res['rect'] = boundingBox;
-           res['rect'].center_x = boundingBox.left + Math.floor(boundingBox.width/2);
-           res['rect'].center_y = boundingBox.top + Math.floor(boundingBox.height/2);
-        }
-        res.nodeType = NODE_TYPES[object.nodeType] || res.nodeType + ' (Unexpected)';
-        res.nodeName = object.nodeName;
-        res.id = object.id || '';
-        res['class'] = object.className || '';
-        if (object.href)
-        {
-            res.href = object.href;
-        }
-        res.html = object.outerHTML || '';
-        res.textContent = object.textContent;
-        return res;
-    }
-    function toJSON(object)
-    {
-        var res, i, N, spanEl, parentEl;
-        if (typeof object==='undefined')
-        {
-            throw {message:'Calling toJSON with undefined'};
-        }
-        else if (object instanceof Text)
-        {
-            parentEl = object.parentElement;
-            if (parentEl)
-            {
-                spanEl = document.createElement("calabash");
-                spanEl.style.display = "inline";
-                spanEl.innerHTML = object.textContent;
-                parentEl.replaceChild(spanEl, object);
-                res = computeRectForNode(spanEl);
-                res.nodeType = NODE_TYPES[object.nodeType];
-                delete res.nodeName;
-                delete res.id;
-                delete res['class'];
-
-                parentEl.replaceChild(object,spanEl);
-            }
-            else
-            {
-                res = object;
-            }
-
-
-        }
-        else if (object instanceof Node)//TODO: support for frames!
-        {
-            res = computeRectForNode(object);
-        }
-        else if (object instanceof NodeList || //TODO: support for frames!
-                 (typeof object=='object' && object &&
-                  typeof object.length === 'number' &&
-                  object.length > 0 //array like
-                  && typeof object[0] !== 'undefined'))
-        {
-            res = [];
-            for (i=0,N=object.length;i<N;i++)
-            {
-                res[i] = toJSON(object[i]);
-            }
-        }
-        else
-        {
-            res = object;
-        }
-        return res;
-    }
-    ///TODO: no support for now frames
-    //idea would be map XPath across window.frames
-    //must take care of visibility questions
-
-    var exp = '%@'/* dynamic */,
-        queryType = '%@',
-        nodes = null,
-        res = [],
-        i,N;
-    try
-    {
-        if (queryType==='xpath')
-        {
-            nodes = document.evaluate(exp, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-            for (i=0,N=nodes.snapshotLength;i<N;i++)
-            {
-                res[i] = nodes.snapshotItem(i);
-            }
-        }
-        else
-        {
-            res = document.querySelectorAll(exp);
-        }
-    }
-    catch (e)
-    {
-       return JSON.stringify({error:'Exception while running query: '+exp, details:e.toString()})
-    }
-    return JSON.stringify(toJSON(res));
-})();

data/test-server/calabash-js/src/set_text.js

@@ -1,133 +0,0 @@
-(function () {
-	function simulateKeyEvent(elem, character) {
-	    var ch = character.charCodeAt(0);
-	            
-	    var evt;
-	    evt = document.createEvent('KeyboardEvent');
-	    evt.initKeyboardEvent('keydown', true, true, window, 0, 0, 0, 0, 0, ch);
-	    elem.dispatchEvent(evt);
-	   
-	    evt = document.createEvent('KeyboardEvent');
-	    evt.initKeyboardEvent('keyup', true, true, window, 0, 0, 0, 0, 0, ch);
-	    elem.dispatchEvent(evt);
-	    evt = document.createEvent('KeyboardEvent');
-	    evt.initKeyboardEvent('keypress', true, true, window, 0, 0, 0, 0, 0, ch);
-	    elem.dispatchEvent(evt);
-	}
-
-	 
-	function enterTextIntoInputField(elem, text) {
-      elem.value = "";
-	    for (var i = 0; i < text.length; i++) {
-	        var ch = text.charAt(i);
-	        elem.value += ch;
-	        simulateKeyEvent(elem, ch);
-	    }
-	}
-	                            
-
-	function fireHTMLEvent(elem, eventName) {
-	    var evt = document.createEvent("HTMLEvents");
-	    evt.initEvent(eventName, true, true );
-	    return !elem.dispatchEvent(evt);
-	}
-
-	function selectInputField(elem) {
-	    elem.click();
-	    elem.focus();
-	}
-
-
-	function deselectInputField(elem) {
-	    fireHTMLEvent(elem, 'change');
-	    fireHTMLEvent(elem, 'blur');
-	}
-	
-	
-    /** David Mark's isHostMethod function,
-      * http://peter.michaux.ca/articles/feature-detection-state-of-the-art-browser-scripting
-      * Modified to use strict equality
-      */
-    function isHostMethod (object, property)
-    {
-      var t = typeof object[property];
-      return t==='function' ||
-             (!!(t==='object' && object[property])) ||
-             t==='unknown';
-    }
-    //http://www.w3.org/TR/DOM-Level-2-Core/core.html
-    var NODE_TYPES = {
-        /*ELEMENT_NODE                   : */ 1 : 'ELEMENT_NODE',
-        /*ATTRIBUTE_NODE                 : */ 2: 'ATTRIBUTE_NODE',
-        /*TEXT_NODE                      : */ 3 : 'TEXT_NODE',
-        /*DOCUMENT_NODE                  : */ 9 : 'DOCUMENT_NODE'
-    };
-
-    function toJSON(object)
-    {
-        var res, i, N;
-        if (typeof object==='undefined')
-        {
-            throw {message:'Calling toJSON with undefined'};
-        }
-        else if (object instanceof Node)//TODO: support for frames!
-        {
-            res = {}
-            if (isHostMethod(object,'getBoundingClientRect'))
-            {
-                res['rect'] = object.getBoundingClientRect();
-            }
-            res.nodeType = NODE_TYPES[object.nodeType] || res.nodeType + ' (Unexpected)';
-            res.nodeName = object.nodeName;
-            res.id = object.id || '';
-            res['class'] = object.className || '';
-            res.html = object.outerHTML || '';
-            res.nodeValue = object.nodeValue;
-        }
-        else if (object instanceof NodeList || //TODO: support for frames!
-                 (typeof object=='object' && object &&
-                  typeof object.length === 'number' &&
-                  object.length > 0 //array like
-                  && typeof object[0] !== 'undefined'))
-        {
-            res = [];
-            for (i=0,N=object.length;i<N;i++)
-            {
-                res[i] = toJSON(object[i]);
-            }
-        }
-        else
-        {
-            res = object;
-        }
-        return res;
-    }
-    
-    ///TODO: no support for now frames
-    //idea would be map XPath across window.frames
-    //must take care of visibility questions
-
-    try
-    {   
-    	var exp = JSON.parse('%@')/* dynamic */,
-        	el,
-        	text = '%@',
-        	i,N;
- 
-        el=document.elementFromPoint(exp.rect.left, exp.rect.top);
-        if (/input/i.test(el.tagName))
-        {
-        	selectInputField(el);
-        	enterTextIntoInputField(el, text);
-        }
-        else
-        {
-
-        }
-    }
-    catch (e)
-    {
-       return JSON.stringify({error:'Exception while running query: '+exp, details:e.toString()})
-    }
-    return JSON.stringify(toJSON(el));
-})();