Merge pull request #6946 from kirrg001/improvement/jshint

improvement: jshint globals/mocha

.jshintrc

@@ -1,23 +1,26 @@
 {
-      "node": true,
-      "browser": false,
-      "strict": false,
-      "sub": true,
-      "eqeqeq": true,
-      "laxbreak": true,
-      "bitwise": true,
-      "curly": true,
-      "forin": true,
-      "immed": true,
-      "latedef": true,
-      "newcap": true,
-      "noarg": true,
-      "noempty": true,
-      "nonew": true,
-      "plusplus": true,
-      "regexp": true,
-      "undef": true,
-      "unused": true,
-      "indent": 4,
-      "predef": [ "-Promise" ]
+    "node": true,
+    "browser": false,
+    "strict": false,
+    "sub": true,
+    "eqeqeq": true,
+    "laxbreak": true,
+    "bitwise": true,
+    "curly": true,
+    "forin": true,
+    "immed": true,
+    "latedef": true,
+    "newcap": true,
+    "noarg": true,
+    "noempty": true,
+    "nonew": true,
+    "plusplus": true,
+    "regexp": true,
+    "undef": true,
+    "unused": true,
+    "mocha": true,
+    "indent": 4,
+    "predef": [
+        "-Promise"
+    ]
 }

Gruntfile.js

@@ -95,7 +95,7 @@ var _              = require('lodash'),
             // more information.
             jshint: {
                 options: {
-                    jshintrc: true
+                    jshintrc: '.jshintrc'
                 },
 
                 server: [

core/test/functional/module/module_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it */
 // # Module tests
 // This tests using Ghost as an npm module
 var should     = require('should'),

core/test/functional/routes/admin_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 
 // # Frontend Route tests
 // As it stands, these tests depend on the database, and as such are integration tests.

core/test/functional/routes/api/authentication_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 var supertest     = require('supertest'),
     should        = require('should'),
     testUtils     = require('../../../utils'),

core/test/functional/routes/api/db_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 var supertest     = require('supertest'),
     should        = require('should'),
     testUtils     = require('../../../utils'),

core/test/functional/routes/api/error_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 // # Api Route tests
 // As it stands, these tests depend on the database, and as such are integration tests.
 // Mocking out the models to not touch the DB would turn these into unit tests, and should probably be done in future,

core/test/functional/routes/api/notifications_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 var testUtils     = require('../../../utils'),
     supertest     = require('supertest'),
     should        = require('should'),

core/test/functional/routes/api/posts_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 var testUtils     = require('../../../utils'),
     should        = require('should'),
     supertest     = require('supertest'),

core/test/functional/routes/api/public_api_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 var testUtils     = require('../../../utils'),
     should        = require('should'),
     supertest     = require('supertest'),

core/test/functional/routes/api/settings_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 var testUtils     = require('../../../utils'),
     should        = require('should'),
     supertest     = require('supertest'),

core/test/functional/routes/api/slugs_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 var testUtils     = require('../../../utils'),
     should        = require('should'),
     supertest     = require('supertest'),

core/test/functional/routes/api/tags_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 var testUtils     = require('../../../utils'),
     should        = require('should'),
     supertest     = require('supertest'),

core/test/functional/routes/api/users_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 var testUtils     = require('../../../utils'),
     should        = require('should'),
     supertest     = require('supertest'),

core/test/functional/routes/channel_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 
 // # Channel Route Tests
 // As it stands, these tests depend on the database, and as such are integration tests.

core/test/functional/routes/frontend_spec.js

@@ -1,4 +1,3 @@
-/*global describe, it, before, after */
 
 // # Frontend Route tests
 // As it stands, these tests depend on the database, and as such are integration tests.

core/test/integration/api/advanced_browse_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, after, it */
 var testUtils = require('../../utils'),
     should    = require('should'),
     _         = require('lodash'),

core/test/integration/api/api_authentication_spec.js

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

core/test/integration/api/api_configuration_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, afterEach, it */
 var testUtils         = require('../../utils'),
     should            = require('should'),
     rewire            = require('rewire'),

core/test/integration/api/api_db_spec.js

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

core/test/integration/api/api_mail_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it */
 var testUtils       = require('../../utils'),
     should          = require('should'),
     config          = require('../../../server/config'),

core/test/integration/api/api_notifications_spec.js

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

core/test/integration/api/api_posts_spec.js

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

core/test/integration/api/api_roles_spec.js

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

core/test/integration/api/api_schedules_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, after, before, beforeEach, afterEach */
 
 var should = require('should'),
     moment = require('moment'),

core/test/integration/api/api_settings_spec.js

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

core/test/integration/api/api_slugs_spec.js

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

core/test/integration/api/api_subscription_spec.js

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

core/test/integration/api/api_tags_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it */
 var testUtils   = require('../../utils'),
     should      = require('should'),
     Promise     = require('bluebird'),

core/test/integration/api/api_themes_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it */
 var _             = require('lodash'),
     testUtils     = require('../../utils'),
     rewire        = require('rewire'),

core/test/integration/api/api_upload_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, afterEach, it*/
 var tmp         = require('tmp'),
     should      = require('should'),
     Promise     = require('bluebird'),

core/test/integration/api/api_users_spec.js

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

core/test/integration/export_spec.js

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

core/test/integration/import_spec.js

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

core/test/integration/migration_spec.js

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

core/test/integration/model/base/listeners_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it*/
 
 /*jshint unused:false*/
 var should = require('should'),

core/test/integration/model/model_accesstoken_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, before, beforeEach, afterEach */
 var testUtils   = require('../../utils'),
     should      = require('should'),
     events      = require('../../../server/events'),

core/test/integration/model/model_app-fields_spec.js

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

core/test/integration/model/model_app-settings_spec.js

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

core/test/integration/model/model_apps_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it*/
 var testUtils    = require('../../utils'),
     should       = require('should'),
     sequence     = require('../../../server/utils/sequence'),

core/test/integration/model/model_permissions_spec.js

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

core/test/integration/model/model_posts_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it */
 var testUtils       = require('../../utils'),
     should          = require('should'),
     moment          = require('moment'),

core/test/integration/model/model_roles_spec.js

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

core/test/integration/model/model_settings_spec.js

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

core/test/integration/model/model_tags_spec.js

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

core/test/integration/model/model_users_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it*/
 var testUtils   = require('../../utils'),
     should      = require('should'),
     Promise     = require('bluebird'),

core/test/integration/update_check_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, after, it*/
 var testUtils   = require('../utils'),
     should      = require('should'),
     rewire      = require('rewire'),

core/test/unit/api/index_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it */
 var should = require('should'),
     rewire = require('rewire'),
     config = rewire('../../../server/config'),

core/test/unit/api_utils_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, afterEach */
 var should  = require('should'),
     sinon   = require('sinon'),
     _       = require('lodash'),

core/test/unit/apps_filters_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var should  = require('should'),
     sinon   = require('sinon'),
     Promise = require('bluebird'),

core/test/unit/apps_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var path         = require('path'),
     EventEmitter = require('events').EventEmitter,
     should       = require('should'),

core/test/unit/config_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, before, beforeEach, afterEach */
 var should         = require('should'),
     sinon          = require('sinon'),
     Promise        = require('bluebird'),

core/test/unit/controllers/frontend/channel-config_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 /*jshint expr:true*/
 var should   = require('should'),
     channelConfig = require('../../../../server/controllers/frontend/channel-config').get;

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

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it*/
 var should   = require('should'),
     sinon    = require('sinon'),
     Promise  = require('bluebird'),

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

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, it*/
 var should   = require('should'),
     _        = require('lodash'),
 

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

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var should   = require('should'),
     sinon    = require('sinon'),
     errors   = require('../../../../server/errors'),

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

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var should   = require('should'),
     sinon    = require('sinon'),
     Promise  = require('bluebird'),

core/test/unit/controllers/frontend/format-response_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var should   = require('should'),
 
     // Stuff we are testing

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

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var moment   = require('moment'),
     should   = require('should'),
     sinon    = require('sinon'),

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

@@ -1,4 +1,3 @@
-/*globals describe, it, beforeEach, afterEach */
 var should         = require('should'),
     sinon          = require('sinon'),
     Promise        = require('bluebird'),

core/test/unit/controllers/frontend/render-channel_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, beforeEach, afterEach*/
 /*jshint expr:true*/
 var should  = require('should'),
     rewire  = require('rewire'),

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

@@ -1,4 +1,3 @@
-/*globals describe, it, afterEach, beforeEach*/
 var should   = require('should'),
     rewire   = require('rewire'),
 

core/test/unit/error_handling_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, after, before, beforeEach, afterEach, it*/
 var should     = require('should'),
     Promise    = require('bluebird'),
     sinon      = require('sinon'),

core/test/unit/exporter_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, afterEach, beforeEach, it*/
 var should    = require('should'),
     sinon     = require('sinon'),
     Promise   = require('bluebird'),

core/test/unit/filters_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var should  = require('should'),
     sinon   = require('sinon'),
     Promise = require('bluebird'),

core/test/unit/importer_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, afterEach, it*/
 var should    = require('should'),
     sinon     = require('sinon'),
     Promise   = require('bluebird'),

core/test/unit/mail_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, afterEach, beforeEach, it*/
 var should          = require('should'),
     Promise         = require('bluebird'),
 

core/test/unit/metadata/asset_url_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getAssetUrl = require('../../../server/data/meta/asset_url'),
     config = require('../../../server/config');
 

core/test/unit/metadata/author_fb_url_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getAuthorFacebookUrl = require('../../../server/data/meta/author_fb_url'),
     should = require('should');
 

core/test/unit/metadata/author_image_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getAuthorImage = require('../../../server/data/meta/author_image'),
     should = require('should'),
     config = require('../../../server/config');

core/test/unit/metadata/author_url_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getAuthorUrl = require('../../../server/data/meta/author_url'),
     should = require('should');
 

core/test/unit/metadata/canonical_url_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getCanonicalUrl = require('../../../server/data/meta/canonical_url');
 
 describe('getCanonicalUrl', function () {

core/test/unit/metadata/context_object_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, before, after */
 var should          = require('should'),
     getContextObject = require('../../../server/data/meta/context_object.js'),
     configUtils     = require('../../utils/configUtils');

core/test/unit/metadata/cover_image_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getCoverImage = require('../../../server/data/meta/cover_image'),
     should = require('should');
 

core/test/unit/metadata/creator_url_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getCreatorTwitterUrl = require('../../../server/data/meta/creator_url'),
     should = require('should');
 

core/test/unit/metadata/description_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getMetaDescription = require('../../../server/data/meta/description');
 
 describe('getMetaDescription', function () {

core/test/unit/metadata/excerpt_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getExcerpt = require('../../../server/data/meta/excerpt');
 
 describe('getExcerpt', function () {

core/test/unit/metadata/keywords_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getKeywords = require('../../../server/data/meta/keywords'),
     should = require('should');
 

core/test/unit/metadata/modified_date_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getModifiedDate = require('../../../server/data/meta/modified_date'),
     should = require('should');
 

core/test/unit/metadata/og_type_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getOgType = require('../../../server/data/meta/og_type'),
     should = require('should');
 

core/test/unit/metadata/paginated_url_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, before, beforeEach, after */
 var should          = require('should'),
     getPaginatedUrl = require('../../../server/data/meta/paginated_url'),
     configUtils     = require('../../utils/configUtils');

core/test/unit/metadata/published_date_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getPublishedDate = require('../../../server/data/meta/published_date'),
     should = require('should');
 

core/test/unit/metadata/rss_url_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getRssUrl = require('../../../server/data/meta/rss_url'),
     should = require('should');
 

core/test/unit/metadata/schema_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getSchema = require('../../../server/data/meta/schema'),
     should = require('should');
 

core/test/unit/metadata/structured_data_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getStructuredData = require('../../../server/data/meta/structured_data'),
     should = require('should');
 

core/test/unit/metadata/title_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getTitle = require('../../../server/data/meta/title'),
     config = require('../../../server/config');
 

core/test/unit/metadata/url_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it*/
 var getUrl = require('../../../server/data/meta/url');
 
 describe('getUrl', function () {

core/test/unit/middleware/api/version-match_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var should  = require('should'),
     sinon   = require('sinon'),
 

core/test/unit/middleware/auth-strategies_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it*/
 var should           = require('should'),
     sinon            = require('sinon'),
     Promise          = require('bluebird'),

core/test/unit/middleware/authentication_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, beforeEach, afterEach */
 var sinon                   = require('sinon'),
     should                  = require('should'),
     passport                = require('passport'),

core/test/unit/middleware/cache-control_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var should          = require('should'),
     sinon           = require('sinon'),
     middleware      = require('../../../server/middleware').middleware;

core/test/unit/middleware/check-ssl_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, beforeEach, afterEach */
 var sinon    = require('sinon'),
     should   = require('should'),
     configUtils = require('../../utils/configUtils'),

core/test/unit/middleware/cors_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, beforeEach, afterEach */
 var sinon = require('sinon'),
     should = require('should'),
     rewire = require('rewire'),

core/test/unit/middleware/decide-is-admin_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var should          = require('should'),
     sinon           = require('sinon'),
     decideIsAdmin   = require('../../../server/middleware/decide-is-admin');

core/test/unit/middleware/oauth_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, before, beforeEach, afterEach, it*/
 var sinon            = require('sinon'),
     should           = require('should'),
     Promise          = require('bluebird'),

core/test/unit/middleware/redirect-to-setup_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, beforeEach, afterEach */
 var sinon           = require('sinon'),
     should          = require('should'),
     Promise         = require('bluebird'),

core/test/unit/middleware/serve-shared-file_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, beforeEach, afterEach */
 var fs              = require('fs'),
     sinon           = require('sinon'),
     should          = require('should'),

core/test/unit/middleware/spam-prevention_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, beforeEach, afterEach, it*/
 var should      = require('should'),
     sinon       = require('sinon'),
     middleware  = require('../../../server/middleware').middleware;

core/test/unit/middleware/static-theme_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, beforeEach */
 var sinon        = require('sinon'),
     should       = require('should'),
 

core/test/unit/middleware/theme-handler_spec.js

@@ -1,4 +1,3 @@
-/*globals describe, it, beforeEach, afterEach */
 var sinon        = require('sinon'),
     should       = require('should'),
     express      = require('express'),