Merge pull request #2572 from angular-fullstack/chore/gen-deps

Chore/gen deps

Author: Awk34

circle.yml

@@ -56,4 +56,4 @@ jobs:
             - ~/generator-angular-fullstack/test/fixtures/node_modules
 
       - run: gulp build
-      - run: gulp test
+      - run: npm test

gulpfile.js

@@ -25,12 +25,11 @@ const mocha = lazypipe()
         reporter: 'spec',
         timeout: 120000,
         slow: 500,
-        globals: {
-            should: require('should')
-        },
         require: [
-            './mocha.conf'
-        ]
+            './mocha.conf',
+            'should'
+        ],
+        compilers: ['js:babel-core/register']
     });
 
 const transpile = lazypipe()

package.json

@@ -31,7 +31,8 @@
     "url": "git://github.com/angular-fullstack/generator-angular-fullstack.git"
   },
   "scripts": {
-    "test": "gulp updateFixtures:test && gulp installFixtures && gulp build && gulp test",
+    "pre-test": "gulp updateFixtures:test && gulp installFixtures && gulp build",
+    "test": "mocha --require should --require babel-register --require ./mocha.conf --reporter spec --timeout 120000 test/pre.test.js test/*.test.js",
     "prepublish": "gulp build"
   },
   "dependencies": {
@@ -40,10 +41,10 @@
     "chalk": "^1.1.0",
     "glob": "^7.0.5",
     "gulp-eslint": "^3.0.1",
-    "gulp-filter": "^4.0.0",
+    "gulp-filter": "^5.0.0",
     "gulp-html2jade": "^1.1.2",
     "gulp-rename": "^1.2.2",
-    "gulp-tap": "^0.1.3",
+    "gulp-tap": "^1.0.1",
     "insight": "~0.8.3",
     "jscodeshift": "^0.3.30",
     "lodash": "^4.17.0",
@@ -54,11 +55,12 @@
   },
   "devDependencies": {
     "babel-core": "^6.18.2",
-    "babel-preset-es2015": "^6.18.0",
     "babel-plugin-transform-class-properties": "^6.19.0",
     "babel-plugin-transform-flow-strip-types": "^6.18.0",
+    "babel-preset-es2015": "^6.18.0",
     "babel-register": "^6.18.0",
     "chai": "^3.5.0",
+    "david": "^11.0.0",
     "del": "^2.2.0",
     "grunt": "^1.0.1",
     "grunt-build-control": "^0.7.0",
@@ -69,7 +71,7 @@
     "gulp-conventional-changelog": "^1.1.0",
     "gulp-gh-pages": "^0.5.4",
     "gulp-if": "^2.0.1",
-    "gulp-mocha": "^3.0.0",
+    "gulp-mocha": "^4.3.1",
     "gulp-plumber": "^1.1.0",
     "gulp-util": "^3.0.7",
     "jit-grunt": "~0.10.0",
@@ -82,8 +84,8 @@
     "run-sequence": "^1.2.1",
     "shelljs": "^0.7.5",
     "should": "^11.1.0",
-    "yeoman-assert": "^2.0.0",
-    "yeoman-test": "~1.5.0"
+    "yeoman-assert": "^3.0.0",
+    "yeoman-test": "~1.6.0"
   },
   "peerDependencies": {
     "yo": ">= 1.7.1"

src/test/endpoint.test.js

@@ -38,33 +38,29 @@ function runEndpointGen(name, opt={}) {
   let options = opt.options || {};
   let config = opt.config;
 
-  return new Promise((resolve, reject) => {
-    let dir;
-    let gen = helpers
-      .run(require.resolve('../generators/endpoint'))
-      .inTmpDir(function(_dir) {
-        // this will create a new temporary directory for each new generator run
-        var done = this.async();
-        if(DEBUG) console.log(`TEMP DIR: ${_dir}`);
-        dir = _dir;
-
-        // symlink our dependency directories
-        return fs.symlinkAsync(__dirname + '/fixtures/node_modules', dir + '/node_modules')
-          .then(done);
-      })
-      .withOptions(options)
-      .withArguments([name])
-      .withPrompts(prompts);
-
-    if(config) {
-      gen
-        .withLocalConfig(config);
-    }
-
+  let dir;
+  let gen = helpers
+    .run(require.resolve('../generators/endpoint'))
+    .inTmpDir(function(_dir) {
+      // this will create a new temporary directory for each new generator run
+      var done = this.async();
+      if(DEBUG) console.log(`TEMP DIR: ${_dir}`);
+      dir = _dir;
+
+      // symlink our dependency directories
+      return fs.symlinkAsync(__dirname + '/fixtures/node_modules', dir + '/node_modules')
+        .then(done);
+    })
+    .withOptions(options)
+    .withArguments([name])
+    .withPrompts(prompts);
+
+  if(config) {
     gen
-      .on('error', reject)
-      .on('end', () => resolve(dir));
-  });
+      .withLocalConfig(config);
+  }
+
+  return gen;
 }
 
 let eslintCmd = path.join(TEST_DIR, '/fixtures/node_modules/.bin/eslint');
@@ -105,11 +101,11 @@ describe('angular-fullstack:endpoint', function() {
         _config['generator-angular-fullstack'].insertSockets = false;
         _config['generator-angular-fullstack'].insertModels = false;
         config = _config;
-      })
+      }),
     ]);
   });
 
-  describe(`with a generated endpont 'foo'`, function() {
+  describe(`with a generated endpoint 'foo'`, function() {
     var dir;
     beforeEach(function() {
       return runEndpointGen('foo', {config: config['generator-angular-fullstack']}).then(_dir => {
@@ -131,7 +127,7 @@ describe('angular-fullstack:endpoint', function() {
     });
   });
 
-  describe('with a generated capitalized endpont', function() {
+  describe('with a generated capitalized endpoint', function() {
     var dir;
     beforeEach(function() {
       return runEndpointGen('Foo', {config: config['generator-angular-fullstack']}).then(_dir => {
@@ -153,7 +149,7 @@ describe('angular-fullstack:endpoint', function() {
     });
   });
 
-  describe('with a generated path name endpont', function() {
+  describe('with a generated path name endpoint', function() {
     var dir;
     beforeEach(function() {
       return runEndpointGen('foo/bar', {config: config['generator-angular-fullstack']}).then(_dir => {

src/test/test-helpers.js

@@ -119,5 +119,5 @@ export function runGen(prompts, opts={}) {
 
   if(prompts) gen.withPrompts(prompts);
 
-  return gen.toPromise();
+  return gen;
 }