Merge pull request #1511 from RedisInsight/e2e/feature/RI-3853_Show-process-results-for-imported-databases

vlad-dargel · web-flow · commit da974af94ce5 · 2022-12-19T19:01:35.000+03:00
E2e/feature/ri 3853 show process results for imported databases
diff --git a/tests/e2e/common-actions/databases-actions.ts b/tests/e2e/common-actions/databases-actions.ts
@@ -24,9 +24,8 @@ export class DatabasesActions {
             .click(myRedisDatabasePage.importDatabasesBtn)
             .setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [fileParameters.path])
             .click(myRedisDatabasePage.submitImportBtn)
-            .expect(myRedisDatabasePage.successImportMessage.exists).ok(`Successfully added ${fileParameters.type} databases message not displayed`);
+            .expect(myRedisDatabasePage.importDialogTitle.textContent).eql('Import Results', `Databases from ${fileParameters.type} not imported`);
     }
-
 }
 
 /**
diff --git a/tests/e2e/docker.web.docker-compose.yml b/tests/e2e/docker.web.docker-compose.yml
@@ -12,6 +12,7 @@ services:
       - ./plugins:/usr/src/app/plugins
       - .redisinsight-v2:/root/.redisinsight-v2
       - .ritmp:/tmp
+      - ./test-data/certs:/root/certs
     env_file:
       - ./.env
     entrypoint: [
@@ -40,4 +41,5 @@ services:
     volumes:
       - .redisinsight-v2:/root/.redisinsight-v2
       - .ritmp:/tmp
+      - ./test-data/certs:/root/certs
 
diff --git a/tests/e2e/local.web.docker-compose.yml b/tests/e2e/local.web.docker-compose.yml
@@ -10,6 +10,7 @@ services:
       - ./results:/usr/src/app/results
       - ./plugins:/usr/src/app/plugins
       - .redisinsight-v2:/root/.redisinsight-v2
+      - ./test-data/certs:/root/certs
     env_file:
       - ./.env
     environment:
@@ -41,5 +42,6 @@ services:
       dockerfile: Dockerfile
     volumes:
       - .redisinsight-v2:/root/.redisinsight-v2
+      - ./test-data/certs:/root/certs
     ports:
       - 5000:5000
diff --git a/tests/e2e/pageObjects/browser-page.ts b/tests/e2e/pageObjects/browser-page.ts
@@ -26,8 +26,6 @@ export class BrowserPage {
     setDeleteButton = Selector('[data-testid=set-delete-btn]');
     streamDeleteButton = Selector('[data-testid=stream-delete-btn]');
     myRedisDbIcon = Selector('[data-testid=my-redis-db-icon]');
-    streamDeleteButton = Selector('[data-testid=stream-delete-btn]');
-    myRedisDbIcon = Selector('[data-testid=my-redis-db-icon]');
     deleteKeyButton = Selector('[data-testid=delete-key-btn]');
     confirmDeleteKeyButton = Selector('[data-testid=delete-key-confirm-btn]');
     editKeyTTLButton = Selector('[data-testid=edit-ttl-btn]');
diff --git a/tests/e2e/pageObjects/my-redis-databases-page.ts b/tests/e2e/pageObjects/my-redis-databases-page.ts
@@ -7,6 +7,8 @@ export class MyRedisDatabasePage {
     //*Target any element/component via data-id, if possible!
     //*The following categories are ordered alphabetically (Alerts, Buttons, Checkboxes, etc.).
     //-------------------------------------------------------------------------------------------
+    // CSS Selectors
+    cssNumberOfDbs = '[data-testid=number-of-dbs]';
     //BUTTONS
     settingsButton = Selector('[data-testid=settings-page-btn]');
     workbenchButton = Selector('[data-testid=workbench-page-btn]');
@@ -63,8 +65,12 @@ export class MyRedisDatabasePage {
     noResultsFoundText = Selector('div').withExactText('No databases matched your search. Try reducing the criteria.');
     failedImportMessage = Selector('[data-testid=result-failed]');
     successImportMessage = Selector('[data-testid=result-success]');
+    importDialogTitle = Selector('[data-testid=import-dbs-dialog-title]');
     // DIALOG
     importDbDialog = Selector('[data-testid=import-dbs-dialog]');
+    successResultsAccordion = Selector('[data-testid^=success-results-]');
+    partialResultsAccordion = Selector('[data-testid^=partial-results-]');
+    failedResultsAccordion = Selector('[data-testid^=failed-results-]');
 
     /**
      * Click on the database by name
diff --git a/tests/e2e/test-data/certs/ca.crt b/tests/e2e/test-data/certs/ca.crt
@@ -0,0 +1,3 @@
+-----BEGIN CERTIFICATE-----
+mockedCACertificate
+-----END CERTIFICATE-----
diff --git a/tests/e2e/test-data/certs/client.crt b/tests/e2e/test-data/certs/client.crt
@@ -0,0 +1,3 @@
+-----BEGIN CERTIFICATE-----
+mockedClientCrt
+-----END CERTIFICATE-----
diff --git a/tests/e2e/test-data/certs/client.key b/tests/e2e/test-data/certs/client.key
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+mockedPrivateKey
+-----END PRIVATE KEY-----
diff --git a/tests/e2e/test-data/import-databases/racompass-invalid.json b/tests/e2e/test-data/import-databases/racompass-invalid.json
@@ -167,5 +167,4 @@
 		"id": "f99a5d6d-daf4-489c-885b-6f8e411adbc9",
 		"cluster": true,
 		"name": "vd long host"
-	}
 ]
diff --git a/tests/e2e/test-data/import-databases/racompass-valid.json b/tests/e2e/test-data/import-databases/racompass-valid.json
diff --git a/tests/e2e/test-data/import-databases/rdm-full.json b/tests/e2e/test-data/import-databases/rdm-full.json
@@ -0,0 +1,219 @@
+[
+    {
+        "host": "localhost",
+        "port": 8100,
+		"name": "rdmHost+Port+Name",
+        "result": "success"
+    },
+	{
+        "host": "localhost",
+		"port": 8101,
+		"name": "rdmHost+Port+Name+Username+Password",
+        "username": "rdmUsername",
+        "auth": "rdmAuth",
+        "result": "success"
+    },
+	{
+        "host": "172.30.100.151",
+        "port": 6379,
+		"name": "rdmHost+Port+Name+ClusterTrue",
+		"cluster": true,
+        "result": "success"
+    },
+	{
+        "host": "172.30.100.151",
+        "port": 6379,
+		"name": "rdmHost+Port+Name+ClusterFalse",
+		"cluster": false,
+        "result": "success"
+    },
+	{
+        "host": "localhost",
+        "port": 8102,
+		"name": "rdmHost+Port+Name+Index",
+		"db": 2,
+        "result": "success",
+        "indName": "rdmHost+Port+Name+Index [2]"
+    },
+	{
+        "host": "localhost",
+        "port": 8102,
+		"name": "rdmHost+Port+Name+otherFields",
+        "ssh_port": 22,
+        "timeout_connect": 60000,
+        "timeout_execute": 60000,
+		"other_field": "inv",
+        "result": "success"
+    },
+	{
+        "host": "localhost",
+        "port": 8102,
+		"name": "rdmHost+Port+Name+CaCert",
+		"ssl_ca_cert_path": "/root/certs/ca.crt",
+        "result": "success"
+    },
+	{
+        "host": "localhost",
+        "port": 8102,
+		"name": "rdmHost+Port+Name+clientCert+privateKey",
+		"ssl": true,
+		"ssl_local_cert_path": "/root/certs/client.crt",
+		"ssl_private_key_path": "/root/certs/client.key",
+        "result": "success"
+    },
+	{
+        "host": "localhost",
+        "port": 8102,
+		"name": "rdmHost+Port+Name+CaCert+clientCert+privateKey",
+		"ssl_ca_cert_path": "/root/certs/ca.crt",
+		"ssl_local_cert_path": "/root/certs/client.crt",
+		"ssl_private_key_path": "/root/certs/client.key",
+        "result": "success"
+    },
+	{
+        "host": "localhost",
+        "port": 8102,
+		"name": "rdmHost+Port+Name+CaCert+clientCert+privateKey(notbypath)",
+		"ssl_ca_cert_path": "/root/certs/ca.crt",
+		"ssl_local_cert_path": "/root/certs/client.crt",
+		"ssl_private_key_path": "/root/certs/client.key",
+        "result": "success"
+    },
+	{
+        "host": "172.30.100.103",
+        "port": 6379,
+		"name": "rdmHost+Port+Name+username+pass+CaCert+clientCert+privateKey",
+		"ssl": true,
+		"ssl_ca_cert_path": "/root/certs/ca.crt",
+		"ssl_local_cert_path": "/root/certs/client.crt",
+		"ssl_private_key_path": "/root/certs/client.key",
+		"username": "admin",
+        "auth": "pass",
+        "result": "success"
+    },
+	{
+        "host": "redis-13237.c263.us-east-1-2.ec2.cloud.redislabs.com",
+        "port": 13237,
+		"name": "rdmHost+Port+Name CloudDb",
+        "auth": "fRVdFcJftYnVoJmTCuiAPW6yu9qimXA1",
+        "result": "success"
+    },
+	{
+        "host": "3.85.88.37",
+        "port": 14547,
+		"name": "rdmHost+Port+Name Cluster+CloudDb",
+        "auth": "Admin123!",
+        "result": "success"
+    },
+	{
+        "host": "172.30.100.201",
+        "port": 6379,
+		"name": "rdmHost+Port+Name Sentinel",
+        "auth": "defaultpass",
+        "result": "success"
+    },
+	{
+        "port": 8100,
+		"name": "rdmnoHost",
+        "result": "failed"
+    },
+	{
+        "host": "localhost",
+		"name": "rdmnoPort",
+        "result": "failed"
+    },
+    {
+        "name": "rdmnoHost+noPort",
+        "result": "failed"
+    },
+
+	{
+        "host": "rdmLargeName",
+		"port": "8101",
+		"name": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed consectetur metus in libero pretium congue. Curabitur eget eleifend nibh, cursus tincidunt lorem. Vivamus magna erat, vestibulum at sem et, bibendum volutpat velit. Cras dapibus lorem quam, at efficitur mi sollicitudin id. Vivamus dapibus nec elit ut tincidunt. Sed porta tempus lorem id iaculis. Vestibulum ut arcu vitae massa dapibus egestas. Suspendisse ante tortor, tristique vel malesuada id, finibus et libero. Nulla suscipit libero.1",
+        "result": "failed"
+    },
+	{
+        "host": "localhost",
+        "port": 65536,
+		"name": "rdmLargePort",
+        "result": "failed"
+    },
+	{
+        "host": "localhost",
+        "port": 8103,
+		"name": "rdmIndexNotNumber",
+		"db": "dsad",
+        "result": "failed"
+    },
+	{
+        "host": "localhost",
+        "port": 8102,
+		"name": "rdmCaCertInvalidBody",
+		"ssl_ca_cert_path": "invalid body",
+        "result": "partial"
+    },
+	{
+        "host": "localhost",
+        "port": 8103,
+		"name": "rdmOnlyClientCert",
+		"ssl_local_cert_path": "/root/certs/client.crt",
+        "result": "partial"
+    },
+	{
+        "host": "localhost",
+        "port": 8103,
+		"name": "rdmOnlyPrivateKey",
+		"ssl_private_key_path": "/root/certs/client.key",
+        "result": "partial"
+    },
+	{
+        "host": "localhost",
+        "port": 8103,
+		"name": "rdmInvalidClientCert",
+		"ssl_local_cert_path": "invalid client cert",
+		"ssl_private_key_path": "/root/certs/client.key",
+        "result": "partial"
+    },
+	{
+        "host": "localhost",
+        "port": 8103,
+		"name": "rdmInvalidPrivateKey",
+		"ssl_local_cert_path": "/root/certs/client.crt",
+		"ssl_private_key_path": "invalid private key",
+        "result": "partial"
+    },
+	    {
+        "auth": "",
+        "db_scan_limit": 21,
+        "host": "127.0.0.1",
+        "keys_pattern": "*1",
+        "lua_keys_loading": true,
+        "name": "rdmInvalidAllCertificates",
+        "namespace_separator": ":3",
+        "port": 8100,
+        "ssh_port": 22,
+        "ssl": false,
+        "ssl_ca_cert_path": "fdsafsadfsad",
+        "ssl_local_cert_path": "fsdfds",
+        "ssl_private_key_path": "fdsafasdf",
+        "timeout_connect": 61000,
+        "timeout_execute": 61000,
+        "result": "partial"
+    },
+	{
+        "host": "localhost",
+        "port": 8103,
+		"name": "rdmCaCertInvalidPath",
+		"ssl_ca_cert_path": "/root/certs/caInvalid.crt",
+        "result": "partial"
+    },
+	{
+        "host": "localhost",
+        "port": 8103,
+		"name": "rdmClientCert+PrivateKeyInvalidPathes",
+		"ssl_local_cert_path": "/root/certs/clientInvalid.crt",
+		"ssl_private_key_path": "/root/certs/clientInvalid.key",
+        "result": "partial"
+    }
+]
diff --git a/tests/e2e/test-data/rdm-valid.json b/tests/e2e/test-data/rdm-valid.json
diff --git a/tests/e2e/tests/critical-path/database/import-databases.e2e.ts b/tests/e2e/tests/critical-path/database/import-databases.e2e.ts

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,8 @@ export class DatabasesActions {`
`24`	`24`	`.click(myRedisDatabasePage.importDatabasesBtn)`
`25`	`25`	`.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [fileParameters.path])`
`26`	`26`	`.click(myRedisDatabasePage.submitImportBtn)`
`27`		- .expect(myRedisDatabasePage.successImportMessage.exists).ok(`Successfully added ${fileParameters.type} databases message not displayed`);
	`27`	+ .expect(myRedisDatabasePage.importDialogTitle.textContent).eql('Import Results', `Databases from ${fileParameters.type} not imported`);
`28`	`28`	`}`
`29`		`-`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-----BEGIN CERTIFICATE-----`
	`2`	`+mockedCACertificate`
	`3`	`+-----END CERTIFICATE-----`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-----BEGIN CERTIFICATE-----`
	`2`	`+mockedClientCrt`
	`3`	`+-----END CERTIFICATE-----`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-----BEGIN PRIVATE KEY-----`
	`2`	`+mockedPrivateKey`
	`3`	`+-----END PRIVATE KEY-----`
Original file line number	Diff line number	Diff line change
`@@ -167,5 +167,4 @@`
`167`	`167`	`"id": "f99a5d6d-daf4-489c-885b-6f8e411adbc9",`
`168`	`168`	`"cluster": true,`
`169`	`169`	`"name": "vd long host"`
`170`		`- }`
`171`	`170`	`]`