Release 2.4.5

changelog.txt

@@ -1,11 +1,11 @@
 /**
  * Module Captcha
  * Add (re)captcha on contact and account creation forms
- * © Hervé Hennes 2013-2023
+ * © Hervé Hennes 2013-2024
  * https://github.com/nenes25/eicaptcha
  * https://www.h-hennes.fr/blog/
  */
- - V 2.4.5 - 2023-04-XX #229 Replace override of Authcontroller
+ - V 2.4.5 - 2024-02-15 #229 Replace override of Authcontroller
  #247 Registration check on prestashop 8.x
  #221 recaptcha v3 doesn't validate in form added with elementor form builder of warehouse theme
  #218 Harmonize and fix licence headers

eicaptcha.php

@@ -195,16 +195,17 @@ public function hookHeader(array $params)
  protected function renderHeaderV2()
  {
  if ((
- $this->context->controller instanceof AuthController
- && Configuration::get('CAPTCHA_ENABLE_ACCOUNT') == 1
+ (
+ $this->context->controller instanceof AuthController
+ || $this->context->controller instanceof RegistrationController
+ )
+ && Configuration::get('CAPTCHA_ENABLE_ACCOUNT') == 1
  )
  ||
- (
  ($this->context->controller instanceof ContactController
- || Configuration::get('CAPTCHA_LOAD_EVERYWHERE') == 1
- )
  && Configuration::get('CAPTCHA_ENABLE_CONTACT') == 1
  )
+ || Configuration::get('CAPTCHA_LOAD_EVERYWHERE') == 1
  ) {
  $this->context->controller->registerStylesheet(
  'module-eicaptcha',
@@ -247,9 +248,9 @@ public function renderHeaderV3()
  {
  if (
  ($this->context->controller instanceof ContactController
- || Configuration::get('CAPTCHA_LOAD_EVERYWHERE') == 1
+ && Configuration::get('CAPTCHA_ENABLE_CONTACT') == 1
  )
- && Configuration::get('CAPTCHA_ENABLE_CONTACT') == 1
+ || Configuration::get('CAPTCHA_LOAD_EVERYWHERE') == 1
  ) {
  $publicKey = Configuration::get('CAPTCHA_PUBLIC_KEY');
  $js = '

tests/functionnal/.gitignore

@@ -1,4 +1,5 @@
-node_modules/
+/node_modules/
 /test-results/
 /playwright-report/
 /playwright/.cache/
+/.env

tests/functionnal/package.json

@@ -9,5 +9,8 @@
  "license": "ISC",
  "devDependencies": {
  "@playwright/test": "^1.32.3"
+ },
+ "dependencies": {
+ "dotenv": "^16.3.1"
  }
 }

tests/functionnal/playwright.config.ts

@@ -4,22 +4,23 @@ import { defineConfig, devices } from '@playwright/test';
  * Read environment variables from file.
  * https://github.com/motdotla/dotenv
  */
-// require('dotenv').config();
+require('dotenv').config();
 
 /**
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
  testDir: './e2e',
- fullyParallel: true,
+ fullyParallel: false,
  forbidOnly: !!process.env.CI,
  retries: process.env.CI ? 2 : 0,
- workers: process.env.CI ? 1 : undefined,
+ workers: 1,
  reporter: 'html',
  use: {
  /* Base URL to use in actions like `await page.goto('/')`. */
- baseURL: 'http://www.prestashop74.local/tests/1786/', // Will need to be replaced by a CI or a local url to test
+ baseURL:  process.env.CI_ENVIRONMENT_URL, // Will need to be replaced by a CI or a local url to test
  trace: 'on-first-retry',
+ screenshot: 'only-on-failure',
  },
  /* Configure projects for major browsers */
  projects: [