ember-cli-addon-tests - npm Package Compare versions

Comparing version 0.6.1 to 0.6.2

lib/commands/start-server.js

@@ -8,2 +8,3 @@ "use strict";
 var _        = require('lodash');
+var temp     = require('../utilities/temp');
 
@@ -41,3 +42,3 @@ module.exports = function runServer(options) {
 
-    runEmber(options.command, args)
+    runEmber(options.command, args, temp.pristineNodeModulesPath)
       .then(function() {
@@ -44,0 +45,0 @@ throw new Error('The server should not have exited successfully.');

lib/models/addon-test-app.js

 var fs         = require('fs-extra');
 var path       = require('path');
-var findup     = require('findup-sync');
 var util       = require('util');
 var App        = require('./app');
-var debug      = require('../utilities/debug');
 var pristine   = require('../utilities/pristine');
-var RSVP = require('rsvp');
-var copy = RSVP.denodeify(require('cpr'));
+var copyFixtureFiles = require('../utilities/copy-fixture-files');
 
@@ -44,22 +41,2 @@ function AddonTestApp() {
 
-function copyFixtureFiles(appName, destDir, fixturesPath) {
-  fixturesPath = findup(fixturesPath || 'test/fixtures');
-
-  if (!fixturesPath) {
-    fixturesPath = findup('tests/fixtures');
-  }
-
-  if (!fixturesPath) {
-    throw new Error("Could not find fixtures directory. Make sure you have a fixtures directory in your `test/` directory. You may encounter this issue if you have npm linked this package; copy it to your node_modules directory instead.");
-  }
-
-  var sourceDir = path.join(fixturesPath, appName);
-
-  debug("copying fixtures; from=%s; to=%s", sourceDir, destDir);
-
-  return copy(sourceDir, destDir, {
-    overwrite: true
-  });
-}
-
 module.exports = AddonTestApp;

lib/utilities/pristine.js

@@ -10,7 +10,6 @@ "use strict";
 var existsSync       = fs.existsSync;
-var RSVP             = require('rsvp');
-var Promise = RSVP.Promise;
-var exec             = RSVP.denodeify(require('child_process').exec);
+var Promise = require('rsvp').Promise;
 var moveDirectory    = require('./move-directory');
 var symlinkDirectory = require('./symlink-directory');
+var runCommand       = require('./run-command');
 var runEmber         = require('./run-ember');
@@ -107,3 +106,3 @@ var runNew           = require('./run-new');
         debug('installing ember-disable-prototype-extensions');
-        return exec('npm install ember-disable-prototype-extensions');
+        return runCommand('npm', 'install', 'ember-disable-prototype-extensions');
       })
@@ -114,3 +113,3 @@ .then(function() {
       .then(function() {
-        return exec('npm install');
+        return runCommand('npm', 'install');
       })
@@ -129,3 +128,3 @@ .then(function() {
     promise = promise.then(function() {
-      return exec('bower install');
+      return runCommand('bower', 'install');
     })
@@ -132,0 +131,0 @@ .then(function() {

lib/utilities/run-command.js

 'use strict';
 
-var Promise        = require('rsvp').Promise;
+var RSVP           = require('rsvp');
+var Promise        = RSVP.Promise;
 var chalk          = require('chalk');
-var spawn          = require('child_process').spawn;
+var childProcess   = require('child_process');
+var spawn          = childProcess.spawn;
 var defaults       = require('lodash/object/defaults');
@@ -10,3 +12,6 @@ var killCliProcess = require('./kill-cli-process');
 var logOnFailure   = require('./log-on-failure');
+var exec           = RSVP.denodeify(childProcess.exec);
 
+var isWindows = process.platform === 'win32';
+
 module.exports = function run(/* command, args, options */) {
@@ -22,2 +27,7 @@ var command = arguments[0];
   debug("running command=" + command + "; args=" + args + "; cwd=" + process.cwd());
+
+  if (isWindows && command === 'npm') {
+    return exec(command + ' ' + args.join(' '));
+  }
+
   options = defaults(options, {
@@ -42,3 +52,3 @@
     var opts = {};
-    if (process.platform === 'win32') {
+    if (isWindows) {
       args = ['"' + command + '"'].concat(args);
@@ -45,0 +55,0 @@ command = 'node';

lib/utilities/run-ember.js

@@ -7,5 +7,5 @@ 'use strict';
 
-module.exports = function(command, options) {
+module.exports = function(command, options, dirPath) {
   var emberCLIPath = findup('node_modules/ember-cli', {
-    cwd: __dirname
+    cwd: dirPath || __dirname
   });
@@ -12,0 +12,0 @@

package.json

 {
   "name": "ember-cli-addon-tests",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "A set of integration test helpers for Ember CLI addons",
@@ -20,3 +20,3 @@ "keywords": [
   "scripts": {
-    "test": "mocha test/acceptance"
+    "test": "cross-env DEBUG=ember-cli-addon-tests mocha test/acceptance"
   },
@@ -39,3 +39,5 @@ "dependencies": {
     "chai": "^3.5.0",
-    "ember-cli": "^1.13.0",
+    "cross-env": "^3.1.4",
+    "ember-cli": "~2.9.0",
+    "ember-cli-fastboot": "1.0.0-beta.15",
     "mocha": "^3.1.2",
@@ -42,0 +44,0 @@ "request": "^2.75.0"

README.md

@@ -140,4 +140,4 @@ ## Ember CLI Addon Tests
 app.editPackageJSON(function(pkg) {
-  pkg['devDependencies']['fake-addon'] = "*";
-  pkg['devDependencies']['fake-addon-2'] = "*";
+  pkg.devDependencies['fake-addon'] = "*";
+  pkg.devDependencies['fake-addon-2'] = "*";
 });
@@ -188,3 +188,3 @@ ```
 
-You can rub arbitrary commands inside the test app via the `run()`
+You can run arbitrary commands inside the test app via the `run()`
 method. Takes a command and optional arguments.
@@ -191,0 +191,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

31043

increased by1.76%

Number of package files

19

increased by5.56%

Lines of code

675

increased by1.35%

Number of medium supply chain risk alerts

1

decreased by-50%

Worsened metrics

Dev dependency count

6

increased by50%

No dependency changes