cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject [cordova-osx] 03/03: trivial - fixing tests
Date Tue, 30 Jan 2018 08:19:57 GMT
This is an automated email from the ASF dual-hosted git repository.

tripod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-osx.git

commit 9f0ca68e1f18d5881947a19bbf9aeaab217ee21f
Author: Tobias Bocanegra <tripod@adobe.com>
AuthorDate: Tue Jan 30 17:17:34 2018 +0900

    trivial - fixing tests
---
 tests/cdv-test-project/.gitignore |  3 +++
 tests/cdv-test-project/config.xml | 18 ++++++++----------
 tests/spec/cordovalib.spec.js     | 11 -----------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/tests/cdv-test-project/.gitignore b/tests/cdv-test-project/.gitignore
index 1cfe9bb..fe8e798 100644
--- a/tests/cdv-test-project/.gitignore
+++ b/tests/cdv-test-project/.gitignore
@@ -1 +1,4 @@
 platforms
+/node_modules
+package.json
+package-lock.json
diff --git a/tests/cdv-test-project/config.xml b/tests/cdv-test-project/config.xml
index 9267a64..3cd0d3b 100644
--- a/tests/cdv-test-project/config.xml
+++ b/tests/cdv-test-project/config.xml
@@ -24,16 +24,14 @@
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
     </platform>
-
-    <!-- icons for test (note that we use the same file for all sizes) -->
     <platform name="osx">
-        <icon src="res/test-64x64.png" width="16" height="16" />
-        <icon src="res/test-64x64.png" width="32" height="32" />
-        <icon src="res/test-64x64.png" width="64" height="64" />
-        <icon src="res/test-64x64.png" width="128" height="128" />
-        <icon src="res/test-64x64.png" width="256" height="256" />
-        <icon src="res/test-64x64.png" width="512" height="512" />
-        <icon src="res/test-64x64.png" width="1024" height="1024" />
+        <icon height="16" src="res/test-64x64.png" width="16" />
+        <icon height="32" src="res/test-64x64.png" width="32" />
+        <icon height="64" src="res/test-64x64.png" width="64" />
+        <icon height="128" src="res/test-64x64.png" width="128" />
+        <icon height="256" src="res/test-64x64.png" width="256" />
+        <icon height="512" src="res/test-64x64.png" width="512" />
+        <icon height="1024" src="res/test-64x64.png" width="1024" />
     </platform>
-
+    <engine name="osx" spec="../../" />
 </widget>
diff --git a/tests/spec/cordovalib.spec.js b/tests/spec/cordovalib.spec.js
index 3491228..4cbce2e 100644
--- a/tests/spec/cordovalib.spec.js
+++ b/tests/spec/cordovalib.spec.js
@@ -32,17 +32,6 @@ describe('cordova-lib', function() {
         var command;
         var artifacts_dir = tmp.dirSync().name;
 
-        // check iOS Simulator if running
-        command = 'pgrep "iOS Simulator"';
-        return_code = shell.exec(command).code;
-
-        // if iOS Simulator is running, kill it
-        if (return_code === 0) { // found
-            shell.echo('iOS Simulator is running, we\'re going to kill it.');
-            return_code = shell.exec('killall "iOS Simulator"').code;
-            expect(return_code).toBe(0);
-        }
-
         // run the tests
         command = util.format('xcodebuild test ' +
                 '-project %s/CordovaLibTests/CordovaLibTests.xcodeproj ' +

-- 
To stop receiving notification emails like this one, please contact
tripod@apache.org.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message