Move API tests to /integration/

closes #1396
- moved core/test/unit/api* to core/test/integration/api/
- moved core/test/integration/model* to core/test/integration/model/
- moved core/test/unit/utils to core/test/utils
- moved core/test/unit/fixtures to core/test/utils/fixtures/
- changed gruntfile.js to execute api tests with target 'integration'

Gruntfile.js

@@ -200,7 +200,11 @@ var path           = require('path'),
                 },
 
                 api: {
-                    src: ['core/test/unit/**/api*_spec.js']
+                    src: ['core/test/integration/**/api*_spec.js']
+                },
+
+                model: {
+                    src: ['core/test/integration/**/model*_spec.js']
                 },
 
                 client: {
@@ -227,7 +231,10 @@ var path           = require('path'),
                 },
 
                 integration: {
-                    src: ['core/test/integration/**/model*_spec.js']
+                    src: [
+                        'core/test/integration/**/model*_spec.js',
+                        'core/test/integration/**/api*_spec.js'
+                    ]
                 }
             },
 

core/test/integration/api/api_posts_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, before, beforeEach, afterEach, it */
-var testUtils = require('./utils'),
+var testUtils = require('../../utils'),
     should = require('should'),
     _ = require('underscore'),
     request = require('request'),

core/test/integration/api/api_settings_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, before, beforeEach, afterEach, it */
-var testUtils = require('./utils'),
+var testUtils = require('../../utils'),
     should = require('should'),
     _ = require('underscore'),
     request = require('request'),

core/test/integration/api/api_tags_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, before, beforeEach, afterEach, it */
-var testUtils = require('./utils'),
+var testUtils = require('../../utils'),
     should = require('should'),
     _ = require('underscore'),
     request = require('request'),

core/test/integration/api/api_users_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, before, beforeEach, afterEach, it */
-var testUtils = require('./utils'),
+var testUtils = require('../../utils'),
     should = require('should'),
     _ = require('underscore'),
     request = require('request'),

core/test/integration/model/model_permissions_spec.js

@@ -1,10 +1,10 @@
 /*globals describe, it, before, beforeEach, afterEach */
-var testUtils = require('../unit/utils'),
+var testUtils = require('../../utils'),
     should = require('should'),
-    errors = require('../../server/errorHandling'),
+    errors = require('../../../server/errorHandling'),
 
     // Stuff we are testing
-    Models = require('../../server/models');
+    Models = require('../../../server/models');
 
 describe("Permission Model", function () {
 

core/test/integration/model/model_posts_spec.js

@@ -1,12 +1,12 @@
 /*globals describe, before, beforeEach, afterEach, it */
-var testUtils = require('../unit/utils'),
+var testUtils = require('../../utils'),
     should = require('should'),
     _ = require('underscore'),
     when = require('when'),
     sequence = require('when/sequence'),
 
     // Stuff we are testing
-    Models = require('../../server/models');
+    Models = require('../../../server/models');
 
 describe('Post Model', function () {
 

core/test/integration/model/model_roles_spec.js

@@ -1,10 +1,10 @@
 /*globals describe, it, before, beforeEach, afterEach */
-var testUtils = require('../unit/utils'),
+var testUtils = require('../../utils'),
     should = require('should'),
-    errors = require('../../server/errorHandling'),
+    errors = require('../../../server/errorHandling'),
 
     // Stuff we are testing
-    Models = require('../../server/models');
+    Models = require('../../../server/models');
 
 describe("Role Model", function () {
 

core/test/integration/model/model_settings_spec.js

@@ -1,11 +1,11 @@
 /*globals describe, before, beforeEach, afterEach, it*/
-var testUtils = require('../unit/utils'),
+var testUtils = require('../../utils'),
     should = require('should'),
     _ = require("underscore"),
 
     // Stuff we are testing
-    Models = require('../../server/models'),
+    Models = require('../../../server/models'),
-    knex = require('../../server/models/base').knex;
+    knex = require('../../../server/models/base').knex;
 
 describe('Settings Model', function () {
 

core/test/integration/model/model_tags_spec.js

@@ -1,12 +1,12 @@
 /*globals describe, before, beforeEach, afterEach, it */
-var testUtils = require('../unit/utils'),
+var testUtils = require('../../utils'),
     _ = require("underscore"),
     when = require('when'),
     sequence = require('when/sequence'),
     should = require('should'),
 
     // Stuff we are testing
-    Models = require('../../server/models');
+    Models = require('../../../server/models');
 
 describe('Tag Model', function () {
 

core/test/integration/model/model_users_spec.js

@@ -1,12 +1,12 @@
 /*globals describe, before, beforeEach, afterEach, it*/
-var testUtils = require('../unit/utils'),
+var testUtils = require('../../utils'),
     should = require('should'),
     when = require('when'),
     _ = require('underscore'),
-    errors = require('../../server/errorHandling'),
+    errors = require('../../../server/errorHandling'),
 
     // Stuff we are testing
-    Models = require('../../server/models');
+    Models = require('../../../server/models');
 
 
 describe('User Model', function run() {

core/test/unit/client_ghostdown_spec.js

@@ -6,7 +6,7 @@
  */
 
 /*globals describe, it */
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
 
     // Stuff we are testing

core/test/unit/client_showdown_int_spec.js

@@ -5,7 +5,7 @@
  */
 
 /*globals describe, it */
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
 
     // Stuff we are testing

core/test/unit/errorHandling_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, beforeEach, it*/
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
     when = require('when'),
     sinon = require('sinon'),

core/test/unit/export_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, before, beforeEach, afterEach, it*/
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
     sinon = require('sinon'),
     when = require('when'),

core/test/unit/ghost_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, before, beforeEach, it*/
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
     sinon = require('sinon'),
     when = require('when'),
@@ -10,8 +10,8 @@ var testUtils = require('./utils'),
     Ghost = require('../../ghost');
 
 describe("Ghost API", function () {
-    var testTemplatePath = 'core/test/unit/fixtures/',
+    var testTemplatePath = 'core/test/utils/fixtures/',
-        themeTemplatePath = 'core/test/unit/fixtures/theme',
+        themeTemplatePath = 'core/test/utils/fixtures/theme',
         sandbox,
         ghost;
 

core/test/unit/import_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, beforeEach, it*/
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
     sinon = require('sinon'),
     when = require('when'),

core/test/unit/mail_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, beforeEach, afterEach, it*/
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
     sinon = require('sinon'),
     when = require('when'),

core/test/unit/permissions_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, before, beforeEach, afterEach, it*/
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
     sinon = require('sinon'),
     when = require('when'),

core/test/unit/plugins_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, beforeEach, afterEach,  before, it*/
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
     sinon = require('sinon'),
     _ = require("underscore"),

core/test/unit/server_helpers_index_spec.js

@@ -1,5 +1,5 @@
 /*globals describe, beforeEach, it*/
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
     sinon = require('sinon'),
     when = require('when'),

core/test/unit/shared_gfm_spec.js

@@ -4,7 +4,7 @@
  */
 
 /*globals describe, it */
-var testUtils = require('./utils'),
+var testUtils = require('../utils'),
     should = require('should'),
 
     // Stuff we are testing

core/test/utils/index.js

@@ -1,8 +1,8 @@
-var knex = require('../../../server/models/base').knex,
+var knex = require('../../server/models/base').knex,
     when = require('when'),
-    migration = require("../../../server/data/migration/"),
+    migration = require("../../server/data/migration/"),
-    Settings = require('../../../server/models/settings').Settings,
+    Settings = require('../../server/models/settings').Settings,
-    DataGenerator = require('../fixtures/data-generator'),
+    DataGenerator = require('./fixtures/data-generator'),
     API = require('./api');
 
 function initData() {