Merge branch 'master' into greenkeeper/ember-cli-2.11.1

isleofcode · Feb 15, 2017 · 21f49a0 · 21f49a0
2 parents b4e60fb + 8d3e275
commit 21f49a0
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 39 deletions.
diff --git a/node-tests/fixtures/ember-cordova-mock/project.js b/node-tests/fixtures/ember-cordova-mock/project.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var path = require('path');
-var MockUI = require('ember-cli/tests/helpers/mock-ui');
 
 module.exports = {
  env: 'development',
@@ -14,7 +13,5 @@ module.exports = {
  isEmberCLIProject: function() { return true; }
  },
 
- config: function() {},
-
- ui: new MockUI()
+ config: function() {}
 }
diff --git a/node-tests/unit/commands/build-test.js b/node-tests/unit/commands/build-test.js
@@ -31,8 +31,7 @@ var setupBuild = function() {
  }
 
  var build = new BuildCmd({
- project: project,
- ui: mockProject.ui
+ project: project
  });
  build.analytics = mockAnalytics;
 

diff --git a/node-tests/unit/commands/cordova-test.js b/node-tests/unit/commands/cordova-test.js
@@ -21,8 +21,7 @@ describe('Cordova Command', function() {
  });
 
  var cmd = new CordovaCmd({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
  cmd.analytics = mockAnalytics;
 

diff --git a/node-tests/unit/commands/open-test.js b/node-tests/unit/commands/open-test.js
@@ -14,8 +14,7 @@ describe('Open Command', function() {
 
  beforeEach(function() {
  open = new OpenCmd({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
  open.analytics = mockAnalytics;
 

diff --git a/node-tests/unit/commands/platform-test.js b/node-tests/unit/commands/platform-test.js
@@ -15,8 +15,7 @@ describe('Platform Command', function() {
 
  beforeEach(function() {
  platform = new PlatformCmd({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
  platform.analytics = mockAnalytics;
  });

diff --git a/node-tests/unit/commands/plugin-test.js b/node-tests/unit/commands/plugin-test.js
@@ -14,8 +14,7 @@ describe('Plugin Command', function() {
 
  beforeEach(function() {
  plugin = new PluginCmd({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
  plugin.analytics = mockAnalytics;
 

diff --git a/node-tests/unit/commands/serve-test.js b/node-tests/unit/commands/serve-test.js
@@ -30,8 +30,7 @@ describe('Serve Command', function() {
 
  beforeEach(function() {
  serveCmd = new ServeCmd({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
 
  serveCmd.analytics = mockAnalytics;

diff --git a/node-tests/unit/index-test.js b/node-tests/unit/index-test.js
@@ -2,7 +2,6 @@
 
 var td = require('testdouble');
 var fs = require('fs');
-var mockProject = require('../fixtures/ember-cordova-mock/project');
 var expect = require('../helpers/expect');
 var isAnything = td.matchers.anything;
 
@@ -13,7 +12,6 @@ var stubIndex = function() {
  RELOAD_PORT: 1,
  CORDOVA_PLATFORM: 'ios'
  };
- stub.ui = mockProject.ui;
 
  stub._super = {};
  stub._super.treeForPublic = function(tree) { return tree };

diff --git a/node-tests/unit/tasks/create-cordova-shell-test.js b/node-tests/unit/tasks/create-cordova-shell-test.js
@@ -13,8 +13,7 @@ var setupTask = function(shouldMockTemplate) {
  var CreateShell = require('../../../lib/tasks/create-livereload-shell');
 
  var shellTask = new CreateShell({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
 
  if (shouldMockTemplate) {

diff --git a/node-tests/unit/tasks/ember-build-test.js b/node-tests/unit/tasks/ember-build-test.js
@@ -22,13 +22,11 @@ describe('Ember Build Task', function() {
  });
 
  var build = new EmberBuildTask({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
 
  return build.run().then(function() {
  td.verify(createKeepDouble('ember-cordova/cordova/www/.gitkeep'));
  });
  });
 });
-
diff --git a/node-tests/unit/tasks/setup-webview-test.js b/node-tests/unit/tasks/setup-webview-test.js
@@ -18,7 +18,6 @@ describe('Setup Webview Task', function() {
 
  setupTask = new SetupViewTask({
  project: mockProject.project,
- ui: mockProject.ui,
  platform: 'ios'
  });
  });

diff --git a/node-tests/unit/tasks/update-gitignore-test.js b/node-tests/unit/tasks/update-gitignore-test.js
@@ -12,8 +12,7 @@ describe('Update gitignore Task', function() {
  var createTask = function() {
  var GitIgnore = require('../../../lib/tasks/update-gitignore');
  return new GitIgnore({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
  };
 

diff --git a/node-tests/unit/tasks/update-watchman-config-test.js b/node-tests/unit/tasks/update-watchman-config-test.js
@@ -14,8 +14,7 @@ describe('Update Watchman Config Task', function() {
 
  beforeEach(function() {
  watchmanTask = new WatchmanConfig({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
  });
 

diff --git a/node-tests/unit/tasks/validate/allow-navigation-test.js b/node-tests/unit/tasks/validate/allow-navigation-test.js
@@ -16,8 +16,7 @@ describe('Validate Allow Navigation Test', function() {
 
  function setupTask() {
  return new ValidateNav({
- project: mockProject.project,
- ui: mockProject.ui
+ project: mockProject.project
  });
  }
 

diff --git a/node-tests/unit/tasks/validate/location-type-test.js b/node-tests/unit/tasks/validate/location-type-test.js
@@ -10,8 +10,7 @@ describe('Validate Location Type', function() {
 
  beforeEach(function() {
  validateLoc = new ValidateLocType({
- project: mockProject.project,
- ui: mockProject.ui,
+ project: mockProject.project
  });
  });
 

diff --git a/node-tests/unit/tasks/validate/root-url-test.js b/node-tests/unit/tasks/validate/root-url-test.js
@@ -20,8 +20,7 @@ describe('Validate Root Url', function() {
 
  beforeEach(function() {
  validateRoot = new ValidateRoot({
- project: mockProject.project,
- ui: mockProject.ui,
+ project: mockProject.project
  });
  });
 

diff --git a/node-tests/unit/tasks/validate/sanitize-addon-args-test.js b/node-tests/unit/tasks/validate/sanitize-addon-args-test.js
@@ -15,7 +15,6 @@ describe('Sanitize Cordova Args Test', function() {
  function setupTask() {
  return new SanitizeArgs({
  project: mockProject.project,
- ui: mockProject.ui,
  api: 'plugin'
  });
  }

diff --git a/package.json b/package.json
@@ -63,9 +63,9 @@
  "chalk": "^1.1.3",
  "configstore": "^2.0.0",
  "copy-dir": "^0.3.0",
- "cordova-lib": "^6.3.0",
+ "cordova-lib": "^6.5.0",
  "cordova-common": "^1.5.0",
- "fs-extra": "^1.0.0",
+ "fs-extra": "^2.0.0",
  "leek": "0.0.24",
  "lodash": "^4.13.1",
  "portfinder": "^1.0.5",
@@ -82,10 +82,10 @@
  "broccoli-asset-rev": "^2.2.0",
  "chai": "^3.5.0",
  "chai-as-promised": "^6.0.0",
- "ember-ajax": "2.5.2",
+ "ember-ajax": "2.5.4",
  "ember-cli": "^2.7.0",
  "ember-cli-app-version": "^2.0.1",
- "ember-cli-babel": "^5.1.6",
+ "ember-cli-babel": "^5.2.4",
  "ember-cli-dependency-checker": "^1.2.0",
  "ember-cli-htmlbars": "^1.0.1",
  "ember-cli-htmlbars-inline-precompile": "^0.3.1",