Optimised test folder structure (#9958)

refs #9866

- test/functional/
- test/functional/api
- test/functional/api/v0.1
- test/functional/api/v0.1/utils
- test/functional/api/v2
- test/functional/api/v2/admin
- test/functional/api/v2/admin/utils
- test/functional/api/v2/content
- test/functional/api/v2/content/utils

- updated grunt file
- instead of `grunt test-routes`, you now need to use `grunt test-functional` (docs are updated)

You can use `localUtils.API.getApiQuery('posts/')` and it will generate the correct API url.

Gruntfile.js

@@ -158,10 +158,10 @@ var config = require('./core/server/config'),
                     ]
                 },
 
-                // #### All Route tests
-                routes: {
+                // #### All functional tests
+                functional: {
                     src: [
-                        'core/test/functional/routes/**/*_spec.js'
+                        'core/test/functional/**/*_spec.js'
                     ]
                 },
 
@@ -512,7 +512,7 @@ var config = require('./core/server/config'),
         // `grunt test-all` will lint and test your pre-built local Ghost codebase.
         //
         grunt.registerTask('test-all', 'Run all server tests',
-            ['test-routes', 'test-unit', 'test-integration']);
+            ['test-functional', 'test-unit', 'test-integration']);
 
         // ### Lint
         //
@@ -575,11 +575,11 @@ var config = require('./core/server/config'),
         );
 
         // ### Route tests *(sub task)*
-        // `grunt test-routes` will run just the route tests
+        // `grunt test-functional` will run just the route tests
         //
         // If you need to run an individual route test file, you can use the `grunt test:<file_path>` task:
         //
-        // `grunt test:functional/routes/admin_spec.js`
+        // `grunt test:functional/admin_spec.js`
         //
         // Route tests are run with [mocha](http://mochajs.org/) using
         // [should](https://github.com/visionmedia/should.js) and [supertest](https://github.com/visionmedia/supertest)
@@ -591,8 +591,13 @@ var config = require('./core/server/config'),
         // The purpose of the route tests is to ensure that all of the routes (pages, and API requests) in Ghost
         // are working as expected, including checking the headers and status codes received. It is very easy and
         // quick to test many permutations of routes / urls in the system.
-        grunt.registerTask('test-routes', 'Run functional route tests (mocha)',
-            ['test-setup', 'mochacli:routes']
+        grunt.registerTask('test-functional', 'Run functional tests (mocha)',
+            ['test-setup', 'mochacli:functional']
+        );
+
+        // Shortcut
+        grunt.registerTask('test-func', 'Run functional tests (mocha)',
+            ['test-setup', 'mochacli:functional']
         );
 
         // ### Coverage

core/test/functional/admin_spec.js

@@ -5,11 +5,11 @@
 
 var should = require('should'),
     supertest = require('supertest'),
-    testUtils = require('../../utils'),
-    configUtils = require('../../utils/configUtils'),
+    testUtils = require('../utils'),
+    configUtils = require('../utils/configUtils'),
     ghost = testUtils.startGhost,
-    common = require('../../../server/lib/common'),
-    config = require('../../../../core/server/config'),
+    common = require('../../server/lib/common'),
+    config = require('../../server/config'),
     request;
 
 common.i18n.init();

core/test/functional/api/v2/admin/utils.js

@@ -0,0 +1,11 @@
+const url = require('url');
+const _ = require('lodash');
+const API_URL = '/ghost/api/v2/admin/';
+
+module.exports = {
+    API: {
+        getApiQuery(route) {
+            return url.resolve(API_URL, route);
+        }
+    }
+};

core/test/functional/api/v2/content/utils.js

@@ -0,0 +1,11 @@
+const url = require('url');
+const _ = require('lodash');
+const API_URL = '/ghost/api/v2/content/';
+
+module.exports = {
+    API: {
+        getApiQuery(route) {
+            return url.resolve(API_URL, route);
+        }
+    }
+};

core/test/functional/apps/subscribers/routing_spec.js

@@ -1,9 +1,9 @@
 var supertest = require('supertest'),
     should = require('should'),
     sinon = require('sinon'),
-    testUtils = require('../../../../utils'),
-    labs = require('../../../../../server/services/labs'),
-    config = require('../../../../../server/config'),
+    testUtils = require('../../../utils'),
+    labs = require('../../../../server/services/labs'),
+    config = require('../../../../server/config'),
     ghost = testUtils.startGhost,
     sandbox = sinon.sandbox.create();
 

core/test/functional/dynamic_routing_spec.js

@@ -7,11 +7,11 @@ const should = require('should'),
     sinon = require('sinon'),
     moment = require('moment'),
     path = require('path'),
-    testUtils = require('../../utils'),
+    testUtils = require('../utils'),
     cheerio = require('cheerio'),
-    config = require('../../../../core/server/config'),
-    api = require('../../../server/api'),
-    settingsCache = require('../../../server/services/settings/cache'),
+    config = require('../../server/config'),
+    api = require('../../server/api'),
+    settingsCache = require('../../server/services/settings/cache'),
     ghost = testUtils.startGhost,
     sandbox = sinon.sandbox.create();
 

core/test/functional/frontend_spec.js

@@ -8,10 +8,10 @@ var should = require('should'),
     moment = require('moment'),
     cheerio = require('cheerio'),
     _ = require('lodash'),
-    testUtils = require('../../utils'),
-    configUtils = require('../../utils/configUtils'),
-    config = require('../../../server/config'),
-    settingsCache = require('../../../server/services/settings/cache'),
+    testUtils = require('../utils'),
+    configUtils = require('../utils/configUtils'),
+    config = require('../../server/config'),
+    settingsCache = require('../../server/services/settings/cache'),
     origCache = _.cloneDeep(settingsCache),
     ghost = testUtils.startGhost,
     request,

core/test/integration/services/url/UrlService_spec.js

@@ -2,7 +2,7 @@ const _ = require('lodash');
 const should = require('should');
 const sinon = require('sinon');
 const rewire = require('rewire');
-const testUtils = require('../../../utils/index');
+const testUtils = require('../../../utils');
 const configUtils = require('../../../utils/configUtils');
 const models = require('../../../../server/models');
 const common = require('../../../../server/lib/common');

core/test/unit/services/settings/settings_spec.js

@@ -2,7 +2,7 @@ const sinon = require('sinon'),
     should = require('should'),
     rewire = require('rewire'),
     common = require('../../../../server/lib/common'),
-    settings = rewire('../../../../server/services/settings/index'),
+    settings = rewire('../../../../server/services/settings'),
     sandbox = sinon.sandbox.create();
 
 describe('UNIT > Settings Service:', function () {