From 2249151c9d14122ceedbab94cf2cc2b2ad4bbcbd Mon Sep 17 00:00:00 2001
From: Sidney Bofah <sidney.bofah@googlemail.com>
Date: Thu, 5 Feb 2015 11:08:07 +0100
Subject: [PATCH] Fixed mocha test errors. Moved mocha timeout setting to
 package.json.

---
 app/index.js          |  3 +-
 package.json          |  2 +-
 test/test-creation.js | 82 +++++++++++++++++++++++++------------------
 test/test-load.js     | 11 +++---
 4 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/app/index.js b/app/index.js
index 7f12e90..aa1c165 100644
--- a/app/index.js
+++ b/app/index.js
@@ -289,8 +289,7 @@ module.exports = generators.Base.extend({
       fs.rename(path.join(appPath, 'img'), path.join(appPath, 'images'), function(err) {
           if ( err ) console.log('ERROR: ' + err);
       });
-    },
-    
+    }
   }
 });
 
diff --git a/package.json b/package.json
index e59c23b..7194d25 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "url": "git://github.com/diegonetto/generator-ionic.git"
   },
   "scripts": {
-    "test": "mocha"
+    "test": "mocha --timeout 5000"
   },
   "dependencies": {
     "chalk": "^0.5.1",
diff --git a/test/test-creation.js b/test/test-creation.js
index cf3ee82..595d063 100644
--- a/test/test-creation.js
+++ b/test/test-creation.js
@@ -1,41 +1,55 @@
-/*global describe, beforeEach, it*/
+/*global describe, it, beforeEach */
 'use strict';
 
-var path    = require('path');
+var path = require('path');
 var helpers = require('yeoman-generator').test;
 
-describe('Ionic Framework Generator', function () {
-    beforeEach(function (done) {
-        this.timeout(60000);
-        helpers.testDirectory(path.join(__dirname, 'temp'), function (err) {
-            if (err) {
-                return done(err);
-            }
-
-            this.app = helpers.createGenerator('ionic:app', [
-                '../../app'
-            ]);
-            done();
-        }.bind(this));
-    });
+describe('Ionic Generator', function () {
+
+  beforeEach(function (done) {
+
+    helpers
+      .testDirectory(path.join(__dirname, 'temp'), function (err) {
+        if (err) {
+          return done(err);
+        }
+        this.app = helpers.createGenerator(
+          'ionic:app', [
+            '../../app'
+          ]);
+
+        done();
+      }.bind(this));
+  });
+
+  it('creates expected files', function () {
 
-    it('creates expected files', function (done) {
-        this.timeout(60000);
-        var expected = [
-            // add files you expect to exist here.
-            '.jshintrc',
-            '.editorconfig'
-        ];
-
-        helpers.mockPrompt(this.app, {
-            compass: false,
-            plugins: ['com.ionic.keyboard'],
-            starter: 'Tabs'
-        });
-        this.app.init = function () {};
-        this.app.run({}, function () {
-            helpers.assertFiles(expected);
-            done();
-        });
+    var expected = [
+      'config.xml',
+      'www/index.html',
+      'www/js/index.js',
+      '.bowerrc',
+      '.editorconfig',
+      '.gitignore',
+      '.jshintrc',
+      'Gruntfile.js',
+      'package.json',
+      'bower.json'
+    ];
+
+    helpers.mockPrompt(this.app, {
+      compass: false,
+      plugins: ['com.ionic.keyboard'],
+      starter: 'Tabs'
     });
+
+    this.app.options['skip-install'] = false;
+
+    this.app.run({}, function () {
+      helpers.assertFile(expected);
+      done();
+    })
+
+  });
 });
+
diff --git a/test/test-load.js b/test/test-load.js
index e32ae4a..8cb5eb4 100644
--- a/test/test-load.js
+++ b/test/test-load.js
@@ -1,11 +1,10 @@
-/*global describe, beforeEach, it*/
+/*global describe, it, beforeEach */
 'use strict';
 
-var assert = require('assert');
+var assert = require('yeoman-generator').assert;
 
-describe('ionic generator', function () {
+describe('Ionic Generator load test', function () {
     it('can be imported without blowing up', function () {
-        var app = require('../app');
-        assert(app !== undefined);
+      assert(require('../app') !== undefined);
     });
-});
+});
\ No newline at end of file