Moved labs, auth, permissions, settings, mail, themes to services (#9339)

refs #9178

- move tests as well

core/server/api/authentication.js

@@ -2,7 +2,7 @@ var Promise = require('bluebird'),
     _ = require('lodash'),
     validator = require('validator'),
     pipeline = require('../lib/promise/pipeline'),
-    mail = require('./../mail'),
+    mail = require('../services/mail'),
     globalUtils = require('../utils'),
     urlService = require('../services/url'),
     localUtils = require('./utils'),

core/server/api/configuration.js

@@ -5,7 +5,7 @@ var Promise = require('bluebird'),
     urlService = require('../services/url'),
     models = require('../models'),
     config = require('../config'),
-    settingsCache = require('../settings/cache'),
+    settingsCache = require('../services/settings/cache'),
     ghostVersion = require('../utils/ghost-version'),
     configuration;
 

core/server/api/invites.js

@@ -1,7 +1,7 @@
 var Promise = require('bluebird'),
     _ = require('lodash'),
     pipeline = require('../lib/promise/pipeline'),
-    mail = require('./../mail'),
+    mail = require('../services/mail'),
     globalUtils = require('../utils'),
     urlService = require('../services/url'),
     localUtils = require('./utils'),

core/server/api/mail.js

@@ -6,7 +6,7 @@ var Promise = require('bluebird'),
     localUtils = require('./utils'),
     models = require('../models'),
     common = require('../lib/common'),
-    mail = require('../mail'),
+    mail = require('../services/mail'),
     notificationsAPI = require('./notifications'),
     docName = 'mail',
     mailer,

core/server/api/notifications.js

@@ -4,7 +4,7 @@ var Promise = require('bluebird'),
     _ = require('lodash'),
     ObjectId = require('bson-objectid'),
     pipeline = require('../lib/promise/pipeline'),
-    permissions = require('../permissions'),
+    permissions = require('../services/permissions'),
     canThis = permissions.canThis,
     localUtils = require('./utils'),
     common = require('../lib/common'),

core/server/api/roles.js

@@ -3,7 +3,7 @@
 var Promise = require('bluebird'),
     pipeline = require('../lib/promise/pipeline'),
     localUtils = require('./utils'),
-    canThis = require('../permissions').canThis,
+    canThis = require('../services/permissions').canThis,
     models = require('../models'),
     docName = 'roles',
 

core/server/api/settings.js

@@ -3,10 +3,10 @@
 var Promise = require('bluebird'),
     _ = require('lodash'),
     models = require('../models'),
-    canThis = require('../permissions').canThis,
+    canThis = require('../services/permissions').canThis,
     localUtils = require('./utils'),
     common = require('../lib/common'),
-    settingsCache = require('../settings/cache'),
+    settingsCache = require('../services/settings/cache'),
     docName = 'settings',
     settings,
     settingsFilter,

core/server/api/themes.js

@@ -6,8 +6,8 @@ var debug = require('ghost-ignition').debug('api:themes'),
     localUtils = require('./utils'),
     common = require('../lib/common'),
     settingsModel = require('../models/settings').Settings,
-    settingsCache = require('../settings/cache'),
-    themeUtils = require('../themes'),
+    settingsCache = require('../services/settings/cache'),
+    themeUtils = require('../services/themes'),
     themeList = themeUtils.list,
     themes;
 

core/server/api/users.js

@@ -4,7 +4,7 @@ var Promise = require('bluebird'),
     _ = require('lodash'),
     pipeline = require('../lib/promise/pipeline'),
     localUtils = require('./utils'),
-    canThis = require('../permissions').canThis,
+    canThis = require('../services/permissions').canThis,
     models = require('../models'),
     common = require('../lib/common'),
     docName = 'users',

core/server/api/utils.js

@@ -3,7 +3,7 @@
 var Promise = require('bluebird'),
     _ = require('lodash'),
     path = require('path'),
-    permissions = require('../permissions'),
+    permissions = require('../services/permissions'),
     validation = require('../data/validation'),
     common = require('../lib/common'),
     utils;

core/server/apps/amp/index.js

@@ -3,7 +3,7 @@ var router           = require('./lib/router'),
 
     // Dirty requires
     config = require('../../config'),
-    settingsCache = require('../../settings/cache');
+    settingsCache = require('../../services/settings/cache');
 
 module.exports = {
     activate: function activate(ghost) {

core/server/apps/private-blogging/lib/middleware.js

@@ -6,7 +6,7 @@ var fs = require('fs-extra'),
     urlService = require('../../../services/url'),
     globalUtils = require('../../../utils'),
     common = require('../../../lib/common'),
-    settingsCache = require('../../../settings/cache'),
+    settingsCache = require('../../../services/settings/cache'),
     privateRoute = '/' + config.get('routeKeywords').private + '/',
     privateBlogging;
 

core/server/apps/subscribers/index.js

@@ -3,7 +3,7 @@ var router     = require('./lib/router'),
 
     // Dirty requires
     config = require('../../config'),
-    labs = require('../../utils/labs');
+    labs = require('../../services/labs');
 
 module.exports = {
     activate: function activate(ghost) {

core/server/apps/subscribers/lib/helpers/index.js

@@ -1,5 +1,5 @@
 // Dirty requires!
-var labs = require('../../../../utils/labs');
+var labs = require('../../../../services/labs');
 
 module.exports = function registerHelpers(ghost) {
     ghost.helpers.register('input_email', require('./input_email'));

core/server/controllers/frontend/context.js

@@ -12,7 +12,7 @@
  */
 
 var config = require('../../config'),
-    labs = require('../../utils/labs'),
+    labs = require('../../services/labs'),
 
     // Context patterns, should eventually come from Channel configuration
     privatePattern = new RegExp('^\\/' + config.get('routeKeywords').private + '\\/'),

core/server/controllers/frontend/fetch-data.js

@@ -5,7 +5,7 @@
 var api = require('../../api'),
     _   = require('lodash'),
     Promise = require('bluebird'),
-    themes = require('../../themes'),
+    themes = require('../../services/themes'),
     queryDefaults,
     defaultPostQuery = {};
 

core/server/controllers/frontend/post-lookup.js

@@ -3,7 +3,7 @@ var _          = require('lodash'),
     url        = require('url'),
     routeMatch = require('path-match')(),
     api        = require('../../api'),
-    settingsCache = require('../../settings/cache'),
+    settingsCache = require('../../services/settings/cache'),
     optionsFormat = '/:options?';
 
 function getOptionsFormat(linkStructure) {

core/server/controllers/frontend/templates.js

@@ -6,7 +6,7 @@
 var _ = require('lodash'),
     path = require('path'),
     config = require('../../config'),
-    themes = require('../../themes'),
+    themes = require('../../services/themes'),
     _private = {};
 
 /**

core/server/controllers/rss.js

@@ -2,7 +2,7 @@ var _ = require('lodash'),
     url = require('url'),
     common = require('../lib/common'),
     safeString = require('../utils').safeString,
-    settingsCache = require('../settings/cache'),
+    settingsCache = require('../services/settings/cache'),
 
     // Slightly less ugly temporary hack for location of things
     fetchData = require('./frontend/fetch-data'),

core/server/data/meta/blog_logo.js

@@ -1,5 +1,5 @@
 var urlService = require('../../services/url'),
-    settingsCache = require('../../settings/cache'),
+    settingsCache = require('../../services/settings/cache'),
     blogIconUtils = require('../../utils/blog-icon');
 
 function getBlogLogo() {

core/server/data/meta/context_object.js

@@ -1,4 +1,4 @@
-var settingsCache = require('../../settings/cache'),
+var settingsCache = require('../../services/settings/cache'),
     _ = require('lodash');
 
 function getContextObject(data, context) {

core/server/data/meta/description.js

@@ -1,5 +1,5 @@
 var _ = require('lodash'),
-    settingsCache = require('../../settings/cache');
+    settingsCache = require('../../services/settings/cache');
 
 function getDescription(data, root, options) {
     var description = '',

core/server/data/meta/index.js

@@ -1,5 +1,5 @@
 var Promise = require('bluebird'),
-    settingsCache = require('../../settings/cache'),
+    settingsCache = require('../../services/settings/cache'),
     urlService = require('../../services/url'),
     common = require('../../lib/common'),
     getUrl = require('./url'),

core/server/data/meta/schema.js

@@ -1,5 +1,5 @@
 var config = require('../../config'),
-    escapeExpression = require('../../themes/engine').escapeExpression,
+    escapeExpression = require('../../services/themes/engine').escapeExpression,
     socialUrls = require('../../utils/social-urls'),
     _ = require('lodash');
 

core/server/data/meta/title.js

@@ -1,5 +1,5 @@
 var _ = require('lodash'),
-    settingsCache = require('../../settings/cache');
+    settingsCache = require('../../services/settings/cache');
 
 function getTitle(data, root, options) {
     var title = '',

core/server/data/migrations/versions/1.13/2-theme-permissions.js

@@ -1,6 +1,6 @@
 var _ = require('lodash'),
     utils = require('../../../schema/fixtures/utils'),
-    permissions = require('../../../../permissions'),
+    permissions = require('../../../../services/permissions'),
     common = require('../../../../lib/common'),
     resource = 'theme',
     _private = {};

core/server/data/migrations/versions/1.19/1-webhook-permissions.js

@@ -1,6 +1,6 @@
 var _ = require('lodash'),
     utils = require('../../../schema/fixtures/utils'),
-    permissions = require('../../../../permissions'),
+    permissions = require('../../../../services/permissions'),
     logging = require('../../../../lib/common/logging'),
     resource = 'webhook',
     _private = {};

core/server/data/migrations/versions/1.9/1-add-permissions-redirect.js

@@ -1,6 +1,6 @@
 var _ = require('lodash'),
     utils = require('../../../schema/fixtures/utils'),
-    permissions = require('../../../../permissions'),
+    permissions = require('../../../../services/permissions'),
     common = require('../../../../lib/common'),
     resource = 'redirect',
     _private = {};

core/server/data/validation/index.js

@@ -5,7 +5,7 @@ var schema = require('../schema').tables,
     assert = require('assert'),
     Promise = require('bluebird'),
     common = require('../../lib/common'),
-    settingsCache = require('../../settings/cache'),
+    settingsCache = require('../../services/settings/cache'),
     urlService = require('../../services/url'),
 
     validatePassword,

core/server/helpers/proxy.js

@@ -1,8 +1,8 @@
 // This file defines everything that helpers "require"
 // With the exception of modules like lodash, Bluebird
 // We can later refactor to enforce this something like we do in apps
-var hbs = require('../themes/engine'),
-    settingsCache = require('../settings/cache'),
+var hbs = require('../services/themes/engine'),
+    settingsCache = require('../services/settings/cache'),
     config = require('../config');
 
 // Direct requires:
@@ -42,7 +42,7 @@ module.exports = {
     },
 
     // Labs utils for enabling/disabling helpers
-    labs: require('../utils/labs'),
+    labs: require('../services/labs'),
 
     // System for apps to hook into one day maybe
     filters: require('../filters'),

core/server/helpers/register.js

@@ -1,4 +1,4 @@
-var hbs = require('../themes/engine'),
+var hbs = require('../services/themes/engine'),
     Promise = require('bluebird'),
     config = require('../config'),
     proxy = require('./proxy');

core/server/helpers/template.js

@@ -1,7 +1,7 @@
 var templates = {},
     _ = require('lodash'),
     proxy = require('./proxy'),
-    hbs = require('../themes/engine');
+    hbs = require('../services/themes/engine');
 
 // ## Template utils
 

core/server/index.js

@@ -18,13 +18,13 @@ var debug = require('ghost-ignition').debug('boot:init'),
     Promise = require('bluebird'),
     common = require('./lib/common'),
     models = require('./models'),
-    permissions = require('./permissions'),
-    auth = require('./auth'),
+    permissions = require('./services/permissions'),
+    auth = require('./services/auth'),
     dbHealth = require('./data/db/health'),
     GhostServer = require('./ghost-server'),
     scheduling = require('./adapters/scheduling'),
-    settings = require('./settings'),
-    themes = require('./themes'),
+    settings = require('./services/settings'),
+    themes = require('./services/themes'),
     urlService = require('./services/url'),
 
     // Services that need initialisation

core/server/lib/common/logging.js

@@ -1,4 +1,4 @@
-var config = require('../../config/index'),
+var config = require('../../config'),
     logging = require('ghost-ignition').logging;
 
 module.exports = logging({

core/server/services/apps/index.js

@@ -4,7 +4,7 @@ var debug = require('ghost-ignition').debug('services:apps'),
     api = require('../../api'),
     common = require('../../lib/common'),
     config = require('../../config'),
-    settingsCache = require('../../settings/cache'),
+    settingsCache = require('../settings/cache'),
     loader = require('./loader'),
     // Internal APps are in config
     internalApps = config.get('apps:internal'),

core/server/services/auth/auth-strategies.js

@@ -1,7 +1,7 @@
 var _ = require('lodash'),
-    models = require('../models'),
-    globalUtils = require('../utils'),
-    common = require('../lib/common'),
+    models = require('../../models'),
+    globalUtils = require('../../utils'),
+    common = require('../../lib/common'),
     strategies;
 
 strategies = {

core/server/services/auth/authenticate.js

@@ -1,7 +1,7 @@
 var passport = require('passport'),
     authUtils = require('./utils'),
-    models = require('../models'),
-    common = require('../lib/common'),
+    models = require('../../models'),
+    common = require('../../lib/common'),
     authenticate;
 
 authenticate = {

core/server/services/auth/authorize.js

@@ -1,5 +1,5 @@
-var labs = require('../utils/labs'),
-    common = require('../lib/common'),
+var labs = require('../labs'),
+    common = require('../../lib/common'),
     authorize;
 
 authorize = {

core/server/services/auth/oauth.js

@@ -1,11 +1,11 @@
 var oauth2orize = require('oauth2orize'),
     _ = require('lodash'),
     passport = require('passport'),
-    models = require('../models'),
+    models = require('../../models'),
     authUtils = require('./utils'),
-    spamPrevention = require('../web/middleware/api/spam-prevention'),
-    common = require('../lib/common'),
-    knex = require('../data/db').knex,
+    spamPrevention = require('../../web/middleware/api/spam-prevention'),
+    common = require('../../lib/common'),
+    knex = require('../../data/db').knex,
     oauthServer,
     oauth;
 

core/server/services/auth/utils.js

@@ -1,9 +1,9 @@
 var Promise = require('bluebird'),
     _ = require('lodash'),
     debug = require('ghost-ignition').debug('auth:utils'),
-    models = require('../models'),
-    globalUtils = require('../utils'),
-    knex = require('../data/db').knex,
+    models = require('../../models'),
+    globalUtils = require('../../utils'),
+    knex = require('../../data/db').knex,
     _private = {};
 
 /**

core/server/services/labs.js

@@ -1,7 +1,7 @@
-var settingsCache = require('../settings/cache'),
+var settingsCache = require('./settings/cache'),
     _ = require('lodash'),
     Promise = require('bluebird'),
-    SafeString = require('../themes/engine').SafeString,
+    SafeString = require('./themes/engine').SafeString,
     common = require('../lib/common'),
     labs = module.exports = {};
 

core/server/services/mail/GhostMailer.js

@@ -3,10 +3,10 @@
 var _ = require('lodash'),
     Promise = require('bluebird'),
     validator = require('validator'),
-    config = require('../config'),
-    common = require('../lib/common'),
+    config = require('../../config'),
+    common = require('../../lib/common'),
     settingsCache = require('../settings/cache'),
-    urlService = require('../services/url');
+    urlService = require('../url');
 
 function GhostMailer() {
     var nodemailer = require('nodemailer'),

core/server/services/mail/utils.js

@@ -2,7 +2,7 @@ var _ = require('lodash').runInContext(),
     fs = require('fs-extra'),
     path = require('path'),
     htmlToText = require('html-to-text'),
-    urlService = require('../services/url'),
+    urlService = require('../url'),
     templatesDir = path.resolve(__dirname, '..', 'mail', 'templates');
 
 _.templateSettings.interpolate = /{{([\s\S]+?)}}/g;

core/server/services/permissions/can-this.js

@@ -1,7 +1,7 @@
 var _ = require('lodash'),
     Promise = require('bluebird'),
-    models = require('../models'),
-    common = require('../lib/common'),
+    models = require('../../models'),
+    common = require('../../lib/common'),
     providers = require('./providers'),
     parseContext = require('./parse-context'),
     actionsMap = require('./actions-map-cache'),

core/server/services/permissions/index.js

@@ -1,7 +1,7 @@
 // canThis(someUser).edit.posts([id]|[[ids]])
 // canThis(someUser).edit.post(somePost|somePostId)
 
-var models = require('../models'),
+var models = require('../../models'),
     actionsMap = require('./actions-map-cache'),
     init;
 

core/server/services/permissions/providers.js

@@ -1,7 +1,7 @@
 var _ = require('lodash'),
     Promise = require('bluebird'),
-    models = require('../models'),
-    common = require('../lib/common');
+    models = require('../../models'),
+    common = require('../../lib/common');
 
 module.exports = {
     user: function (id) {

core/server/services/permissions/public.js

@@ -1,6 +1,6 @@
 var _ = require('lodash'),
     Promise = require('bluebird'),
-    common = require('../lib/common'),
+    common = require('../../lib/common'),
     parseContext = require('./parse-context'),
     _private = {};
 

core/server/services/settings/cache.js

@@ -3,7 +3,7 @@
 // circular dependency bugs.
 var debug = require('ghost-ignition').debug('settings:cache'),
     _ = require('lodash'),
-    common = require('../lib/common'),
+    common = require('../../lib/common'),
     /**
      * ## Cache
      * Holds cached settings

core/server/services/settings/index.js

@@ -3,7 +3,7 @@
  * A collection of utilities for handling settings including a cache
  */
 
-var SettingsModel = require('../models/settings').Settings,
+var SettingsModel = require('../../models/settings').Settings,
     SettingsCache = require('./cache');
 
 module.exports = {

core/server/services/slack.js

@@ -3,7 +3,7 @@ var https = require('https'),
     common = require('../lib/common'),
     urlService = require('../services/url'),
     blogIconUtils = require('../utils/blog-icon'),
-    settingsCache = require('../settings/cache'),
+    settingsCache = require('./settings/cache'),
     schema = require('../data/schema').checks,
     defaultPostSlugs = [
         'welcome',

core/server/services/themes/Storage.js

@@ -4,9 +4,9 @@ var fs = require('fs-extra'),
     os = require('os'),
     path = require('path'),
     Promise = require('bluebird'),
-    config = require('../config'),
-    globalUtils = require('../utils'),
-    LocalFileStorage = require('../adapters/storage/LocalFileStorage');
+    config = require('../../config'),
+    globalUtils = require('../../utils'),
+    LocalFileStorage = require('../../adapters/storage/LocalFileStorage');
 
 /**
  * @TODO: combine with loader.js?

core/server/services/themes/active.js

@@ -18,7 +18,7 @@
  */
 var join = require('path').join,
     themeConfig = require('./config'),
-    config = require('../config'),
+    config = require('../../config'),
     engine = require('./engine'),
     // Current instance of ActiveTheme
     currentActiveTheme;

core/server/services/themes/engine.js

@@ -1,5 +1,5 @@
 var hbs = require('express-hbs'),
-    config = require('../config'),
+    config = require('../../config'),
     instance = hbs.create();
 
 // @TODO think about a config option for this e.g. theme.devmode?

core/server/services/themes/index.js

@@ -1,5 +1,5 @@
 var debug = require('ghost-ignition').debug('themes'),
-    common = require('../lib/common'),
+    common = require('../../lib/common'),
     themeLoader = require('./loader'),
     active = require('./active'),
     validate = require('./validate'),

core/server/services/themes/loader.js

@@ -1,7 +1,7 @@
 var debug = require('ghost-ignition').debug('themes:loader'),
-    config = require('../config'),
+    config = require('../../config'),
     themeList = require('./list'),
-    read = require('../utils/packages').read,
+    read = require('../../utils/packages').read,
     loadAllThemes,
     loadOneTheme;
 

core/server/services/themes/middleware.js

@@ -1,8 +1,8 @@
 var _ = require('lodash'),
     hbs = require('./engine'),
-    urlService = require('../services/url'),
-    config = require('../config'),
-    common = require('../lib/common'),
+    urlService = require('../url'),
+    config = require('../../config'),
+    common = require('../../lib/common'),
     settingsCache = require('../settings/cache'),
     activeTheme = require('./active'),
     themeMiddleware = {};

core/server/services/themes/to-json.js

@@ -1,7 +1,7 @@
 var _ = require('lodash'),
     themeList = require('./list'),
     active = require('./active'),
-    packages = require('../utils/packages'),
+    packages = require('../../utils/packages'),
     settingsCache = require('../settings/cache');
 
 /**

core/server/services/themes/validate.js

@@ -1,6 +1,6 @@
 var Promise = require('bluebird'),
-    config = require('../config'),
-    common = require('../lib/common'),
+    config = require('../../config'),
+    common = require('../../lib/common'),
     checkTheme;
 
 checkTheme = function checkTheme(theme, isZip) {

core/server/services/url/utils.js

@@ -4,8 +4,8 @@
 var moment = require('moment-timezone'),
     _ = require('lodash'),
     url = require('url'),
-    config = require('../../config/index'),
-    settingsCache = require('../../settings/cache'),
+    config = require('../../config'),
+    settingsCache = require('../settings/cache'),
     // @TODO: unify this with the path in server/app.js
     API_PATH = '/ghost/api/v0.1/',
     STATIC_IMAGE_URL_PREFIX = 'content/images';

core/server/services/xmlrpc.js

@@ -4,7 +4,7 @@ var _ = require('lodash'),
     config = require('../config'),
     urlService = require('../services/url'),
     common = require('../lib/common'),
-    settingsCache = require('../settings/cache'),
+    settingsCache = require('./settings/cache'),
 
     defaultPostSlugs = [
         'welcome',

core/server/utils/blog-icon.js

@@ -3,7 +3,7 @@ var sizeOf = require('image-size'),
     _ = require('lodash'),
     path = require('path'),
     common = require('../lib/common'),
-    settingsCache = require('../settings/cache'),
+    settingsCache = require('../services/settings/cache'),
     config = require('../config'),
     urlService = require('../services/url'),
     storageUtils = require('../adapters/storage/utils'),

core/server/web/api/middleware.js

@@ -1,7 +1,7 @@
 var prettyURLs = require('../middleware/pretty-urls'),
     cors = require('../middleware/api/cors'),
     urlRedirects = require('../middleware/url-redirects'),
-    auth = require('../../auth');
+    auth = require('../../services/auth');
 
 /**
  * Auth Middleware Packages

core/server/web/api/routes.js

@@ -6,7 +6,7 @@ var express = require('express'),
     mw = require('./middleware'),
 
     // API specific
-    auth = require('../../auth'),
+    auth = require('../../services/auth'),
     cors = require('../middleware/api/cors'),
     brute = require('../middleware/brute'),
 

core/server/web/middleware/frontend-client.js

@@ -1,5 +1,5 @@
 var api = require('../../api'),
-    labs = require('../../utils/labs'),
+    labs = require('../../services/labs'),
     common = require('../../lib/common');
 
 module.exports = function getFrontendClient(req, res, next) {

core/server/web/middleware/labs.js

@@ -1,4 +1,4 @@
-var labsUtil = require('../../utils/labs'),
+var labsUtil = require('../../services/labs'),
     common = require('../../lib/common'),
     labs;
 

core/server/web/middleware/serve-favicon.js

@@ -4,7 +4,7 @@ var fs = require('fs-extra'),
     storage = require('../../adapters/storage'),
     urlService = require('../../services/url'),
     config = require('../../config'),
-    settingsCache = require('../../settings/cache'),
+    settingsCache = require('../../services/settings/cache'),
     blogIconUtils = require('../../utils/blog-icon'),
     buildContentResponse,
     content;

core/server/web/middleware/static-theme.js

@@ -2,7 +2,7 @@ var _       = require('lodash'),
     express = require('express'),
     path    = require('path'),
     config  = require('../../config'),
-    themeUtils = require('../../themes'),
+    themeUtils = require('../../services/themes'),
     utils   = require('../../utils');
 
 function isBlackListedFileType(file) {

core/server/web/site/app.js

@@ -30,7 +30,7 @@ var debug = require('ghost-ignition').debug('blog'),
     adminRedirects = require('../middleware/admin-redirects'),
 
     // middleware for themes
-    themeMiddleware = require('../../themes').middleware;
+    themeMiddleware = require('../../services/themes').middleware;
 
 module.exports = function setupSiteApp() {
     debug('Site setup start');

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

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

core/test/functional/routes/channel_spec.js

@@ -8,7 +8,7 @@ var should = require('should'),
     testUtils = require('../../utils'),
     cheerio = require('cheerio'),
     config = require('../../../../core/server/config'),
-    settingsCache = require('../../../../core/server/settings/cache'),
+    settingsCache = require('../../../server/services/settings/cache'),
     ghost = testUtils.startGhost,
     sandbox = sinon.sandbox.create(),
     request;

core/test/functional/routes/frontend_spec.js

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

core/test/integration/api/api_posts_spec.js

@@ -9,7 +9,7 @@ var should = require('should'),
     db = require('../../../server/data/db'),
     models = require('../../../server/models'),
     PostAPI = require('../../../server/api/posts'),
-    settingsCache = require('../../../server/settings/cache'),
+    settingsCache = require('../../../server/services/settings/cache'),
 
     sandbox = sinon.sandbox.create();
 

core/test/integration/api/api_settings_spec.js

@@ -4,7 +4,7 @@ var should = require('should'),
 
     // Stuff we are testing
     SettingsAPI = require('../../../server/api/settings'),
-    settingsCache = require('../../../server/settings/cache'),
+    settingsCache = require('../../../server/services/settings/cache'),
     defaultContext = {user: 1},
     internalContext = {internal: true},
     callApiWithContext,

core/test/integration/model/model_posts_spec.js

@@ -5,7 +5,7 @@ var should = require('should'),
     _ = require('lodash'),
     Promise = require('bluebird'),
     sequence = require('../../../server/lib/promise/sequence'),
-    settingsCache = require('../../../server/settings/cache'),
+    settingsCache = require('../../../server/services/settings/cache'),
     ghostBookshelf = require('../../../server/models/base'),
     PostModel = require('../../../server/models/post').Post,
     TagModel = require('../../../server/models/tag').Tag,

core/test/integration/update_check_spec.js

@@ -6,7 +6,7 @@ var should = require('should'),
     configUtils = require('../utils/configUtils'),
     packageInfo = require('../../../package'),
     updateCheck = rewire('../../server/update-check'),
-    settingsCache = require('../../server/settings/cache'),
+    settingsCache = require('../../server/services/settings/cache'),
     NotificationsAPI = require('../../server/api/notifications');
 
 describe('Update Check', function () {

core/test/unit/api/utils_spec.js

@@ -3,7 +3,7 @@ var should = require('should'),
     _ = require('lodash'),
     Promise = require('bluebird'),
     ObjectId = require('bson-objectid'),
-    permissions = require('../../../server/permissions'),
+    permissions = require('../../../server/services/permissions'),
     common = require('../../../server/lib/common'),
     apiUtils = require('../../../server/api/utils'),
 

core/test/unit/apps/amp/router_spec.js

@@ -7,7 +7,7 @@ var should = require('should'),
     ampController = rewire('../../../../server/apps/amp/lib/router'),
     common = require('../../../../server/lib/common'),
     configUtils = require('../../../utils/configUtils'),
-    themes = require('../../../../server/themes'),
+    themes = require('../../../../server/services/themes'),
 
     sandbox = sinon.sandbox.create();
 

core/test/unit/apps/private-blogging/controller_spec.js

@@ -3,7 +3,7 @@ var should = require('should'),
     sinon = require('sinon'),
     path = require('path'),
     configUtils = require('../../../utils/configUtils'),
-    themes = require('../../../../server/themes'),
+    themes = require('../../../../server/services/themes'),
     privateController = require('../../../../server/apps/private-blogging/lib/router'),
 
     sandbox = sinon.sandbox.create();

core/test/unit/apps/private-blogging/middleware_spec.js

@@ -4,7 +4,7 @@ var should = require('should'), // jshint ignore:line
     crypto = require('crypto'),
     fs = require('fs-extra'),
     common = require('../../../../server/lib/common'),
-    settingsCache = require('../../../../server/settings/cache'),
+    settingsCache = require('../../../../server/services/settings/cache'),
     privateBlogging = require('../../../../server/apps/private-blogging/lib/middleware'),
     sandbox = sinon.sandbox.create();
 

core/test/unit/controllers/entry_spec.js

@@ -11,8 +11,8 @@ var should = require('should'),
     // Server requires
     api = require('../../../server/api'),
     controllers = require('../../../server/controllers'),
-    themes = require('../../../server/themes'),
-    settingsCache = require('../../../server/settings/cache'),
+    themes = require('../../../server/services/themes'),
+    settingsCache = require('../../../server/services/settings/cache'),
 
     sandbox = sinon.sandbox.create();
 

core/test/unit/controllers/frontend/context_spec.js

@@ -5,7 +5,7 @@ var should = require('should'),
     // Stuff we are testing
     channelUtils = require('../../../utils/channelUtils'),
     setResponseContext = require('../../../../server/controllers/frontend/context'),
-    labs = require('../../../../server/utils/labs'),
+    labs = require('../../../../server/services/labs'),
 
     sandbox = sinon.sandbox.create();
 

core/test/unit/controllers/frontend/fetch-data_spec.js

@@ -3,7 +3,7 @@ var should = require('should'),
     Promise = require('bluebird'),
     // Stuff we are testing
     api = require('../../../../server/api'),
-    themes = require('../../../../server/themes'),
+    themes = require('../../../../server/services/themes'),
     fetchData = require('../../../../server/controllers/frontend/fetch-data'),
     configUtils = require('../../../utils/configUtils'),
     sandbox = sinon.sandbox.create();

core/test/unit/controllers/frontend/post-lookup_spec.js

@@ -4,7 +4,7 @@ var should = require('should'),
     configUtils = require('../../../utils/configUtils'),
     api = require('../../../../server/api'),
     postLookup = require('../../../../server/controllers/frontend/post-lookup'),
-    settingsCache = require('../../../../server/settings/cache'),
+    settingsCache = require('../../../../server/services/settings/cache'),
     sandbox = sinon.sandbox.create();
 
 describe('postLookup', function () {