Skip to content

Commit 09e98fe

Browse files
committed
updates for test-data folder structure
1 parent bd606ed commit 09e98fe

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/e2e/tests/critical-path/database/import-databases.e2e.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ const racompassValidJson = 'racompass-valid.json';
1616
const racompassInvalidJson = 'racompass-invalid.json';
1717
const rdmFullJson = 'rdm-full.json';
1818
const ardmValidAno = 'ardm-valid.ano';
19-
const listOfDB = JSON.parse(fs.readFileSync(path.join('test-data', 'rdm-full.json'), 'utf-8'));
19+
const listOfDB = JSON.parse(fs.readFileSync(path.join('test-data', 'import-databases', 'rdm-full.json'), 'utf-8'));
2020
const dbSuccessNames = listOfDB.filter(element => element.result === 'success').map(item => item.name);
2121
const dbPartialNames = listOfDB.filter(element => element.result === 'partial').map(item => item.name);
2222
const dbFailedNames = listOfDB.filter(element => element.result === 'failed').map(item => item.name);
2323
const dbImportedNames = [...dbSuccessNames, ...dbPartialNames];
2424
const rdmData = {
2525
type: 'rdm',
26-
path: path.join('..', '..', '..', 'test-data', rdmFullJson),
26+
path: path.join('..', '..', '..', 'test-data', 'import-databases', rdmFullJson),
2727
connectionType: 'Cluster',
2828
successNumber: dbSuccessNames.length,
2929
partialNumber: dbPartialNames.length,
@@ -32,15 +32,16 @@ const rdmData = {
3232
const dbData = [
3333
{
3434
type: 'racompass',
35-
path: path.join('..', '..', '..', 'test-data', racompassValidJson),
35+
path: path.join('..', '..', '..', 'test-data', 'import-databases', racompassValidJson),
3636
dbNames: ['racompassCluster', 'racompassDbWithIndex:8100 [1]']
3737
},
3838
{
3939
type: 'ardm',
40-
path: path.join('..', '..', '..', 'test-data', ardmValidAno),
40+
path: path.join('..', '..', '..', 'test-data', 'import-databases', ardmValidAno),
4141
dbNames: ['ardmNoName:12001', 'ardmWithPassAndUsername']
4242
}
4343
];
44+
const racompassInvalidJsonPath = path.join('..', '..', '..', 'test-data', 'import-databases', racompassInvalidJson);
4445
// List of all created databases to delete
4546
const databases = [
4647
dbData[0].dbNames[0],
@@ -79,7 +80,7 @@ test('Connection import from JSON', async t => {
7980

8081
// Verify that user see the message when parse error appears
8182
await t
82-
.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [path.join('..', '..', '..', 'test-data', racompassInvalidJson)])
83+
.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [racompassInvalidJsonPath])
8384
.click(myRedisDatabasePage.submitImportBtn)
8485
.expect(myRedisDatabasePage.failedImportMessage.exists).ok('Failed to add database message not displayed')
8586
.expect(myRedisDatabasePage.failedImportMessage.textContent).contains(parseFailedMsg)

0 commit comments

Comments
 (0)