Merge pull request #70 from jgable/testsCleanup

Tests cleanup; convert to mocha

.gitignore

@@ -28,4 +28,5 @@ projectFilesBackup
 /core/admin/assets/sass/config.rb
 /core/admin/assets/sass/layouts/config.rb
 /core/admin/assets/sass/modules/config.rb
+/core/admin/assets/sass/modules/bourbon
 /ghost/.idea/

Gruntfile.js

@@ -21,12 +21,6 @@
                 ]
             },
 
-            // Unit test all the things!
-            nodeunit: {
-                all: ['core/test/ghost/**/test-*.js'],
-                api: ['core/test/ghost/test-api.js']
-            },
-
             mochaTest: {
                 options: {
                     ui: "bdd",
@@ -35,6 +29,10 @@
 
                 all: {
                     src: ['core/test/**/*_spec.js']
+                },
+
+                api: {
+                    src: ['core/test/**/api*_spec.js']
                 }
             },
 
@@ -57,7 +55,6 @@
         grunt.initConfig(cfg);
 
         grunt.loadNpmTasks("grunt-jslint");
-        grunt.loadNpmTasks("grunt-contrib-nodeunit");
         grunt.loadNpmTasks("grunt-mocha-test");
         grunt.loadNpmTasks("grunt-contrib-sass");
         grunt.loadNpmTasks("grunt-shell");
@@ -67,7 +64,7 @@
         grunt.registerTask("init", ["shell:bourbon", "sass:admin"]);
 
         // Run API tests only
-        grunt.registerTask("test-api", ["nodeunit:api", "mochaTest:all"]);
+        grunt.registerTask("test-api", ["mochaTest:api"]);
 
         // Run tests and lint code
         grunt.registerTask("validate", ["jslint", "mochaTest:all"]);

core/admin/controllers/index.js

@@ -86,8 +86,7 @@
                 api.users.add({email_address: req.body.email_address, password: req.body.password}).then(function (user) {
                     console.log('user added', user);
                     res.redirect('/ghost/login/');
-                },
+                }, function (error) {
-                function(error) {
                     console.log('there was an error', error);
                 });
             } else {

core/shared/models/dataProvider.bookshelf.users.js

@@ -66,7 +66,8 @@
         var test = {
             email_address: _userdata.email
         };
-        models.User.forge(test).fetch().then(function (user) {
+
+        this.model.forge(test).fetch().then(function (user) {
             var _user;
             bcrypt.compare(_userdata.pw, user.attributes.password, function (err, res) {
                 if (err) {

core/test/ghost/dataProvider.json_spec.js

@@ -0,0 +1,20 @@
+/*globals describe, beforeEach, it*/
+
+(function () {
+    "use strict";
+
+    var should = require('should'),
+        DataProvider = require('../../shared/models/dataProvider.json');
+
+    describe("dataProvider.json", function () {
+
+        it("is a singleton", function() {
+            var provider1 = new DataProvider(),
+                provider2 = new DataProvider();
+
+            should.strictEqual(provider1, provider2);
+        });
+
+    });
+
+}());

core/test/ghost/ghost_spec.js

@@ -0,0 +1,20 @@
+/*globals describe, beforeEach, it*/
+
+(function () {
+    "use strict";
+
+    var should = require('should'),
+        Ghost = require('../../ghost');
+
+    describe("Ghost API", function () {
+
+        it("is a singleton", function() {
+            var ghost1 = new Ghost(),
+                ghost2 = new Ghost();
+
+            should.strictEqual(ghost1, ghost2);
+        });
+
+    });
+
+}());

core/test/ghost/helpers.js

@@ -11,9 +11,10 @@
 
     helpers = {
         resetData: function () {
-
             return migrations.one.down().then(function () {
                 return migrations.one.up();
+            }, function() {
+                throw new Error("Failed to reset data");
             });
         }
     };

core/test/ghost/test-api.js

@@ -1,56 +0,0 @@
-/*global require, module */
-(function () {
-    "use strict";
-
-    // Use 'testing' Ghost config
-    process.env.NODE_ENV = 'testing';
-
-    var _        = require('underscore'),
-        assert   = require('assert'),
-        helpers  = require('./helpers'),
-        fixtures = require('../../shared/data/fixtures/001'),
-        api = require('../../shared/data/api');
-
-    function fail(err) {
-        process.nextTick(function () {
-            assert.ifError(err);
-        });
-    }
-
-    module.exports = {
-        setUp: function (done) {
-            // Clear database
-            helpers.resetData().then(function () {
-                done();
-            }, fail);
-        },
-
-        'settings:browse': function (test) {
-            test.expect(1);
-            api.settings.browse().then(function (settings) {
-                settings = _.map(settings.toJSON(), function (item) {
-                    return _.omit(item, 'id', 'updated_at', 'created_at');
-                });
-                test.deepEqual(settings, fixtures.settings);
-                test.done();
-            }).then(null, fail);
-        },
-
-        'settings:read': function (test) {
-            api.settings.read('title', function (setting) {
-                test.done();
-            }).then(null, fail);
-        },
-
-        'settings:edit': function (test) {
-            test.expect(2);
-            api.settings.edit('title', "Jenna O'Neil").then(function (title) {
-                title = title.toJSON();
-                test.equal(title.key, 'title');
-                test.equal(title.value, "Jenna O'Neil");
-                test.done();
-            }).then(null, fail);
-        }
-    };
-
-}());

core/test/ghost/test-dataProvider.json.js

@@ -1,16 +0,0 @@
-/*global require, module */
-(function () {
-    "use strict";
-
-    var DataProvider = require('../../shared/models/dataProvider.json');
-
-    module.exports = {
-        'singleton': function (test) {
-            var provider1 = new DataProvider(),
-                provider2 = new DataProvider();
-
-            test.equal(provider1, provider2);
-            test.done();
-        }
-    };
-}());

core/test/ghost/test-ghost.js

@@ -1,16 +0,0 @@
-/*global require, module */
-(function () {
-    "use strict";
-
-    var Ghost = require('../../ghost');
-
-    module.exports = {
-        'singleton': function (test) {
-            var ghost1 = new Ghost(),
-                ghost2 = new Ghost();
-
-            test.equal(ghost1, ghost2);
-            test.done();
-        }
-    };
-}());

package.json

@@ -23,8 +23,6 @@
   },
   "devDependencies": {
     "grunt": "~0.4.1",
-    "grunt-contrib-nodeunit": "0.1.x",
-    "nodeunit": "0.8.x",
     "grunt-jslint": "0.2.x",
     "should": "~1.2.2",
     "grunt-mocha-test": "~0.4.0",