Merge pull request #51 from LevelbossMike/more-hook-tests

Add tests for untested hooks

Author: LevelbossMike

.jshintignore

@@ -0,0 +1,5 @@
+/dist
+/tmp
+/node_modules
+/bower_components
+config

index.js

@@ -1,7 +1,6 @@
 /* jshint node: true */
 'use strict';
 var path             = require('path');
-var Promise          = require('ember-cli/lib/ext/promise');
 var DeployPluginBase = require('ember-cli-deploy-plugin');
 var S3               = require('./lib/s3');
 
@@ -11,6 +10,7 @@ module.exports = {
   createDeployPlugin: function(options) {
     var DeployPlugin = DeployPluginBase.extend({
       name: options.name,
+      S3: options.S3 || S3,
 
       defaultConfig: {
         filePattern: 'index.html',
@@ -26,9 +26,6 @@ module.exports = {
         s3Client: function(context) {
           return context.s3Client; // if you want to provide your own S3 client to be used instead of one from aws-sdk
         },
-        s3DeployClient: function(/* context */) {
-          return new S3({ plugin: this });
-        },
         gzippedFiles: function(context) {
           return context.gzippedFiles || [];
         },
@@ -37,7 +34,7 @@ module.exports = {
 
       requiredConfig: ['bucket', 'region'],
 
-      upload: function(context) {
+      upload: function(/* context */) {
         var bucket         = this.readConfig('bucket');
         var prefix         = this.readConfig('prefix');
         var acl            = this.readConfig('acl');
@@ -61,11 +58,11 @@ module.exports = {
 
         this.log('preparing to upload revision to S3 bucket `' + bucket + '`', { verbose: true });
 
-        var s3 = this.readConfig('s3DeployClient');
+        var s3 = new this.S3({ plugin: this });
         return s3.upload(options);
       },
 
-      activate: function(context) {
+      activate: function(/* context */) {
         var bucket      = this.readConfig('bucket');
         var prefix      = this.readConfig('prefix');
         var acl         = this.readConfig('acl');
@@ -82,7 +79,7 @@ module.exports = {
 
         this.log('preparing to activate `' + revisionKey + '`', { verbose: true });
 
-        var s3 = this.readConfig('s3DeployClient');
+        var s3 = new this.S3({ plugin: this });
         return s3.activate(options);
       },
 
@@ -115,7 +112,7 @@ module.exports = {
           filePattern: filePattern,
         };
 
-        var s3 = this.readConfig('s3DeployClient');
+        var s3 = new this.S3({ plugin: this });
         return s3.fetchRevisions(options);
       }
     });

lib/s3.js

@@ -1,3 +1,6 @@
+/* jshint node: true */
+'use strict';
+
 var AWS        = require('aws-sdk');
 var CoreObject = require('core-object');
 var Promise    = require('ember-cli/lib/ext/promise');
@@ -52,7 +55,7 @@ module.exports = CoreObject.extend({
       ACL: acl,
       ContentType: mime.lookup(options.filePath) || 'text/html',
       CacheControl: 'max-age=0, no-cache'
-    }
+    };
 
     if (isGzipped) {
       params.ContentEncoding = 'gzip';
@@ -62,7 +65,7 @@ module.exports = CoreObject.extend({
       .then(function(revisions) {
         var found = revisions.map(function(element) { return element.revision; }).indexOf(options.revisionKey);
         if (found >= 0 && !allowOverwrite) {
-          return Promise.reject("REVISION ALREADY UPLOADED! (set `allowOverwrite: true` if you want to support overwriting revisions)")
+          return Promise.reject("REVISION ALREADY UPLOADED! (set `allowOverwrite: true` if you want to support overwriting revisions)");
         }
         return Promise.resolve();
       })
@@ -80,7 +83,7 @@ module.exports = CoreObject.extend({
     var client      = this._client;
     var bucket      = options.bucket;
     var acl         = options.acl;
-    var prefix      = options.prefix
+    var prefix      = options.prefix;
     var filePattern = options.filePattern;
     var key         = filePattern + ":" + options.revisionKey;
 
@@ -101,7 +104,7 @@ module.exports = CoreObject.extend({
       if (found >= 0) {
         return copyObject(params).then(function() {
           plugin.log('✔  ' + revisionKey + " => " + indexKey);
-        })
+        });
       } else {
         return Promise.reject("REVISION NOT FOUND!"); // see how we should handle a pipeline failure
       }

package.json

@@ -38,9 +38,10 @@
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.3",
     "ember-try": "0.0.6",
+    "github": "^0.2.4",
     "glob": "^5.0.15",
     "mocha": "^2.3.3",
-    "github": "^0.2.4",
+    "mocha-jshint": "^2.3.1",
     "multiline": "^1.0.2"
   },
   "keywords": [
@@ -57,4 +58,4 @@
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
-}
+}

tests/.jshintrc

@@ -21,9 +21,14 @@
     "andThen",
     "currentURL",
     "currentPath",
-    "currentRouteName"
+    "currentRouteName",
+    "describe",
+    "before",
+    "beforeEach",
+    "afterEach",
+    "it"
   ],
-  "node": false,
+  "node": true,
   "browser": false,
   "boss": true,
   "curly": true,