Skip to content

Commit 96a517d

Browse files
committed
desktop tests refactoring
1 parent e5b4214 commit 96a517d

File tree

172 files changed

+2266
-2221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+2266
-2221
lines changed

tests/e2e/desktop.runner.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ import testcafe from 'testcafe';
1010
configPath: 'tsconfig.testcafe.json',
1111
experimentalDecorators: true
1212
}})
13-
.src((process.env.TEST_FILES || 'tests/**/*.e2e.ts').split('\n'))
13+
.src((process.env.TEST_FILES || 'tests/electron/**/*.e2e.ts').split('\n'))
1414
.browsers(['electron'])
15-
.filter((_testName, _fixtureName, _fixturePath, testMeta): boolean => {
16-
return testMeta.env == 'desktop'
17-
})
1815
.screenshots({
1916
path: 'report/screenshots/',
2017
takeOnFails: true,

tests/e2e/desktop.runner.win.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ import testcafe from 'testcafe';
1010
configPath: 'tsconfig.testcafe.json',
1111
experimentalDecorators: true
1212
}})
13-
.src((process.env.TEST_FILES || 'tests/**/*.e2e.ts').split('\n'))
13+
.src((process.env.TEST_FILES || 'tests/electron/**/*.e2e.ts').split('\n'))
1414
.browsers(['electron'])
15-
.filter((_testName, _fixtureName, _fixturePath, testMeta): boolean => {
16-
return testMeta.env == 'desktop' && testMeta.rte === 'standalone';
17-
})
1815
.screenshots({
1916
path: 'report/screenshots/',
2017
takeOnFails: true,

tests/e2e/tests/critical-path/database/modules.e2e.ts

Lines changed: 0 additions & 92 deletions
This file was deleted.

tests/e2e/tests/critical-path/files-auto-update/promo-button-autoupdate.e2e.ts

Lines changed: 0 additions & 51 deletions
This file was deleted.

tests/e2e/tests/critical-path/workbench/index-schema.e2e.ts

Lines changed: 0 additions & 72 deletions
This file was deleted.

tests/e2e/tests/critical-path/workbench/json-workbench.e2e.ts

Lines changed: 0 additions & 51 deletions
This file was deleted.

tests/e2e/tests/critical-path/a-first-start-form/autodiscovery.e2e.ts renamed to tests/e2e/tests/electron/critical-path/a-first-start-form/autodiscovery.e2e.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { MyRedisDatabasePage } from '../../../pageObjects';
2-
import { commonUrl } from '../../../helpers/conf';
3-
import { env, rte } from '../../../helpers/constants';
4-
import { DatabaseHelper } from '../../../helpers/database';
1+
import { MyRedisDatabasePage } from '../../../../pageObjects';
2+
import { commonUrl } from '../../../../helpers/conf';
3+
import { rte } from '../../../../helpers/constants';
4+
import { DatabaseHelper } from '../../../../helpers/database';
55

66
const myRedisDatabasePage = new MyRedisDatabasePage();
77
const databaseHelper = new DatabaseHelper();
@@ -10,13 +10,12 @@ const standalonePorts = [8100, 8101, 8102, 8103, 12000];
1010
const otherPorts = [28100, 8200];
1111

1212
fixture `Autodiscovery`
13-
.meta({ type: 'critical_path' })
13+
.meta({ type: 'critical_path', rte: rte.none })
1414
.page(commonUrl)
1515
.beforeEach(async() => {
1616
await databaseHelper.acceptLicenseTerms();
1717
});
1818
test
19-
.meta({ env: env.desktop, rte: rte.none })
2019
.after(async() => {
2120
// Delete all auto-discovered databases
2221
for(let i = 0; i < standalonePorts.length; i++) {

0 commit comments

Comments
 (0)