You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/04/02 02:01:35 UTC
[1/2] cordova-plugin-test-framework git commit: CB-8683 changed
plugin-id to pacakge-name
Repository: cordova-plugin-test-framework
Updated Branches:
refs/heads/old-ID 6e46988a3 -> c15901134
CB-8683 changed plugin-id to pacakge-name
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/commit/79b0c695
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/tree/79b0c695
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/diff/79b0c695
Branch: refs/heads/old-ID
Commit: 79b0c695515151217b9b791cd2bda75a41f87c2f
Parents: 6e46988
Author: Steve Gill <st...@gmail.com>
Authored: Wed Apr 1 17:00:54 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Wed Apr 1 17:00:54 2015 -0700
----------------------------------------------------------------------
package.json | 2 +-
plugin.xml | 2 +-
www/assets/main-bootstrap.js | 4 ++--
www/jasmine_helpers.js | 2 +-
www/main.js | 12 ++++++------
www/tests.js | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/79b0c695/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index d73ba86..e1e7d77 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"version": "0.0.2-dev",
"description": "Cordova Test Framework Plugin",
"cordova": {
- "id": "org.apache.cordova.test-framework",
+ "id": "cordova-plugin-test-framework",
"platforms": []
},
"repository": {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/79b0c695/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 5afab63..adf990a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -21,7 +21,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:rim="http://www.blackberry.com/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android"
- id="org.apache.cordova.test-framework"
+ id="cordova-plugin-test-framework"
version="0.0.2-dev">
<name>Test Framework</name>
<description>Cordova Test Framework Plugin</description>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/79b0c695/www/assets/main-bootstrap.js
----------------------------------------------------------------------
diff --git a/www/assets/main-bootstrap.js b/www/assets/main-bootstrap.js
index a536b65..44a3bff 100644
--- a/www/assets/main-bootstrap.js
+++ b/www/assets/main-bootstrap.js
@@ -22,5 +22,5 @@
'use strict';
document.addEventListener("deviceready", function() {
- cordova.require('org.apache.cordova.test-framework.main').init();
-});
\ No newline at end of file
+ cordova.require('cordova-plugin-test-framework.main').init();
+});
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/79b0c695/www/jasmine_helpers.js
----------------------------------------------------------------------
diff --git a/www/jasmine_helpers.js b/www/jasmine_helpers.js
index 7113624..e6a0c1e 100644
--- a/www/jasmine_helpers.js
+++ b/www/jasmine_helpers.js
@@ -66,7 +66,7 @@ function addJasmineReporters(jasmineInterface, jasmineEnv) {
jasmineInterface.htmlReporter.initialize();
jasmineEnv.addReporter(jasmineInterface.htmlReporter);
- var medic = require('org.apache.cordova.test-framework.medic');
+ var medic = require('cordova-plugin-test-framework.medic');
if (medic.enabled) {
jasmineRequire.medic(jasmineInterface.jasmine);
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/79b0c695/www/main.js
----------------------------------------------------------------------
diff --git a/www/main.js b/www/main.js
index 2b76786..78fe7d9 100644
--- a/www/main.js
+++ b/www/main.js
@@ -110,7 +110,7 @@ exports.wrapConsole = function() {
}
function createCustomLogger(type) {
- var medic = require('org.apache.cordova.test-framework.medic');
+ var medic = require('cordova-plugin-test-framework.medic');
return function() {
origConsole[type].apply(origConsole, arguments);
// TODO: encode log type somehow for medic logs?
@@ -228,7 +228,7 @@ function updateEnabledTestCount() {
var enabledLabel = document.getElementById('tests-enabled');
// Determine how many tests are currently enabled
- var cdvtests = cordova.require('org.apache.cordova.test-framework.cdvtests');
+ var cdvtests = cordova.require('cordova-plugin-test-framework.cdvtests');
var total = 0;
var enabled = 0;
iterateAutoTests(cdvtests, function(api, testModule) {
@@ -311,7 +311,7 @@ function toggleTestHandler(event) {
/******************************************************************************/
function toggleTestEnabled(checkbox) {
- var cdvtests = cordova.require('org.apache.cordova.test-framework.cdvtests');
+ var cdvtests = cordova.require('cordova-plugin-test-framework.cdvtests');
cdvtests.tests[checkbox.value].setEnabled(checkbox.checked);
}
@@ -336,7 +336,7 @@ function runAutoTests() {
createActionButton('Reset App', location.reload.bind(location));
createActionButton('Back', setMode.bind(null, 'main'));
- var cdvtests = cordova.require('org.apache.cordova.test-framework.cdvtests');
+ var cdvtests = cordova.require('cordova-plugin-test-framework.cdvtests');
cdvtests.init();
setupAutoTestsEnablers(cdvtests);
@@ -363,7 +363,7 @@ function runManualTests() {
createActionButton('Reset App', location.reload.bind(location));
createActionButton('Back', setMode.bind(null, 'manual'));
};
- var cdvtests = cordova.require('org.apache.cordova.test-framework.cdvtests');
+ var cdvtests = cordova.require('cordova-plugin-test-framework.cdvtests');
cdvtests.defineManualTests(contentEl, beforeEach, createActionButton);
}
@@ -400,7 +400,7 @@ exports.init = function() {
attachEvents();
exports.wrapConsole();
- var medic = require('org.apache.cordova.test-framework.medic');
+ var medic = require('cordova-plugin-test-framework.medic');
medic.load(function() {
if (medic.enabled) {
setMode('auto');
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/79b0c695/www/tests.js
----------------------------------------------------------------------
diff --git a/www/tests.js b/www/tests.js
index 424e351..727ac60 100644
--- a/www/tests.js
+++ b/www/tests.js
@@ -79,7 +79,7 @@ function requireAllTestModules() {
}
function createJasmineInterface() {
- var jasmine_helpers = require('org.apache.cordova.test-framework.jasmine_helpers');
+ var jasmine_helpers = require('cordova-plugin-test-framework.jasmine_helpers');
var jasmineInterface = jasmine_helpers.setUpJasmine();
return jasmineInterface;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-plugin-test-framework git commit: Revert "CB-8683
changed plugin-id to pacakge-name"
Posted by st...@apache.org.
Revert "CB-8683 changed plugin-id to pacakge-name"
This reverts commit 79b0c695515151217b9b791cd2bda75a41f87c2f.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/commit/c1590113
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/tree/c1590113
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/diff/c1590113
Branch: refs/heads/old-ID
Commit: c159011345b3dbc7a139d5cd551f67f005f17ff5
Parents: 79b0c69
Author: Steve Gill <st...@gmail.com>
Authored: Wed Apr 1 17:01:23 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Wed Apr 1 17:01:23 2015 -0700
----------------------------------------------------------------------
package.json | 2 +-
plugin.xml | 2 +-
www/assets/main-bootstrap.js | 4 ++--
www/jasmine_helpers.js | 2 +-
www/main.js | 12 ++++++------
www/tests.js | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/c1590113/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index e1e7d77..d73ba86 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"version": "0.0.2-dev",
"description": "Cordova Test Framework Plugin",
"cordova": {
- "id": "cordova-plugin-test-framework",
+ "id": "org.apache.cordova.test-framework",
"platforms": []
},
"repository": {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/c1590113/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index adf990a..5afab63 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -21,7 +21,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:rim="http://www.blackberry.com/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android"
- id="cordova-plugin-test-framework"
+ id="org.apache.cordova.test-framework"
version="0.0.2-dev">
<name>Test Framework</name>
<description>Cordova Test Framework Plugin</description>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/c1590113/www/assets/main-bootstrap.js
----------------------------------------------------------------------
diff --git a/www/assets/main-bootstrap.js b/www/assets/main-bootstrap.js
index 44a3bff..a536b65 100644
--- a/www/assets/main-bootstrap.js
+++ b/www/assets/main-bootstrap.js
@@ -22,5 +22,5 @@
'use strict';
document.addEventListener("deviceready", function() {
- cordova.require('cordova-plugin-test-framework.main').init();
-});
+ cordova.require('org.apache.cordova.test-framework.main').init();
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/c1590113/www/jasmine_helpers.js
----------------------------------------------------------------------
diff --git a/www/jasmine_helpers.js b/www/jasmine_helpers.js
index e6a0c1e..7113624 100644
--- a/www/jasmine_helpers.js
+++ b/www/jasmine_helpers.js
@@ -66,7 +66,7 @@ function addJasmineReporters(jasmineInterface, jasmineEnv) {
jasmineInterface.htmlReporter.initialize();
jasmineEnv.addReporter(jasmineInterface.htmlReporter);
- var medic = require('cordova-plugin-test-framework.medic');
+ var medic = require('org.apache.cordova.test-framework.medic');
if (medic.enabled) {
jasmineRequire.medic(jasmineInterface.jasmine);
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/c1590113/www/main.js
----------------------------------------------------------------------
diff --git a/www/main.js b/www/main.js
index 78fe7d9..2b76786 100644
--- a/www/main.js
+++ b/www/main.js
@@ -110,7 +110,7 @@ exports.wrapConsole = function() {
}
function createCustomLogger(type) {
- var medic = require('cordova-plugin-test-framework.medic');
+ var medic = require('org.apache.cordova.test-framework.medic');
return function() {
origConsole[type].apply(origConsole, arguments);
// TODO: encode log type somehow for medic logs?
@@ -228,7 +228,7 @@ function updateEnabledTestCount() {
var enabledLabel = document.getElementById('tests-enabled');
// Determine how many tests are currently enabled
- var cdvtests = cordova.require('cordova-plugin-test-framework.cdvtests');
+ var cdvtests = cordova.require('org.apache.cordova.test-framework.cdvtests');
var total = 0;
var enabled = 0;
iterateAutoTests(cdvtests, function(api, testModule) {
@@ -311,7 +311,7 @@ function toggleTestHandler(event) {
/******************************************************************************/
function toggleTestEnabled(checkbox) {
- var cdvtests = cordova.require('cordova-plugin-test-framework.cdvtests');
+ var cdvtests = cordova.require('org.apache.cordova.test-framework.cdvtests');
cdvtests.tests[checkbox.value].setEnabled(checkbox.checked);
}
@@ -336,7 +336,7 @@ function runAutoTests() {
createActionButton('Reset App', location.reload.bind(location));
createActionButton('Back', setMode.bind(null, 'main'));
- var cdvtests = cordova.require('cordova-plugin-test-framework.cdvtests');
+ var cdvtests = cordova.require('org.apache.cordova.test-framework.cdvtests');
cdvtests.init();
setupAutoTestsEnablers(cdvtests);
@@ -363,7 +363,7 @@ function runManualTests() {
createActionButton('Reset App', location.reload.bind(location));
createActionButton('Back', setMode.bind(null, 'manual'));
};
- var cdvtests = cordova.require('cordova-plugin-test-framework.cdvtests');
+ var cdvtests = cordova.require('org.apache.cordova.test-framework.cdvtests');
cdvtests.defineManualTests(contentEl, beforeEach, createActionButton);
}
@@ -400,7 +400,7 @@ exports.init = function() {
attachEvents();
exports.wrapConsole();
- var medic = require('cordova-plugin-test-framework.medic');
+ var medic = require('org.apache.cordova.test-framework.medic');
medic.load(function() {
if (medic.enabled) {
setMode('auto');
http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework/blob/c1590113/www/tests.js
----------------------------------------------------------------------
diff --git a/www/tests.js b/www/tests.js
index 727ac60..424e351 100644
--- a/www/tests.js
+++ b/www/tests.js
@@ -79,7 +79,7 @@ function requireAllTestModules() {
}
function createJasmineInterface() {
- var jasmine_helpers = require('cordova-plugin-test-framework.jasmine_helpers');
+ var jasmine_helpers = require('org.apache.cordova.test-framework.jasmine_helpers');
var jasmineInterface = jasmine_helpers.setUpJasmine();
return jasmineInterface;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org