Merge branch 'master' into test-submissions

.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",

src/modules/submissions.js

@@ -533,7 +533,7 @@
 
 		if ( isAccept ) {
 			// Remove {{Draft categories}}
-			text = text.replace( /\{\{Draft categories\s*\|((?:\s*\[\[:?Category:[ \S]+?\]\]\s*)*)\s*\}\}/gi, '$1' );
+			text = text.replace( /\{\{(?:Draft categories|Draftcat)\s*\|((?:\s*\[\[:?Category:[ \S]+?\]\]\s*)*)\s*\}\}/gi, '$1' );
 
 			// Remove {{Draft article}} (and {{Draft}}).
 			// Not removed if the |text= parameter is present, which could contain

tests/scaffold.js

@@ -6,12 +6,39 @@
 
 /* eslint-env jest, node */
 
-jest.autoMockOff();
+const resetToBase = function () {
+	const fileSystem = require( 'fs' );
+	const basePageHtml = fileSystem.readFileSync( './tests/test-frame.html' ).toString();
+	// Set the base document content using jsdom
+	document.documentElement.innerHtml = basePageHtml;
+	AFCH = undefined;
+	$ = require( 'jquery' );
+	jQuery = $;
+};
 
-fs = require( 'fs' );
+const setPageTitle = function ( title ) {
+	mw.config.get.mockImplementation( ( requested ) => {
+		if ( requested === 'wgPageName' ) {
+			return title;
+		} else if ( requested === 'wgNamespaceNumber' ) {
+			if ( title.indexOf( 'Draft:' ) === 0 ) {
+				return 118;
+			}
+		}
+	} );
+};
+
+resetToAFCApplicablePage = function () {
+	resetToBase();
+	setPageTitle( 'Draft:Foo' );
+	require( './../src/afch.js' );
+};
+
+jest.autoMockOff();
 
 // Mocked later
-mediaWiki = mw = {};
+mw = {};
+mediaWiki = {};
 
 // We're always mocking this, what the heck
 mw.config = {
@@ -32,35 +59,4 @@ mw.loader = {
 	}
 };
 
-const basePageHtml = fs.readFileSync( './tests/test-frame.html' ).toString();
-
-requireScript = function ( name ) {
-	return require( './../src/' + name );
-};
-
-setPageTitle = function ( title ) {
-	mw.config.get.mockImplementation( ( requested ) => {
-		if ( requested === 'wgPageName' ) {
-			return title;
-		} else if ( requested === 'wgNamespaceNumber' ) {
-			if ( title.indexOf( 'Draft:' ) === 0 ) {
-				return 118;
-			}
-		}
-	} );
-};
-
-resetToBase = function () {
-	// Set the base document content using jsdom
-	document.documentElement.innerHtml = basePageHtml;
-	AFCH = undefined;
-	jQuery = $ = require( 'jquery' );
-};
-
 resetToBase();
-
-resetToAFCApplicablePage = function () {
-	resetToBase();
-	setPageTitle( 'Draft:Foo' );
-	requireScript( 'afch.js' );
-};

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', () => {