@centreon/js-config 25.10.17 → 25.10.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cypress/e2e/commands.ts +6 -0
- package/cypress/e2e/tasks.ts +16 -6
- package/package.json +1 -1
package/cypress/e2e/commands.ts
CHANGED
|
@@ -451,6 +451,8 @@ Cypress.Commands.add(
|
|
|
451
451
|
interface StartContainersProps {
|
|
452
452
|
composeFile?: string;
|
|
453
453
|
databaseImage?: string;
|
|
454
|
+
dbConfiguration?: string;
|
|
455
|
+
dbStorage?: string;
|
|
454
456
|
moduleName?: string;
|
|
455
457
|
openidImage?: string;
|
|
456
458
|
profiles?: Array<string>;
|
|
@@ -465,6 +467,8 @@ Cypress.Commands.add(
|
|
|
465
467
|
({
|
|
466
468
|
composeFile,
|
|
467
469
|
databaseImage = Cypress.env('DATABASE_IMAGE'),
|
|
470
|
+
dbConfiguration = Cypress.env('MYSQL_DB_CONFIGURATION'),
|
|
471
|
+
dbStorage = Cypress.env('MYSQL_DB_STORAGE'),
|
|
468
472
|
moduleName = 'centreon-web',
|
|
469
473
|
openidImage = `ghcr.io/centreon/centreon/keycloak:${Cypress.env(
|
|
470
474
|
'OPENID_IMAGE_VERSION'
|
|
@@ -495,6 +499,8 @@ Cypress.Commands.add(
|
|
|
495
499
|
{
|
|
496
500
|
composeFile: composeFilePath,
|
|
497
501
|
databaseImage,
|
|
502
|
+
dbConfiguration,
|
|
503
|
+
dbStorage,
|
|
498
504
|
openidImage,
|
|
499
505
|
profiles,
|
|
500
506
|
samlImage,
|
package/cypress/e2e/tasks.ts
CHANGED
|
@@ -228,6 +228,8 @@ export default (on: Cypress.PluginEvents): void => {
|
|
|
228
228
|
startContainers: async ({
|
|
229
229
|
composeFile,
|
|
230
230
|
databaseImage,
|
|
231
|
+
dbConfiguration,
|
|
232
|
+
dbStorage,
|
|
231
233
|
openidImage,
|
|
232
234
|
profiles,
|
|
233
235
|
samlImage,
|
|
@@ -237,16 +239,24 @@ export default (on: Cypress.PluginEvents): void => {
|
|
|
237
239
|
const composeFileDir = path.dirname(composeFile);
|
|
238
240
|
const composeFileName = path.basename(composeFile);
|
|
239
241
|
|
|
242
|
+
const environment: Record<string, string> = {
|
|
243
|
+
MYSQL_IMAGE: databaseImage,
|
|
244
|
+
OPENID_IMAGE: openidImage,
|
|
245
|
+
SAML_IMAGE: samlImage,
|
|
246
|
+
WEB_IMAGE: webImage,
|
|
247
|
+
};
|
|
248
|
+
if (dbConfiguration) {
|
|
249
|
+
environment.MYSQL_DB_CONFIGURATION = dbConfiguration;
|
|
250
|
+
}
|
|
251
|
+
if (dbStorage) {
|
|
252
|
+
environment.MYSQL_DB_STORAGE = dbStorage;
|
|
253
|
+
}
|
|
254
|
+
|
|
240
255
|
dockerEnvironment = await new DockerComposeEnvironment(
|
|
241
256
|
composeFileDir,
|
|
242
257
|
composeFileName,
|
|
243
258
|
)
|
|
244
|
-
.withEnvironment(
|
|
245
|
-
MYSQL_IMAGE: databaseImage,
|
|
246
|
-
OPENID_IMAGE: openidImage,
|
|
247
|
-
SAML_IMAGE: samlImage,
|
|
248
|
-
WEB_IMAGE: webImage,
|
|
249
|
-
})
|
|
259
|
+
.withEnvironment(environment)
|
|
250
260
|
.withProfiles(...profiles)
|
|
251
261
|
.withStartupTimeout(120000)
|
|
252
262
|
.withWaitStrategy(
|
package/package.json
CHANGED