Skip to content

Commit 5d29999

Browse files
mariasergeenkomariasergeenko
committed
add logs
1 parent 0d819bd commit 5d29999

File tree

3 files changed

+37
-39
lines changed

3 files changed

+37
-39
lines changed

‎tests/e2e/helpers/api/api-database.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ export class DatabaseAPIRequests {
203203
*/
204204
async deleteAllDatabasesApi(): Promise<void> {
205205
const allDatabases = await this.getAllDatabases();
206+
console.log(`common db count is "${allDatabases}"`);
207+
let counter = 0;
206208
if (allDatabases.length > 0) {
207209
const databaseIds: string[] = [];
208210
for (let i = 0; i < allDatabases.length; i++) {
@@ -215,10 +217,12 @@ export class DatabaseAPIRequests {
215217
ResourcePath.Databases,
216218
requestBody
217219
);
220+
++counter;
218221
await t.expect(await response.status).eql(200);
219222
}
220223
await this.deleteAllDatabasesByConnectionTypeApi('SENTINEL');
221224
}
225+
console.log(`common deleted db count is "${counter}"`);
222226
}
223227

224228
/**

‎tests/e2e/tests/critical-path/database/export-databases.e2e.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ test
3939
// Delete all databases
4040
fs.unlinkSync(joinPath(fileDownloadPath, foundExportedFiles[0]));
4141
await databaseAPIRequests.deleteAllDatabasesApi();
42-
await databaseAPIRequests.deleteOSSClusterDatabaseApi(ossClusterConfig);
42+
// await databaseAPIRequests.deleteOSSClusterDatabaseApi(ossClusterConfig);
4343
// Delete exported file
4444
})('Exporting Standalone, OSS Cluster, and Sentinel connection types', async t => {
4545
const databaseNames = [
@@ -70,7 +70,7 @@ test
7070

7171
// Delete databases
7272
await databaseAPIRequests.deleteAllDatabasesApi();
73-
await databaseAPIRequests.deleteOSSClusterDatabaseApi(ossClusterConfig);
73+
// await databaseAPIRequests.deleteOSSClusterDatabaseApi(ossClusterConfig);
7474
await myRedisDatabasePage.reloadPage();
7575

7676
const exportedData = {

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

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -90,47 +90,41 @@ fixture `Import databases`
9090
// Delete all existing connections
9191
await databaseAPIRequests.deleteAllDatabasesApi();
9292
});
93-
test
94-
.before(async() => {
95-
await databaseAPIRequests.deleteAllDatabasesApi();
96-
await databaseHelper.acceptLicenseTerms();
97-
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
98-
await myRedisDatabasePage.reloadPage();
99-
})('Connection import modal window', async t => {
100-
const tooltipText = 'Import Database Connections';
101-
const defaultText = 'Select or drag and drop a file';
102-
const parseFailedMsg = 'Failed to add database connections';
103-
const parseFailedMsg2 = `Unable to parse ${fileNames.racompassInvalidJson}`;
93+
test('Connection import modal window', async t => {
94+
const tooltipText = 'Import Database Connections';
95+
const defaultText = 'Select or drag and drop a file';
96+
const parseFailedMsg = 'Failed to add database connections';
97+
const parseFailedMsg2 = `Unable to parse ${fileNames.racompassInvalidJson}`;
10498

105-
// Verify that user can see the “Import Database Connections” tooltip
106-
await t.expect(myRedisDatabasePage.importDatabasesBtn.visible).ok('The import databases button not displayed');
107-
await t.hover(myRedisDatabasePage.importDatabasesBtn);
108-
await t.expect(browserPage.tooltip.innerText).contains(tooltipText, 'The tooltip message not displayed/correct');
99+
// Verify that user can see the “Import Database Connections” tooltip
100+
await t.expect(myRedisDatabasePage.importDatabasesBtn.visible).ok('The import databases button not displayed');
101+
await t.hover(myRedisDatabasePage.importDatabasesBtn);
102+
await t.expect(browserPage.tooltip.innerText).contains(tooltipText, 'The tooltip message not displayed/correct');
109103

110-
// Verify that Import dialogue is not closed when clicking any area outside the box
111-
await t.click(myRedisDatabasePage.importDatabasesBtn);
112-
await t.expect(myRedisDatabasePage.importDbDialog.exists).ok('Import Database Connections dialog not opened');
113-
await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
114-
await t.expect(myRedisDatabasePage.importDbDialog.exists).ok('Import Database Connections dialog not displayed');
104+
// Verify that Import dialogue is not closed when clicking any area outside the box
105+
await t.click(myRedisDatabasePage.importDatabasesBtn);
106+
await t.expect(myRedisDatabasePage.importDbDialog.exists).ok('Import Database Connections dialog not opened');
107+
await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
108+
await t.expect(myRedisDatabasePage.importDbDialog.exists).ok('Import Database Connections dialog not displayed');
115109

116-
// Verify that user see the message when parse error appears
117-
await t
118-
.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [filePathes.racompassInvalidJsonPath])
119-
.click(myRedisDatabasePage.submitImportBtn)
120-
.expect(myRedisDatabasePage.failedImportMessage.exists).ok('Failed to add database message not displayed')
121-
.expect(myRedisDatabasePage.failedImportMessage.textContent).contains(parseFailedMsg)
122-
.expect(myRedisDatabasePage.failedImportMessage.textContent).contains(parseFailedMsg2);
110+
// Verify that user see the message when parse error appears
111+
await t
112+
.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [filePathes.racompassInvalidJsonPath])
113+
.click(myRedisDatabasePage.submitImportBtn)
114+
.expect(myRedisDatabasePage.failedImportMessage.exists).ok('Failed to add database message not displayed')
115+
.expect(myRedisDatabasePage.failedImportMessage.textContent).contains(parseFailedMsg)
116+
.expect(myRedisDatabasePage.failedImportMessage.textContent).contains(parseFailedMsg2);
123117

124-
// Verify that user can remove file from import input
125-
await t.click(myRedisDatabasePage.closeDialogBtn);
126-
await t.click(myRedisDatabasePage.importDatabasesBtn);
127-
await t.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [rdmData.path]);
128-
// update after resolving testcafe Native Automation mode limitations
129-
// await t.expect(myRedisDatabasePage.importDbDialog.textContent).contains(fileNames.rdmFullJson, 'Filename not displayed in import input');
130-
// Click on remove button
131-
await t.click(myRedisDatabasePage.removeImportedFileBtn);
132-
await t.expect(myRedisDatabasePage.importDbDialog.textContent).contains(defaultText, 'File not removed from import input');
133-
});
118+
// Verify that user can remove file from import input
119+
await t.click(myRedisDatabasePage.closeDialogBtn);
120+
await t.click(myRedisDatabasePage.importDatabasesBtn);
121+
await t.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [rdmData.path]);
122+
// update after resolving testcafe Native Automation mode limitations
123+
// await t.expect(myRedisDatabasePage.importDbDialog.textContent).contains(fileNames.rdmFullJson, 'Filename not displayed in import input');
124+
// Click on remove button
125+
await t.click(myRedisDatabasePage.removeImportedFileBtn);
126+
await t.expect(myRedisDatabasePage.importDbDialog.textContent).contains(defaultText, 'File not removed from import input');
127+
});
134128
test('Connection import from JSON', async t => {
135129
// Verify that user can import database with mandatory/optional fields
136130
await databasesActions.importDatabase(rdmData);

0 commit comments

Comments
 (0)