Merge pull request #68 from julienloizelet/feature/67-wordpress-5-9-compatibility

Feature/67 wordpress 5 9 compatibility

Author: julienloizelet

.github/workflows/end-to-end-test-suite.yml

@@ -11,10 +11,13 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                wp-version: [ 4.9, 5.7 ]
+                wp-version: [ 4.9, 5.0.1, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9 ]
                 php-version: [ 7.2, 7.4 ]
                 exclude:
                     - { php-version: 7.4, wp-version: 4.9 }
+                    - { php-version: 7.4, wp-version: 5.0.1 }
+                    - { php-version: 7.4, wp-version: 5.1 }
+                    - { php-version: 7.4, wp-version: 5.2 }
 
         name: End-to-end test suite
         runs-on: ubuntu-latest

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
+## [1.2.5] - 2022-01-27
+
+### Added
+- Add test for WordPress 5.9
+
 ## [1.2.4] - 2021-12-16
 
 ### Fixed
@@ -30,7 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [1.2.0] - 2021-12-09
 
 ### Added
-- Add end to end github actions test
+- Add end to end GitHub actions test
 
 ### Removed
 - Remove useless configuration to enable standalone mode. This mode should be entirely determined by the presence of

docs/ddev.md

@@ -86,6 +86,23 @@ ddev exec wp core install --url='https://wp565.ddev.site' --title='WordPress' --
 
 ### Test the module
 
+#### Install the module
+
+```
+cd wp-sources
+mkdir my-own-modules &&  mkdir my-own-modules/crowdsec-bouncer && cd my-own-modules/crowdsec-bouncer
+git clone git@github.com:crowdsecurity/cs-wordpress-bouncer.git ./
+ddev composer install --working-dir ./my-own-modules/crowdsec-bouncer
+cd wp-sources
+cp .ddev/additional_docker_compose/docker-compose.crowdsec.yaml .ddev/docker-compose.crowdsec.yaml
+cp .ddev/additional_docker_compose/docker-compose.playwright.yaml .ddev/docker-compose.playwright.yaml
+ddev start
+```
+
+Login to the admin by browsing the url `https://wp565.ddev.site/admin` (username: `admin` and password: `admin123`)
+
+Activate the CrowdSec plugin
+
 #### End-to-end tests
 
 ```

readme.txt

@@ -3,7 +3,7 @@ Contributors: crowdsec
 Donate link: https://crowdsec.net/
 Tags: crowdsec-bouncer, wordpress, security, firewall, captcha, ip-scanner, ip-blocker, ip-blocking, ip-address, ip-database, ip-range-check, crowdsec, ban-hosts, ban-management, anti-hacking, hacker-protection, captcha-image, captcha-generator, captcha-generation, captcha-service
 Requires at least: 4.9
-Tested up to: 5.8
+Tested up to: 5.9
 Stable tag: 1.2.4
 Requires PHP: 7.2
 License: MIT

tests/e2e-ddev/.gitignore

@@ -3,3 +3,4 @@ node_modules
 .test-results-*.json
 *.lock
 *.log
+*.jpg

tests/e2e-ddev/CustomEnvironment.js

@@ -9,7 +9,11 @@ class CustomEnvironment extends PlaywrightEnvironment {
 				event.name === "test_fn_failure"
 			) {
 				this.failedTest = true;
-				const buffer = await this.global.page.screenshot();
+				const buffer = await this.global.page.screenshot({
+					path: "screenshot.jpg",
+					type: "jpeg",
+					quality: 20,
+				});
 				console.debug("Screenshot:", buffer.toString("base64"));
 			} else if (this.failedTest && event.name === "test_start") {
 				// eslint-disable-next-line no-param-reassign

tests/e2e-ddev/__tests__/1-activate-plugin.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-undef */
-const { ADMIN_URL, WP58, WP57, WP56, WP55 } = require("../utils/constants");
+const { ADMIN_URL, WP59, WP58, WP57, WP56, WP55 } = require("../utils/constants");
 
 const {
 	waitForNavigation,
@@ -19,7 +19,7 @@ describe(`Setup CrowdSec plugin`, () => {
 		// "Plugins" page
 		await wait(2000);
 		await page.goto(`${ADMIN_URL}/plugins.php`);
-		if (WP55 || WP56 || WP57 || WP58) {
+		if (WP55 || WP56 || WP57 || WP58 || WP59) {
 			await page.click("#activate-crowdsec");
 		} else {
 			await page.click('[aria-label="Activate CrowdSec"]');

tests/e2e-ddev/utils/constants.js

@@ -14,12 +14,18 @@ const { TIMEOUT } = process.env;
 const { CURRENT_IP } = process.env;
 const { PROXY_IP } = process.env;
 const OTHER_IP = "1.2.3.4";
+const WP59 = WORDPRESS_VERSION.startsWith("59");
 const WP58 = WORDPRESS_VERSION.startsWith("58");
 const WP57 = WORDPRESS_VERSION.startsWith("57");
 const WP56 = WORDPRESS_VERSION.startsWith("56");
 const WP55 = WORDPRESS_VERSION.startsWith("55");
 const WP54 = WORDPRESS_VERSION.startsWith("54");
 const WP53 = WORDPRESS_VERSION.startsWith("53");
+const WP52 = WORDPRESS_VERSION.startsWith("52");
+const WP51 = WORDPRESS_VERSION.startsWith("51");
+const WP50 = WORDPRESS_VERSION.startsWith("50");
+const WP49 = WORDPRESS_VERSION.startsWith("49");
+
 
 module.exports = {
 	ADMIN_URL,
@@ -32,12 +38,17 @@ module.exports = {
 	LAPI_URL_FROM_WP,
 	LAPI_URL_FROM_PLAYWRIGHT,
 	OTHER_IP,
+	WP59,
 	WP58,
 	WP57,
 	WP56,
 	WP55,
 	WP54,
 	WP53,
+	WP52,
+	WP51,
+	WP50,
+	WP49,
 	DEBUG,
 	TIMEOUT,
 	WATCHER_LOGIN,