Merge pull request #13 from Progi1984/fixNIghtlyVersion

Fixed use of getPSVersion
PrestaShop · Jan 24, 2024 · ebc086e · ebc086e
2 parents 97acfa7 + 4d9f792
commit ebc086e
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prestashop-core/ui-testing",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/pages/BO/dashboard/index.ts b/src/pages/BO/dashboard/index.ts
@@ -1,7 +1,8 @@
 import type {DashboardPageInterface} from '@interfaces/BO/dashboard';
+import testContext from '@utils/testContext';
 import semver from 'semver';
 
-const psVersion = global.getPSVersion();
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require */
 function requirePage(): DashboardPageInterface {

diff --git a/src/pages/BO/login/index.ts b/src/pages/BO/login/index.ts
@@ -1,7 +1,8 @@
 import type {LoginPageInterface} from '@interfaces/BO/login';
+import testContext from '@utils/testContext';
 import semver from 'semver';
 
-const psVersion = global.getPSVersion();
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require */
 function requirePage(): LoginPageInterface {

diff --git a/src/pages/BO/modules/blockwishlist/index.ts b/src/pages/BO/modules/blockwishlist/index.ts
@@ -1,7 +1,8 @@
 import type {ModuleBlockwishlistMainPageInterface} from '@interfaces/BO/modules/blockwishlist/index';
+import testContext from '@utils/testContext';
 import semver from 'semver';
 
-const psVersion = global.getPSVersion();
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require */
 function requirePage(): ModuleBlockwishlistMainPageInterface {

diff --git a/src/pages/BO/modules/blockwishlist/statistics.ts b/src/pages/BO/modules/blockwishlist/statistics.ts
@@ -1,7 +1,8 @@
 import type {ModuleBlockwishlistStatisticsPageInterface} from '@interfaces/BO/modules/blockwishlist/statistics';
+import testContext from '@utils/testContext';
 import semver from 'semver';
 
-const psVersion = global.getPSVersion();
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require */
 function requirePage(): ModuleBlockwishlistStatisticsPageInterface {

diff --git a/src/pages/BO/modules/moduleManager/index.ts b/src/pages/BO/modules/moduleManager/index.ts
@@ -1,7 +1,8 @@
 import type {ModuleManagerPageInterface} from '@interfaces/BO/modules/moduleManager';
+import testContext from '@utils/testContext';
 import semver from 'semver';
 
-const psVersion = global.getPSVersion();
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-var-requires */
 function requirePage(): ModuleManagerPageInterface {

diff --git a/src/pages/FO/category/index.ts b/src/pages/FO/category/index.ts
@@ -1,7 +1,8 @@
 import type {FoCategoryPageInterface} from '@interfaces/FO/category';
+import testContext from '@utils/testContext';
 import semver from 'semver';
 
-const psVersion = global.getPSVersion();
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require */
 function requirePage(): FoCategoryPageInterface {

diff --git a/src/pages/FO/home/index.ts b/src/pages/FO/home/index.ts
@@ -1,7 +1,8 @@
 import type {FoHomePageInterface} from '@interfaces/FO/home';
+import testContext from '@utils/testContext';
 import semver from 'semver';
 
-const psVersion = global.getPSVersion();
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-var-requires */
 function requirePage(): FoHomePageInterface {

diff --git a/src/pages/FO/login/index.ts b/src/pages/FO/login/index.ts
@@ -1,7 +1,8 @@
 import type {FoLoginPageInterface} from '@interfaces/FO/login';
+import testContext from '@utils/testContext';
 import semver from 'semver';
 
-const psVersion = global.getPSVersion();
+const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-var-requires */
 function requirePage(): FoLoginPageInterface {

diff --git a/src/types/globals.d.ts b/src/types/globals.d.ts
@@ -12,17 +12,6 @@ declare global {
   var maildevConfig: GlobalMaildevConfig;
   var keycloakConfig: GlobalKeycloakConfig;
   var browserErrors: GlobalBrowserErrors;
-
-  // eslint-disable-next-line no-inner-declarations
-  function getPSVersion(): string {
-    if (!process.env.PS_VERSION) {
-      return '0.0.0';
-    }
-    if (process.env.PS_VERSION === 'nightly') {
-      return '99.99.99';
-    }
-    return process.env.PS_VERSION;
-  }
 }
 
 export {};
diff --git a/src/utils/testContext.ts b/src/utils/testContext.ts
@@ -30,4 +30,17 @@ export default {
       throw Error('This error is thrown to just generate a report with failed steps');
     }
   },
+  /**
+   * Return the version of current PrestaShop (depending the env value `PS_VERSION`)
+   * @returns string
+   */
+  getPSVersion(): string {
+    if (!process.env.PS_VERSION) {
+      return '0.0.0';
+    }
+    if (process.env.PS_VERSION === 'nightly') {
+      return '99.99.99';
+    }
+    return process.env.PS_VERSION;
+  },
 };