Merge pull request #9 from lukemelia/configurable-output-path

Allow outputPath to be configurable
ember-cli-deploy · May 29, 2015 · 21949dd · 21949dd
2 parents 86847e8 + 7d0c29b
commit 21949dd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -56,7 +56,7 @@ module.exports = {
         var project    = deployment.project;
         var config     = deployment.config[this.name] || {};
 
-        var outputPath = 'dist';
+        var outputPath = config.outputPath;
         var buildEnv   = config.buildEnv || 'production';
 
         var Builder  = require('ember-cli/lib/models/builder');

diff --git a/lib/utilities/validate-config.js b/lib/utilities/validate-config.js
@@ -19,9 +19,9 @@ module.exports = function(ui, config) {
 
   var defaultConfig = {
     buildEnv: 'production',
-    buildPath: 'tmp/dist-deploy'
+    outputPath: 'dist'
   };
-  ['buildEnv', 'buildPath'].forEach(function(propName){
+  ['buildEnv', 'outputPath'].forEach(function(propName){
     applyDefaultConfigIfNecessary(config, propName, defaultConfig, ui);
   });
 

diff --git a/tests/unit/index-nodetest.js b/tests/unit/index-nodetest.js
@@ -68,7 +68,7 @@ describe('build plugin', function() {
           config: {
             build: {
               buildEnv: 'development',
-              buildPath: 'tmp/dist-deploy',
+              outputPath: 'tmp/dist-deploy',
             }
           }
         }
@@ -80,7 +80,7 @@ describe('build plugin', function() {
       return assert.isFulfilled(plugin.build.call(plugin, context))
         .then(function(result) {
           assert.deepEqual(result, {
-            distDir: 'dist',
+            distDir: 'tmp/dist-deploy',
             distFiles: [
                'assets/dummy.css',
                'assets/dummy.js',

diff --git a/tests/unit/lib/utilities/validate-config-nodetest.js b/tests/unit/lib/utilities/validate-config-nodetest.js
@@ -43,7 +43,7 @@ describe('validate-config', function() {
       return assert.isFulfilled(subject(mockUi, config))
         .then(function() {
           assert.isDefined(config.buildEnv);
-          assert.isDefined(config.buildPath);
+          assert.isDefined(config.outputPath);
         });
     });
 
@@ -52,11 +52,11 @@ describe('validate-config', function() {
     });
   });
 
-  describe('with a buildEnv and buildPath provided', function () {
+  describe('with a buildEnv and outputPath provided', function () {
     beforeEach(function() {
       config = {
         buildEnv: 'development',
-        buildPath: 'tmp/dist-deploy'
+        outputPath: 'tmp/dist-deploy'
       };
     });
     it('does not warns about missing optional config', function() {