Skip to content

Commit 77bc5db

Browse files
committed
added tests for show process results for importeed databases
1 parent 017af2c commit 77bc5db

File tree

9 files changed

+115
-184
lines changed

9 files changed

+115
-184
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
- ./plugins:/usr/src/app/plugins
1313
- .redisinsight-v2:/root/.redisinsight-v2
1414
- .ritmp:/tmp
15+
- ./test-data/certs:/root/certs
1516
env_file:
1617
- ./.env
1718
entrypoint: [
@@ -40,4 +41,5 @@ services:
4041
volumes:
4142
- .redisinsight-v2:/root/.redisinsight-v2
4243
- .ritmp:/tmp
44+
- ./test-data/certs:/root/certs
4345

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ services:
1010
- ./results:/usr/src/app/results
1111
- ./plugins:/usr/src/app/plugins
1212
- .redisinsight-v2:/root/.redisinsight-v2
13+
- ./test-data/certs:/root/certs
1314
env_file:
1415
- ./.env
1516
environment:
@@ -41,5 +42,6 @@ services:
4142
dockerfile: Dockerfile
4243
volumes:
4344
- .redisinsight-v2:/root/.redisinsight-v2
45+
- ./test-data/certs:/root/certs
4446
ports:
4547
- 5000:5000

tests/e2e/pageObjects/browser-page.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ export class BrowserPage {
2626
setDeleteButton = Selector('[data-testid=set-delete-btn]');
2727
streamDeleteButton = Selector('[data-testid=stream-delete-btn]');
2828
myRedisDbIcon = Selector('[data-testid=my-redis-db-icon]');
29-
streamDeleteButton = Selector('[data-testid=stream-delete-btn]');
30-
myRedisDbIcon = Selector('[data-testid=my-redis-db-icon]');
3129
deleteKeyButton = Selector('[data-testid=delete-key-btn]');
3230
confirmDeleteKeyButton = Selector('[data-testid=delete-key-confirm-btn]');
3331
editKeyTTLButton = Selector('[data-testid=edit-ttl-btn]');

tests/e2e/test-data/certs/ca.crt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-----BEGIN CERTIFICATE-----
2+
mockedCACertificate
3+
-----END CERTIFICATE-----
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-----BEGIN CERTIFICATE-----
2+
mockedClientCrt
3+
-----END CERTIFICATE-----
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-----BEGIN PRIVATE KEY-----
2+
mockedPrivateKey
3+
-----END PRIVATE KEY-----

tests/e2e/test-data/rdm-full.json

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
"port": 8102,
3333
"name": "rdmHost+Port+Name+Index",
3434
"db": 2,
35-
"result": "success"
35+
"result": "success",
36+
"indName": "rdmHost+Port+Name+Index [2]"
3637
},
3738
{
3839
"host": "localhost",
@@ -48,44 +49,44 @@
4849
"host": "localhost",
4950
"port": 8102,
5051
"name": "rdmHost+Port+Name+CaCert",
51-
"ssl_ca_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/ca.crt",
52+
"ssl_ca_cert_path": "/root/certs/ca.crt",
5253
"result": "success"
5354
},
5455
{
5556
"host": "localhost",
5657
"port": 8102,
5758
"name": "rdmHost+Port+Name+clientCert+privateKey",
5859
"ssl": true,
59-
"ssl_local_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.crt",
60-
"ssl_private_key_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.key",
60+
"ssl_local_cert_path": "/root/certs/client.crt",
61+
"ssl_private_key_path": "/root/certs/client.key",
6162
"result": "success"
6263
},
6364
{
6465
"host": "localhost",
6566
"port": 8102,
6667
"name": "rdmHost+Port+Name+CaCert+clientCert+privateKey",
67-
"ssl_ca_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/ca.crt",
68-
"ssl_local_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.crt",
69-
"ssl_private_key_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.key",
68+
"ssl_ca_cert_path": "/root/certs/ca.crt",
69+
"ssl_local_cert_path": "/root/certs/client.crt",
70+
"ssl_private_key_path": "/root/certs/client.key",
7071
"result": "success"
7172
},
7273
{
7374
"host": "localhost",
7475
"port": 8102,
7576
"name": "rdmHost+Port+Name+CaCert+clientCert+privateKey(notbypath)",
76-
"ssl_ca_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/ca.crt",
77-
"ssl_local_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.crt",
78-
"ssl_private_key_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.key",
77+
"ssl_ca_cert_path": "/root/certs/ca.crt",
78+
"ssl_local_cert_path": "/root/certs/client.crt",
79+
"ssl_private_key_path": "/root/certs/client.key",
7980
"result": "success"
8081
},
8182
{
8283
"host": "172.30.100.103",
8384
"port": 6379,
8485
"name": "rdmHost+Port+Name+username+pass+CaCert+clientCert+privateKey",
8586
"ssl": true,
86-
"ssl_ca_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/ca.crt",
87-
"ssl_local_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.crt",
88-
"ssl_private_key_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.key",
87+
"ssl_ca_cert_path": "/root/certs/ca.crt",
88+
"ssl_local_cert_path": "/root/certs/client.crt",
89+
"ssl_private_key_path": "/root/certs/client.key",
8990
"username": "admin",
9091
"auth": "pass",
9192
"result": "success"
@@ -156,29 +157,29 @@
156157
"host": "localhost",
157158
"port": 8103,
158159
"name": "rdmOnlyClientCert",
159-
"ssl_local_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.crt",
160+
"ssl_local_cert_path": "/root/certs/client.crt",
160161
"result": "partial"
161162
},
162163
{
163164
"host": "localhost",
164165
"port": 8103,
165166
"name": "rdmOnlyPrivateKey",
166-
"ssl_private_key_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.key",
167+
"ssl_private_key_path": "/root/certs/client.key",
167168
"result": "partial"
168169
},
169170
{
170171
"host": "localhost",
171172
"port": 8103,
172173
"name": "rdmInvalidClientCert",
173174
"ssl_local_cert_path": "invalid client cert",
174-
"ssl_private_key_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.key",
175+
"ssl_private_key_path": "/root/certs/client.key",
175176
"result": "partial"
176177
},
177178
{
178179
"host": "localhost",
179180
"port": 8103,
180181
"name": "rdmInvalidPrivateKey",
181-
"ssl_local_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/client.crt",
182+
"ssl_local_cert_path": "/root/certs/client.crt",
182183
"ssl_private_key_path": "invalid private key",
183184
"result": "partial"
184185
},
@@ -204,15 +205,15 @@
204205
"host": "localhost",
205206
"port": 8103,
206207
"name": "rdmCaCertInvalidPath",
207-
"ssl_ca_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/caInvalid.crt",
208+
"ssl_ca_cert_path": "/root/certs/caInvalid.crt",
208209
"result": "partial"
209210
},
210211
{
211212
"host": "localhost",
212213
"port": 8103,
213214
"name": "rdmClientCert+PrivateKeyInvalidPathes",
214-
"ssl_local_cert_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/clientInvalid.crt",
215-
"ssl_private_key_path": "C:/Projects/redisinsight-redis/RedisInsight/tests/e2e/.redisinsight-v2/clientInvalid.key",
215+
"ssl_local_cert_path": "/root/certs/clientInvalid.crt",
216+
"ssl_private_key_path": "/root/certs/clientInvalid.key",
216217
"result": "partial"
217218
}
218219
]

tests/e2e/test-data/rdm-valid.json

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

0 commit comments

Comments
 (0)