Skip to content

Commit 5c9df41

Browse files
committed
reenable playwright
1 parent b7318de commit 5c9df41

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

.github/workflows/pipeline.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ jobs:
145145
run: |
146146
NODE_API_PORT=4273 /bin/bash jasmine/test.sh --env .env -- --target docker
147147
148-
# - name: E2E TESTS
149-
# # if: "!contains(github.event.head_commit.message, '[q]')"
150-
# if: |
151-
# !(github.event.head_commit.message == 'q' ||
152-
# startsWith(github.event.head_commit.message, 'q ') ||
153-
# endsWith(github.event.head_commit.message, ' q') ||
154-
# contains(github.event.head_commit.message, ' q '))
155-
# run: |
156-
# /bin/bash playwright.sh --target docker
148+
- name: E2E TESTS
149+
# if: "!contains(github.event.head_commit.message, '[q]')"
150+
if: |
151+
!(github.event.head_commit.message == 'q' ||
152+
startsWith(github.event.head_commit.message, 'q ') ||
153+
endsWith(github.event.head_commit.message, ' q') ||
154+
contains(github.event.head_commit.message, ' q '))
155+
run: |
156+
/bin/bash playwright.sh --target docker
157157
158158
- name: ps aux
159159
run: |

playwright.config.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import fs from "fs";
2525
// const cmd = require("./tests/tools/cmd");
2626
import cmd from "./lib/cmd.js";
2727

28+
const log = (...args) => console.log("playwright.config.js log:", ...args);
29+
2830
if (Object.keys(all() || {}).length === 0) {
2931
throw new Error(`playwright.config.js error: all() can't return 0 - load preprocessed.js first`);
3032
}
@@ -49,6 +51,15 @@ if (typeof process.env.ENVFILE === "string" && process.env.ENVFILE.trim()) {
4951
dotenv.config();
5052
}
5153

54+
55+
// WARNING: this is tweak introduced with introduction of https for local development vvv
56+
// WARNING: this is tweak introduced with introduction of https for local development vvv
57+
// WARNING: this is tweak introduced with introduction of https for local development vvv
58+
process.env.NODE_API_PORT = process.env.NODE_API_PORT_HTTPS;
59+
// WARNING: this is tweak introduced with introduction of https for local development ^^^
60+
// WARNING: this is tweak introduced with introduction of https for local development ^^^
61+
// WARNING: this is tweak introduced with introduction of https for local development ^^^
62+
5263
mockEnv(process.env);
5364

5465
const protocolRegex = /^https?:\/\//;
@@ -70,7 +81,7 @@ function envcheck(name, ret) {
7081
}
7182

7283
if (envcheck("BASE_URL", true)) {
73-
console.log(`existing BASE_URL: >${process.env.BASE_URL}<`);
84+
log(`existing BASE_URL: >${process.env.BASE_URL}<`);
7485
} else {
7586
envcheck("NODE_API_PROTOCOL");
7687

@@ -86,7 +97,7 @@ if (envcheck("BASE_URL", true)) {
8697
process.env.BASE_URL += `:${process.env.NODE_API_PORT}`;
8798
}
8899

89-
console.log(`generated BASE_URL: >${process.env.BASE_URL}<`);
100+
log(`generated BASE_URL: >${process.env.BASE_URL}<`);
90101
}
91102

92103
envcheck("BASE_URL");

0 commit comments

Comments
 (0)