Fix failing tests

package.json

@@ -42,7 +42,7 @@
     "chalk": "^0.5.0",
     "findup": "^0.1.3",
     "fullname": "^0.1.0",
-    "insight": "^0.4.0",
+    "insight": "^0.3.1",
     "is-root": "^0.1.0",
     "lodash": "^2.4.1",
     "multiline": "^0.3.4",
@@ -64,7 +64,8 @@
     "grunt-contrib-jshint": "^0.10.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-mocha-test": "^0.11.0",
-    "mockery": "^1.4.0"
+    "mockery": "^1.4.0",
+    "sinon": "^1.10.3"
   },
   "engineStrict": true,
   "preferGlobal": true

test/mocha.opts

@@ -1,5 +1,5 @@
 --slow 1500
---timeout 50000
+--timeout 5000
 
 --reporter spec
 

test/test.js

@@ -1,3 +1,4 @@
+/*global describe, it, before, beforeEach, after, afterEach */
 'use strict';
 var fs = require('fs');
 var path = require('path');

test/yoyo.js

@@ -1,9 +1,11 @@
 /*global describe, it, before, beforeEach, after, afterEach */
+'use strict';
+var assert = require('assert');
 var path = require('path');
 var util = require('util');
+var sinon = require('sinon');
 var generator = require('yeoman-generator');
-var helpers = require(path.join(path.dirname(require.resolve('yeoman-generator')), 'lib/test/helpers'));
-var assert = require('assert');
+var helpers = generator.test;
 var env = generator();
 
 var insightStub = {
@@ -18,10 +20,7 @@ var yo = function () {
 };
 env.registerStub(yoyo, 'yo');
 
-function Phoenix() {
-  generator.Base.apply(this, arguments);
-}
-util.inherits(Phoenix, generator.Base);
+var Phoenix = generator.Base.extend();
 env.registerStub(Phoenix, 'phoenix:app');
 
 describe('yo yo', function () {
@@ -145,12 +144,10 @@ describe('yo yo', function () {
     it('should .run() desired generator', function (done) {
       var fakeGenerator = 'generator-phoenix';
 
-      helpers.stub(yoyo.prototype.env = {}, 'run', function (generator, done) {
-        assert.equal(generator, fakeGenerator);
-        done();
-      });
-
+      var stub = sinon.stub(yoyo.prototype, 'composeWith');
       yoyo.prototype._initGenerator(fakeGenerator, done);
+
+      sinon.assert.calledWith(stub, fakeGenerator);
     });
   });