Fixed bad setup call in settings integration test

- the setup() function returns a function that's expected to be called as a mocha hook
- wrapping this in a function means it doesn't get called properly
- therefore the db setup was never being called for this test

test/integration/settings/settings.test.js

@@ -11,9 +11,7 @@ const testUtils = require('../../utils');
  */
 
 describe('Settings', function () {
-    before(function () {
-        return testUtils.setup();
-    });
+    before(testUtils.setup());
 
     // Allowlist: Only this list needs updating when a core setting is added/removed/renamed
     const coreSettingKeys = [

test/utils/index.js

@@ -14,7 +14,6 @@ const e2eUtils = require('./e2e-utils');
 const APIUtils = require('./api');
 const dbUtils = require('./db-utils');
 const fixtureUtils = require('./fixture-utils');
-const oldIntegrationUtils = require('../regression/mock-express-style/utils/setup');
 const redirects = require('./redirects');
 const cacheRules = require('./fixtures/cache-rules');
 const context = require('./fixtures/context');
@@ -40,7 +39,6 @@ const initFixtures = function initFixtures() {
  * ## Setup Integration Tests
  * Setup takes a list of arguments like: 'default', 'tag', 'perms:tag', 'perms:init'
  * Setup does 'init' (DB) by default
- * @returns {Function}
  */
 const setup = function setup() {
     /*eslint no-invalid-this: "off"*/
@@ -49,12 +47,12 @@ const setup = function setup() {
     const args = arguments;
 
     return function innerSetup() {
-        debug('setup start');
+        debug('Setup start');
         models.init();
         return initFixtures
             .apply(self, args)
             .finally(() => {
-                debug('setup end');
+                debug('Setup end');
             });
     };
 };