Skip to content

Commit 92fde95

Browse files
committed
uncomment tests
1 parent cb308d2 commit 92fde95

File tree

6 files changed

+16
-61
lines changed

6 files changed

+16
-61
lines changed

.circleci/config.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,13 +1009,15 @@ workflows:
10091009
only:
10101010
- /^e2e/feature.*/
10111011
- /^e2e/bugfix.*/
1012-
# - docker:
1013-
# name: Build docker image
1014-
# requires:
1015-
# - Start E2E Tests
1012+
- docker:
1013+
name: Build docker image
1014+
requires:
1015+
- Start E2E Tests
10161016
# build desktop app
10171017
- setup-sign-certificates:
10181018
name: Setup sign certificates (stage)
1019+
requires:
1020+
- Start E2E Tests
10191021
- setup-build:
10201022
name: Setup build (stage)
10211023
requires:
@@ -1024,12 +1026,12 @@ workflows:
10241026
name: Build app - Linux (stage)
10251027
requires:
10261028
- Setup build (stage)
1027-
# - e2e-tests:
1028-
# name: E2ETest
1029-
# build: docker
1030-
# parallelism: 4
1031-
# requires:
1032-
# - Build docker image
1029+
- e2e-tests:
1030+
name: E2ETest
1031+
build: docker
1032+
parallelism: 4
1033+
requires:
1034+
- Build docker image
10331035
# e2e desktop tests on AppImage build
10341036
- e2e-app-image:
10351037
name: E2ETest (AppImage)

tests/e2e/docker.web.docker-compose.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
version: "3.4"
22

33
services:
4-
static-server:
5-
build:
6-
context: .
7-
dockerfile: static-server.Dockerfile
8-
volumes:
9-
- ./remote:/app/remote
10-
ports:
11-
- 5551:5551
12-
134
e2e:
145
build:
156
context: .

tests/e2e/helpers/database-scripts.ts

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,15 @@ export async function updateColumnValueInDBTable(tableName: string, columnName:
1414
const query = `UPDATE ${tableName} SET ${columnName} = ${value}`;
1515

1616
return new Promise<void>((resolve, reject) => {
17-
db.get(`SELECT data FROM ${tableName}`, (err: { message: string }, row: any) => {
17+
db.run(query, (err: { message: string }) => {
1818
if (err) {
1919
reject(new Error(`Error during changing ${columnName} column value: ${err.message}`));
2020
} else {
21-
console.log(`Value of data in ${tableName}:`, row['data']);
22-
db.run(query, (err: { message: string }) => {
23-
if (err) {
24-
reject(new Error(`Error during changing ${columnName} column value: ${err.message}`));
25-
} else {
26-
db.close();
27-
resolve();
28-
}
29-
});
21+
db.close();
22+
resolve();
3023
}
3124
});
3225
});
33-
// return new Promise<void>((resolve, reject) => {
34-
// db.run(query, (err: { message: string }) => {
35-
// if (err) {
36-
// reject(new Error(`Error during changing ${columnName} column value: ${err.message}`));
37-
// } else {
38-
// db.close();
39-
// resolve();
40-
// }
41-
// });
42-
// });
4326
}
4427

4528
/**

tests/e2e/helpers/insights.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import * as fs from 'fs-extra';
2-
import * as os from 'os';
32
import * as path from 'path';
4-
import { join as joinPath } from 'path';
53
import { BasePage } from '../pageObjects';
64
import { deleteRowsFromTableInDB, updateColumnValueInDBTable } from './database-scripts';
75
import { syncFeaturesApi } from './api/api-info';
@@ -15,22 +13,12 @@ const basePage = new BasePage();
1513
export async function modifyFeaturesConfigJson(filePath: string): Promise<void> {
1614
const configFileName = 'features-config.json';
1715
const remoteConfigPath = process.env.REMOTE_FOLDER_PATH || './remote';
18-
// const remoteConfigPath = joinPath(os.homedir(), process.env.REMOTE_FOLDER_PATH || './remote');
1916
const targetFilePath = path.join(remoteConfigPath, configFileName);
2017

2118
return new Promise((resolve, reject) => {
2219
try {
23-
// Ensure the folder exists
24-
if (!fs.existsSync(remoteConfigPath)) {
25-
console.log(`Folder '${remoteConfigPath}' doesn't exist.`);
26-
}
27-
2820
fs.ensureFileSync(targetFilePath);
2921
fs.writeFileSync(targetFilePath, fs.readFileSync(filePath));
30-
31-
const fileContent = fs.readFileSync(targetFilePath, 'utf8');
32-
console.log('JSON File Content:', fileContent);
33-
3422
resolve();
3523
}
3624
catch (err) {

tests/e2e/local.web.docker-compose.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
version: "3.4"
22

33
services:
4-
static-server:
5-
build:
6-
context: .
7-
dockerfile: static-server.Dockerfile
8-
volumes:
9-
- ./remote:/app/remote
10-
ports:
11-
- 5551:5551
12-
134
e2e:
145
build:
156
context: .

tests/e2e/tests/regression/insights/feature-flag.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ test
126126
await t.expect(featureVersion).eql(versionFromConfig, 'Config highest version not applied');
127127
await t.expect(browserPage.InsightsPanel.insightsBtn.exists).notOk('Insights panel displayed when filter excludes this buildType');
128128
});
129-
test.only
129+
test
130130
.meta({ env: env.desktop })
131131
.before(async() => {
132132
await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV5Config, ossStandaloneV5Config.databaseName);

0 commit comments

Comments
 (0)