Merge pull request #21325 from Yoast/td/class-syntax

Transforms prototype-based classes to regular class syntax

packages/yoastseo/spec/appSpec.js

@@ -1,5 +1,6 @@
 import MissingArgument from "../src/errors/missingArgument.js";
 import App from "../src/app.js";
+import Factory from "../src/helpers/factory";
 
 // Mock these function to prevent us from needing an actual DOM in the tests.
 App.prototype.showLoadingDialog = function() {};
@@ -8,23 +9,23 @@ App.prototype.removeLoadingDialog = function() {};
 App.prototype.runAnalyzer = function() {};
 
 // Makes lodash think this is a valid HTML element
-var mockElement = [];
+const mockElement = [];
 mockElement.nodeType = 1;
 
 global.document = {};
 document.getElementById = function() {
 	return mockElement;
 };
 
+const researcher = Factory.buildMockResearcher( {}, true, false );
+
 describe( "Creating an App", function() {
 	it( "throws an error when no args are given", function() {
-		expect( App ).toThrowError( MissingArgument );
+		expect( () => new App() ).toThrowError( MissingArgument );
 	} );
 
 	it( "throws on an empty args object", function() {
-		expect( function() {
-			new App( {} );
-		} ).toThrowError( MissingArgument );
+		expect( () => new App( {} ) ).toThrowError( MissingArgument );
 	} );
 
 	it( "throws on an invalid targets argument", function() {
@@ -50,6 +51,17 @@ describe( "Creating an App", function() {
 		} ).toThrowError( MissingArgument );
 	} );
 
+	it( "throws on a missing researcher argument", function() {
+		expect( function() {
+			new App( {
+				targets: {
+					snippet: "snippetID",
+					output: "outputID",
+				},
+			} );
+		} ).toThrowError( MissingArgument );
+	} );
+
 	it( "should work without an output ID", function() {
 		new App( {
 			targets: {
@@ -60,6 +72,7 @@ describe( "Creating an App", function() {
 					return {};
 				},
 			},
+			researcher: researcher,
 		} );
 	} );
 
@@ -74,6 +87,7 @@ describe( "Creating an App", function() {
 					return {};
 				},
 			},
+			researcher: researcher,
 		} );
 	} );
 } );

packages/yoastseo/spec/languageProcessing/values/ClauseSpec.js

@@ -40,11 +40,5 @@ describe( "a test for serializing and parsing a Clause class instance", function
 			isPassive: false,
 			participles: [],
 		} );
-		expect( mockClause.parse( mockClause.serialize() ) ).toEqual( {
-			_clauseText: "The cat is loved.",
-			_auxiliaries: [ "is" ],
-			_isPassive: false,
-			_participles: [],
-		} );
 	} );
 } );

packages/yoastseo/spec/languageProcessing/values/SentenceSpec.js

@@ -64,15 +64,5 @@ describe( "Creates a sentence object", function() {
 			isPassive: true,
 			sentenceText: "Cats are adored.",
 		} );
-		expect( sentence.parse( sentence.serialize() ) ).toEqual( {
-			_clauses: [
-				{ _auxiliaries: [ "are" ],
-					_clauseText: "Cats are adored",
-					_isPassive: true,
-					_participles: [],
-				} ],
-			_isPassive: true,
-			_sentenceText: "Cats are adored.",
-		} );
 	} );
 } );

packages/yoastseo/spec/scoring/assessments/readability/SubheadingDistributionTooLongAssessmentSpec.js

@@ -3,7 +3,7 @@ import SubheadingDistributionTooLong from "../../../../src/scoring/assessments/r
 import Paper from "../../../../src/values/Paper.js";
 import Factory from "../../../../src/helpers/factory.js";
 import Mark from "../../../../src/values/Mark.js";
-import CornerStoneContentAssessor from "../../../../src/scoring/assessors/cornerstone/contentAssessor.js";
+import CornerstoneContentAssessor from "../../../../src/scoring/assessors/cornerstone/contentAssessor.js";
 import ProductCornerstoneContentAssessor from "../../../../src/scoring/assessors/productPages/cornerstone/contentAssessor.js";
 import DefaultResearcher from "../../../../src/languageProcessing/languages/_default/Researcher.js";
 import EnglishResearcher from "../../../../src/languageProcessing/languages/en/Researcher.js";
@@ -583,7 +583,7 @@ describe( "Language-specific configuration for specific types of content is used
 		expect( assessment._config.farTooMany ).toEqual( japaneseConfig.defaultParameters.farTooMany );
 	} );
 
-	let cornerStoneContentAssessor = new CornerStoneContentAssessor( englishResearcher );
+	let cornerStoneContentAssessor = new CornerstoneContentAssessor( englishResearcher );
 	let productCornerstoneContentAssessor = new ProductCornerstoneContentAssessor( englishResearcher, mockOptions );
 
 	[ cornerStoneContentAssessor, productCornerstoneContentAssessor ].forEach( assessor => {
@@ -617,7 +617,7 @@ describe( "Language-specific configuration for specific types of content is used
 		} );
 	} );
 
-	cornerStoneContentAssessor = new CornerStoneContentAssessor( japaneseResearcher );
+	cornerStoneContentAssessor = new CornerstoneContentAssessor( japaneseResearcher );
 	productCornerstoneContentAssessor = new ProductCornerstoneContentAssessor( japaneseResearcher, mockOptions );
 
 	[ cornerStoneContentAssessor, productCornerstoneContentAssessor ].forEach( assessor => {

packages/yoastseo/spec/scoring/assessors/storePostsAndPages/cornerstone/contentAssessorSpec.js

@@ -185,13 +185,13 @@ describe( "A test for content assessor for English", function() {
 			expect( assessments.length ).toBe( expected );
 			expect( assessments.map( ( { identifier } ) => identifier ) ).toEqual(
 				[
-					"subheadingsTooLong",
 					"textParagraphTooLong",
-					"textSentenceLength",
 					"textTransitionWords",
 					"passiveVoice",
 					"textPresence",
 					"sentenceBeginnings",
+					"subheadingsTooLong",
+					"textSentenceLength",
 					"wordComplexity",
 				]
 			);
@@ -323,10 +323,10 @@ describe( "calculateOverallScore for non-English that uses Default researcher",
 			expect( assessments.length ).toBe( expected );
 			expect( assessments.map( ( { identifier } ) => identifier ) ).toEqual(
 				[
-					"subheadingsTooLong",
 					"textParagraphTooLong",
-					"textSentenceLength",
 					"textPresence",
+					"subheadingsTooLong",
+					"textSentenceLength",
 				]
 			);
 		} );