update to [email protected] and testing cleanup

.gitignore

@@ -1,2 +1,2 @@
 node_modules
-test/temp
+test/tmp

app/index.js

@@ -1,10 +1,10 @@
 'use strict';
 var path = require('path');
-var yeoman = require('yeoman-generator');
+var generators = require('yeoman-generator');
 var sortedObject = require('sorted-object');
 var _ = require('underscore');
 
-module.exports = yeoman.generators.Base.extend({
+module.exports = generators.Base.extend({
   initializing: function () {
     function arrayFromString(str) {
       return str.split(',').filter(function (check) {
@@ -177,7 +177,10 @@ module.exports = yeoman.generators.Base.extend({
 
       this.fs.copyTpl(
         this.templatePath(this.options['config-file']),
-        this.destinationPath(path.join(this.options['config-path'], this.options['config-file'])), {
+        this.destinationPath(
+          path.join(this.options['config-path'], this.options['config-file'])
+        ),
+        {
           basePath: this.options['base-path'],
           frameworks: this.frameworks,
           fileComments: this.options['files-comments'],

package.json

@@ -25,11 +25,13 @@
     "karma"
   ],
   "dependencies": {
-    "underscore": "^1.6.0",
-    "yeoman-generator": "^0.19.1",
+    "underscore": "^1.8.3",
+    "yeoman-generator": "^0.22.5",
     "sorted-object": "~1.0.0"
   },
   "devDependencies": {
-    "mocha": "*"
+    "mocha": "*",
+    "yeoman-assert": "^2.1.1",
+    "yeoman-test": "^1.1.0"
   }
 }

test/config.mock.json

@@ -1,9 +1,9 @@
 {
-  "base-path": "<%= basePath %>",
-  "frameworks": <%= JSON.stringify(frameworks) %>,
-  "files": <%= JSON.stringify(configFiles) %>,
-  "exclude": <%= JSON.stringify(exclude) %>,
-  "port": <%= port %>,
-  "browsers": <%= JSON.stringify(browsers) %>,
-  "plugins": <%= JSON.stringify(plugins) %>
+  "base-path": "<%- basePath %>",
+  "frameworks": <%- JSON.stringify(frameworks) %>,
+  "files": <%- JSON.stringify(configFiles) %>,
+  "exclude": <%- JSON.stringify(exclude) %>,
+  "port": <%- port %>,
+  "browsers": <%- JSON.stringify(browsers) %>,
+  "plugins": <%- JSON.stringify(plugins) %>
 }

test/test-creation.js

@@ -1,8 +1,8 @@
 /*global describe, beforeEach, it */
 'use strict';
 var join = require('path').join;
-var assert = require('yeoman-generator').assert;
-var helpers = require('yeoman-generator').test;
+var helpers = require('yeoman-test');
+var assert = require('yeoman-assert');
 
 describe('Karma generator creation test', function () {
   describe('creates expected files', function () {

test/test-options.js

@@ -1,8 +1,8 @@
 /*global describe, it */
 'use strict';
 var path = require('path');
-var helpers = require('yeoman-generator').test;
-var assert = require('yeoman-generator').assert;
+var helpers = require('yeoman-test');
+var assert = require('yeoman-assert');
 
 describe('Karma generator options test', function () {
   it('creates expected options', function (done) {
@@ -24,13 +24,12 @@ describe('Karma generator options test', function () {
     };
 
     helpers.run(path.join(__dirname, '../app'))
-      .inDir(path.join(__dirname, 'temp'))
+      .inDir(path.join(__dirname, 'tmp'))
       .withOptions(config)
       .on('end', function () {
         var frameworks = config.frameworks.split(',');
         var test = require(path.resolve(
-          config['config-path'],
-          config['config-file']
+          config['config-path'], config['config-file']
         ));
 
         assert.equal(config['base-path'], test['base-path']);