Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm
Precedence: bulk
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: steven@apache.org
To: commits@cordova.apache.org
Date: Fri, 16 Jun 2017 00:20:08 -0000
Message-Id: <ae1ee0a2d9034e56a2018691a8800474@git.apache.org>
In-Reply-To: <62e1af370e154cdb8e1011a767653881@git.apache.org>
References: <62e1af370e154cdb8e1011a767653881@git.apache.org>
Subject: [14/16] cordova-lib git commit: Small reference fixes for getting
 integration tests at least running.
archived-at: Fri, 16 Jun 2017 00:19:58 -0000

Small reference fixes for getting integration tests at least running.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/1a632b75
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/1a632b75
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/1a632b75

Branch: refs/heads/master
Commit: 1a632b751532e7f26c69749d363c100aed23afe1
Parents: 8784e80
Author: filmaj <maj.fil@gmail.com>
Authored: Mon Jun 12 17:20:50 2017 -0500
Committer: filmaj <maj.fil@gmail.com>
Committed: Mon Jun 12 17:46:20 2017 -0500

----------------------------------------------------------------------
 integration-tests/ios-add-plugin-with-cocoapod.spec.js |  2 +-
 integration-tests/platform.spec.js                     | 13 +++++++------
 integration-tests/save.spec.js                         |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1a632b75/integration-tests/ios-add-plugin-with-cocoapod.spec.js
----------------------------------------------------------------------
diff --git a/integration-tests/ios-add-plugin-with-cocoapod.spec.js b/integration-tests/ios-add-plugin-with-cocoapod.spec.js
index 5a183bc..365cb4a 100644
--- a/integration-tests/ios-add-plugin-with-cocoapod.spec.js
+++ b/integration-tests/ios-add-plugin-with-cocoapod.spec.js
@@ -17,7 +17,7 @@
     under the License.
 */
 
-var helpers = require('./helpers'),
+var helpers = require('../spec-cordova/helpers'),
     path = require('path'),
     fs = require('fs'),
     shell = require('shelljs'),

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1a632b75/integration-tests/platform.spec.js
----------------------------------------------------------------------
diff --git a/integration-tests/platform.spec.js b/integration-tests/platform.spec.js
index fcda367..4727117 100644
--- a/integration-tests/platform.spec.js
+++ b/integration-tests/platform.spec.js
@@ -15,7 +15,7 @@
     under the License.
 */
 
-var helpers = require('./helpers'),
+var helpers = require('../spec-cordova/helpers'),
     path = require('path'),
     fs = require('fs'),
     shell = require('shelljs'),
@@ -26,10 +26,11 @@ var helpers = require('./helpers'),
     cordova = require('../src/cordova/cordova'),
     plugman = require('../src/plugman/plugman'),
     rewire = require('rewire'),
-    platform = rewire('../src/cordova/platform.js');
+    platform = rewire('../src/cordova/platform');
 
 var projectRoot = 'C:\\Projects\\cordova-projects\\move-tracker';
-var pluginsDir = path.join(__dirname, 'fixtures', 'plugins');
+var fixturesDir = path.join(__dirname, '..', 'spec-cordova', 'fixtures');
+var pluginsDir = path.join(fixturesDir, 'plugins');
 
 describe('platform end-to-end', function () {
 
@@ -43,14 +44,14 @@ describe('platform end-to-end', function () {
 
         // cp then mv because we need to copy everything, but that means it'll copy the whole directory.
         // Using /* doesn't work because of hidden files.
-        shell.cp('-R', path.join(__dirname, 'fixtures', 'base'), tmpDir);
+        shell.cp('-R', path.join(fixturesDir, 'base'), tmpDir);
         shell.mv(path.join(tmpDir, 'base'), project);
         process.chdir(project);
 
         // Now we load the config.json in the newly created project and edit the target platform's lib entry
         // to point at the fixture version. This is necessary so that cordova.prepare can find cordova.js there.
         var c = config.read(project);
-        c.lib[helpers.testPlatform].url = path.join(__dirname, 'fixtures', 'platforms', helpers.testPlatform + '-lib');
+        c.lib[helpers.testPlatform].url = path.join(fixturesDir, 'platforms', helpers.testPlatform + '-lib');
         config.write(project, c);
 
         // The config.json in the fixture project points at fake "local" paths.
@@ -58,7 +59,7 @@ describe('platform end-to-end', function () {
         spyOn(superspawn, 'spawn').and.callFake(function(cmd, args) {
             if (cmd.match(/create\b/)) {
                 // This is a call to the bin/create script, so do the copy ourselves.
-                shell.cp('-R', path.join(__dirname, 'fixtures', 'platforms', 'android'), path.join(project, 'platforms'));
+                shell.cp('-R', path.join(fixturesDir, 'platforms', 'android'), path.join(project, 'platforms'));
             } else if(cmd.match(/version\b/)) {
                 return Q('3.3.0');
             } else if(cmd.match(/update\b/)) {

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1a632b75/integration-tests/save.spec.js
----------------------------------------------------------------------
diff --git a/integration-tests/save.spec.js b/integration-tests/save.spec.js
index 2a64208..278ebde 100644
--- a/integration-tests/save.spec.js
+++ b/integration-tests/save.spec.js
@@ -20,7 +20,7 @@
 describe('(save flag)', function () {
     var rewire      = require('rewire'),
         cordova     = require('../src/cordova/cordova'),
-        helpers     = require('./helpers'),
+        helpers     = require('../spec-cordova/helpers'),
         path        = require('path'),
         Q           = require('q'),
         fs          = require('fs'),


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