#8726 Try to fix hangs in Travis

pkp · Mar 3, 2023 · 566c546 · 566c546
1 parent d824412
commit 566c546
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
@@ -14,14 +14,6 @@
 let shouldSkip = false;
 module.exports = ( on, config ) => {
 	on('task', {
-		resetShouldSkipFlag () {
-			shouldSkip = false;
-			return null;
-		},
-		shouldSkip ( value ) {
-			if ( value != null ) shouldSkip = value;
-			return shouldSkip;
-		},
 		failed: require('cypress-failed-log/src/failed')(),
 		consoleLog(message) {
 			console.log(message);
@@ -37,4 +29,4 @@ module.exports = ( on, config ) => {
 	}
 
 	return config;
-}
+}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -44,16 +44,6 @@ Cypress.Commands.add('getTinyMceContent', (tinyMceId, content) => {
 	});
 });
 
-// See https://stackoverflow.com/questions/58657895/is-there-a-reliable-way-to-have-cypress-exit-as-soon-as-a-test-fails/58660504#58660504
-Cypress.Commands.add('abortEarly', (self) => {
-	if (self.currentTest.state === 'failed') {
-		return cy.task('shouldSkip', true);
-	}
-	cy.task('shouldSkip').then(value => {
-		if (value) self.skip();
-	});
-});
-
 Cypress.Commands.add('runQueueJobs', (queue, test, once) => {
 	let command = 'php lib/pkp/tools/jobs.php run';
 

diff --git a/lib/counterBots b/lib/counterBots
+0 −73		CHANGES.md
+31 −212		COUNTER_Robots_list.json
+1 −3		README.md
+16 −52		generated/COUNTER_Robots_list.txt