aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-08-22 15:12:44 +0200
committerChocobozzz <me@florianbigard.com>2019-08-22 15:12:44 +0200
commit446d9f8cc7f12fbbf3d8643f5d3414822a18c51d (patch)
tree60b8deb176c548fd7d55ff2eefad76e143fdbb97 /client
parent26ff0279d08bc5d4cb13a2f71e314b05d544da89 (diff)
downloadPeerTube-446d9f8cc7f12fbbf3d8643f5d3414822a18c51d.tar.gz
PeerTube-446d9f8cc7f12fbbf3d8643f5d3414822a18c51d.tar.zst
PeerTube-446d9f8cc7f12fbbf3d8643f5d3414822a18c51d.zip
Fix e2e tests
Diffstat (limited to 'client')
-rw-r--r--client/angular.json6
-rw-r--r--client/e2e/proxy.config.json37
2 files changed, 41 insertions, 2 deletions
diff --git a/client/angular.json b/client/angular.json
index e1e4f4850..950ac059e 100644
--- a/client/angular.json
+++ b/client/angular.json
@@ -86,7 +86,8 @@
86 "options": { 86 "options": {
87 "baseHref": "/", 87 "baseHref": "/",
88 "deployUrl": "client/", 88 "deployUrl": "client/",
89 "browserTarget": "PeerTube:build" 89 "browserTarget": "PeerTube:build",
90 "proxyConfig": "proxy.config.json"
90 }, 91 },
91 "configurations": { 92 "configurations": {
92 "production": { 93 "production": {
@@ -96,7 +97,8 @@
96 "browserTarget": "PeerTube:build:hmr" 97 "browserTarget": "PeerTube:build:hmr"
97 }, 98 },
98 "e2e": { 99 "e2e": {
99 "browserTarget": "PeerTube:build:e2e" 100 "browserTarget": "PeerTube:build:e2e",
101 "proxyConfig": "e2e/proxy.config.json"
100 } 102 }
101 } 103 }
102 }, 104 },
diff --git a/client/e2e/proxy.config.json b/client/e2e/proxy.config.json
new file mode 100644
index 000000000..00bda5eb7
--- /dev/null
+++ b/client/e2e/proxy.config.json
@@ -0,0 +1,37 @@
1{
2 "/api": {
3 "target": "http://localhost:9000",
4 "secure": false
5 },
6 "/plugins": {
7 "target": "http://localhost:9000",
8 "secure": false
9 },
10 "/themes": {
11 "target": "http://localhost:9000",
12 "secure": false
13 },
14 "/static": {
15 "target": "http://localhost:9000",
16 "secure": false
17 },
18 "/lazy-static": {
19 "target": "http://localhost:9000",
20 "secure": false
21 },
22 "/socket.io": {
23 "target": "ws://localhost:9000",
24 "secure": false,
25 "ws": true
26 },
27 "/!(client)**": {
28 "target": "http://localhost:3333/client/index.html",
29 "secure": false,
30 "logLevel": "debug"
31 },
32 "/!(client)**/**": {
33 "target": "http://localhost:3333/client/index.html",
34 "secure": false,
35 "logLevel": "debug"
36 }
37}