Skip to content

Commit f754496

Browse files
ljagielagreatertomi
authored andcommitted
Revert "test: use proper dist folder for e2e tests"
This reverts commit 23292cc.
1 parent c4ad7d8 commit f754496

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

.github/workflows/e2e-tests-linux-split.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
run: |
163163
ART_ID=$(curl "https://api.github.com/repos/input-output-hk/lace/actions/artifacts?name=${{ env.BUILD_ARTIFACT_NAME }}" | jq -r .artifacts[0].id)
164164
curl -v -o build_artifact.zip --location "https://api.github.com/repos/input-output-hk/lace/actions/artifacts/${ART_ID}/zip" -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}"
165-
unzip build_artifact.zip -d ./dist
165+
unzip build_artifact.zip -d ./v1/apps/browser-extension-wallet/dist
166166
echo "Build artifact found and downloaded"
167167
168168
- name: Setup Firefox Developer Edition

v1/packages/e2e-tests/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ UI-mapped gherkin tests for the Lace browser extension
7474
- not supported for Firefox
7575
- `FIREFOX_BINARY=/Applications/Firefox\ Developer\ Edition.app/Contents/MacOS/firefox` (required for Firefox)
7676
- default path to Firefox Developer Edition binary on macOS, please adjust to your local setup
77+
- `LMP_BUNDLE=true|false` default = false (optional)
78+
- true = run tests for LMP bundle (V1 + Midnight) dist
79+
- false = run tests using the default lace-platform Midnight dist
7780

7881
## Run a single feature file with params
7982

v1/packages/e2e-tests/src/utils/translationService.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@ type Translations = { [index: string]: any };
77
const loadTranslations = async function (translationOrigin: TranslationsOrigin) {
88
const language = process.env.LACE_LOCALE ?? 'en';
99

10-
const extensionTranslationPath = `../../../translation/src/lib/translations/browser-extension-wallet/${language}.json`;
11-
const coreTranslationPath = `../../..//translation/src/lib/translations/core/${language}.json`;
12-
const cardanoTranslationPath = `../../..//translation/src/lib/translations/cardano/${language}.json`;
13-
const sharedWalletsTranslationPath = `../../..//translation/src/lib/translations/shared-wallets/${language}.json`;
14-
const stakingTranslationPath = `../../../translation/src/lib/translations/staking/${language}.json`;
15-
const midnightTranslationPath = `../../../../../v2/packages/contract/i18n/src/translations/${language}.json`;
10+
const extensionTranslationPath = `../../../../packages/translation/src/lib/translations/browser-extension-wallet/${language}.json`;
11+
const coreTranslationPath = `../../../../packages/translation/src/lib/translations/core/${language}.json`;
12+
const cardanoTranslationPath = `../../../../packages/translation/src/lib/translations/cardano/${language}.json`;
13+
const sharedWalletsTranslationPath = `../../../../packages/translation/src/lib/translations/shared-wallets/${language}.json`;
14+
const stakingTranslationPath = `../../../../packages/translation/src/lib/translations/staking/${language}.json`;
15+
16+
let midnight: Translations = {};
17+
if (String(process.env.LMP_BUNDLE) === 'true') {
18+
const midnightTranslationPath = `../../../../../lace-platform/packages/contract/i18n/src/translations/${language}.json`;
19+
midnight = await flatten(JSON.parse(readFromFile(import.meta.dirname, midnightTranslationPath).toString()));
20+
}
1621

1722
const extension: Translations = await flatten(
1823
JSON.parse(readFromFile(import.meta.dirname, extensionTranslationPath).toString())
@@ -29,9 +34,6 @@ const loadTranslations = async function (translationOrigin: TranslationsOrigin)
2934
const staking: Translations = await flatten(
3035
JSON.parse(readFromFile(import.meta.dirname, stakingTranslationPath).toString())
3136
);
32-
const midnight: Translations = await flatten(
33-
JSON.parse(readFromFile(import.meta.dirname, midnightTranslationPath).toString())
34-
);
3537
const baseTranslations = {
3638
...cardano,
3739
...core,

v1/packages/e2e-tests/wdio.conf.chrome.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
import { config as baseConfig } from './wdio.conf.base';
55

6-
const DIST_LOCATION = '../../../dist';
6+
const DIST_LOCATION =
7+
String(process.env.LMP_BUNDLE) === 'true' ? '../../../dist' : '../../apps/browser-extension-wallet/dist';
78

89
const chromeConfig = {
910
capabilities: [

v1/packages/e2e-tests/wdio.conf.edge.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import { config as baseConfig } from './wdio.conf.base';
44

5-
const DIST_LOCATION = '../../../dist';
6-
75
const edgeConfig = {
86
capabilities: [
97
{
@@ -20,7 +18,7 @@ const edgeConfig = {
2018
'--enable-automation',
2119
'--no-first-run',
2220
'--no-default-browser-check',
23-
`--load-extension=${import.meta.dirname}/${DIST_LOCATION}`,
21+
`--load-extension=${import.meta.dirname}/../../apps/browser-extension-wallet/dist`,
2422
'--allow-insecure-localhost',
2523
'--window-size=1920,1080',
2624
'--allow-file-access-from-files',

0 commit comments

Comments
 (0)