diff --git a/.eslintrc.json b/.eslintrc.json index b959b6be..8e615c71 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -53,6 +53,7 @@ "no-shadow": "off", "no-undef": "warn", "no-underscore-dangle": "off", + "no-unused-vars": "warn", "prefer-const": "warn", "security/detect-non-literal-regexp": "off", "security/detect-unsafe-regex": "off", diff --git a/tests/scaffold.js b/tests/scaffold.js index cfd0cc01..3979a214 100644 --- a/tests/scaffold.js +++ b/tests/scaffold.js @@ -8,7 +8,7 @@ jest.autoMockOff(); -fs = require( 'fs' ); +const fs = require( 'fs' ); // Mocked later mediaWiki = mw = {}; @@ -34,11 +34,7 @@ mw.loader = { const basePageHtml = fs.readFileSync( './tests/test-frame.html' ).toString(); -requireScript = function ( name ) { - return require( './../src/' + name ); -}; - -setPageTitle = function ( title ) { +const setPageTitle = function ( title ) { mw.config.get.mockImplementation( ( requested ) => { if ( requested === 'wgPageName' ) { return title; @@ -50,7 +46,7 @@ setPageTitle = function ( title ) { } ); }; -resetToBase = function () { +const resetToBase = function () { // Set the base document content using jsdom document.documentElement.innerHtml = basePageHtml; AFCH = undefined; @@ -62,5 +58,5 @@ resetToBase(); resetToAFCApplicablePage = function () { resetToBase(); setPageTitle( 'Draft:Foo' ); - requireScript( 'afch.js' ); + require( './../src/afch.js' ); }; diff --git a/tests/test-core.js b/tests/test-core.js index e6007848..4daa2c0b 100644 --- a/tests/test-core.js +++ b/tests/test-core.js @@ -9,7 +9,7 @@ require( './scaffold.js' ); resetToAFCApplicablePage(); -requireScript( 'modules/core.js' ); +require( './../src/modules/core.js' ); // It's always good to start simple :) describe( 'AFCH', () => {