diff options
author | Chocobozzz <me@florianbigard.com> | 2022-12-09 11:14:47 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-12-12 13:36:23 +0100 |
commit | 2732eeff9e6994582293b5aaa0cb158b7e272e9e (patch) | |
tree | 417d30cf470cd1db84e06c5dbd1b5429d4b99bc1 /server/tests/external-plugins | |
parent | c7c5f8d0f17b0ab598fbe237f11639c6de28110c (diff) | |
download | PeerTube-2732eeff9e6994582293b5aaa0cb158b7e272e9e.tar.gz PeerTube-2732eeff9e6994582293b5aaa0cb158b7e272e9e.tar.zst PeerTube-2732eeff9e6994582293b5aaa0cb158b7e272e9e.zip |
Fix CI using 127.0.0.1 for tests
Diffstat (limited to 'server/tests/external-plugins')
-rw-r--r-- | server/tests/external-plugins/auth-ldap.ts | 4 | ||||
-rw-r--r-- | server/tests/external-plugins/auto-block-videos.ts | 2 | ||||
-rw-r--r-- | server/tests/external-plugins/auto-mute.ts | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/server/tests/external-plugins/auth-ldap.ts b/server/tests/external-plugins/auth-ldap.ts index 6f6a574a0..d51d337be 100644 --- a/server/tests/external-plugins/auth-ldap.ts +++ b/server/tests/external-plugins/auth-ldap.ts | |||
@@ -32,7 +32,7 @@ describe('Official plugin auth-ldap', function () { | |||
32 | 'mail-property': 'mail', | 32 | 'mail-property': 'mail', |
33 | 'search-base': 'ou=people,dc=planetexpress,dc=com', | 33 | 'search-base': 'ou=people,dc=planetexpress,dc=com', |
34 | 'search-filter': '(|(mail={{username}})(uid={{username}}))', | 34 | 'search-filter': '(|(mail={{username}})(uid={{username}}))', |
35 | 'url': 'ldap://localhost:390', | 35 | 'url': 'ldap://127.0.0.1:390', |
36 | 'username-property': 'uid' | 36 | 'username-property': 'uid' |
37 | } | 37 | } |
38 | }) | 38 | }) |
@@ -50,7 +50,7 @@ describe('Official plugin auth-ldap', function () { | |||
50 | 'mail-property': 'mail', | 50 | 'mail-property': 'mail', |
51 | 'search-base': 'ou=people,dc=planetexpress,dc=com', | 51 | 'search-base': 'ou=people,dc=planetexpress,dc=com', |
52 | 'search-filter': '(|(mail={{username}})(uid={{username}}))', | 52 | 'search-filter': '(|(mail={{username}})(uid={{username}}))', |
53 | 'url': 'ldap://localhost:10389', | 53 | 'url': 'ldap://127.0.0.1:10389', |
54 | 'username-property': 'uid' | 54 | 'username-property': 'uid' |
55 | } | 55 | } |
56 | }) | 56 | }) |
diff --git a/server/tests/external-plugins/auto-block-videos.ts b/server/tests/external-plugins/auto-block-videos.ts index 7df0b3390..d14587c38 100644 --- a/server/tests/external-plugins/auto-block-videos.ts +++ b/server/tests/external-plugins/auto-block-videos.ts | |||
@@ -64,7 +64,7 @@ describe('Official plugin auto-block videos', function () { | |||
64 | await servers[0].plugins.updateSettings({ | 64 | await servers[0].plugins.updateSettings({ |
65 | npmName: 'peertube-plugin-auto-block-videos', | 65 | npmName: 'peertube-plugin-auto-block-videos', |
66 | settings: { | 66 | settings: { |
67 | 'blocklist-urls': `http://localhost:${port}/blocklist`, | 67 | 'blocklist-urls': `http://127.0.0.1:${port}/blocklist`, |
68 | 'check-seconds-interval': 1 | 68 | 'check-seconds-interval': 1 |
69 | } | 69 | } |
70 | }) | 70 | }) |
diff --git a/server/tests/external-plugins/auto-mute.ts b/server/tests/external-plugins/auto-mute.ts index b4578cd90..440b58bfd 100644 --- a/server/tests/external-plugins/auto-mute.ts +++ b/server/tests/external-plugins/auto-mute.ts | |||
@@ -43,7 +43,7 @@ describe('Official plugin auto-mute', function () { | |||
43 | await servers[0].plugins.updateSettings({ | 43 | await servers[0].plugins.updateSettings({ |
44 | npmName: 'peertube-plugin-auto-mute', | 44 | npmName: 'peertube-plugin-auto-mute', |
45 | settings: { | 45 | settings: { |
46 | 'blocklist-urls': `http://localhost:${port}/blocklist`, | 46 | 'blocklist-urls': `http://127.0.0.1:${port}/blocklist`, |
47 | 'check-seconds-interval': 1 | 47 | 'check-seconds-interval': 1 |
48 | } | 48 | } |
49 | }) | 49 | }) |
@@ -55,7 +55,7 @@ describe('Official plugin auto-mute', function () { | |||
55 | blocklistServer.replace({ | 55 | blocklistServer.replace({ |
56 | data: [ | 56 | data: [ |
57 | { | 57 | { |
58 | value: 'localhost:' + servers[1].port | 58 | value: servers[1].host |
59 | } | 59 | } |
60 | ] | 60 | ] |
61 | }) | 61 | }) |
@@ -72,7 +72,7 @@ describe('Official plugin auto-mute', function () { | |||
72 | blocklistServer.replace({ | 72 | blocklistServer.replace({ |
73 | data: [ | 73 | data: [ |
74 | { | 74 | { |
75 | value: 'localhost:' + servers[1].port, | 75 | value: servers[1].host, |
76 | action: 'remove' | 76 | action: 'remove' |
77 | } | 77 | } |
78 | ] | 78 | ] |
@@ -90,7 +90,7 @@ describe('Official plugin auto-mute', function () { | |||
90 | blocklistServer.replace({ | 90 | blocklistServer.replace({ |
91 | data: [ | 91 | data: [ |
92 | { | 92 | { |
93 | value: 'root@localhost:' + servers[1].port | 93 | value: 'root@' + servers[1].host |
94 | } | 94 | } |
95 | ] | 95 | ] |
96 | }) | 96 | }) |
@@ -107,7 +107,7 @@ describe('Official plugin auto-mute', function () { | |||
107 | blocklistServer.replace({ | 107 | blocklistServer.replace({ |
108 | data: [ | 108 | data: [ |
109 | { | 109 | { |
110 | value: 'root@localhost:' + servers[1].port, | 110 | value: 'root@' + servers[1].host, |
111 | action: 'remove' | 111 | action: 'remove' |
112 | } | 112 | } |
113 | ] | 113 | ] |
@@ -122,7 +122,7 @@ describe('Official plugin auto-mute', function () { | |||
122 | it('Should auto mute an account, manually unmute it and do not remute it automatically', async function () { | 122 | it('Should auto mute an account, manually unmute it and do not remute it automatically', async function () { |
123 | this.timeout(20000) | 123 | this.timeout(20000) |
124 | 124 | ||
125 | const account = 'root@localhost:' + servers[1].port | 125 | const account = 'root@' + servers[1].host |
126 | 126 | ||
127 | blocklistServer.replace({ | 127 | blocklistServer.replace({ |
128 | data: [ | 128 | data: [ |
@@ -188,14 +188,14 @@ describe('Official plugin auto-mute', function () { | |||
188 | await servers[1].plugins.updateSettings({ | 188 | await servers[1].plugins.updateSettings({ |
189 | npmName: 'peertube-plugin-auto-mute', | 189 | npmName: 'peertube-plugin-auto-mute', |
190 | settings: { | 190 | settings: { |
191 | 'blocklist-urls': 'http://localhost:' + servers[0].port + autoMuteListPath, | 191 | 'blocklist-urls': 'http://' + servers[0].host + autoMuteListPath, |
192 | 'check-seconds-interval': 1, | 192 | 'check-seconds-interval': 1, |
193 | 'expose-mute-list': false | 193 | 'expose-mute-list': false |
194 | } | 194 | } |
195 | }) | 195 | }) |
196 | 196 | ||
197 | await servers[0].blocklist.addToServerBlocklist({ account: 'root@localhost:' + servers[1].port }) | 197 | await servers[0].blocklist.addToServerBlocklist({ account: 'root@' + servers[1].host }) |
198 | await servers[0].blocklist.addToMyBlocklist({ server: 'localhost:' + servers[1].port }) | 198 | await servers[0].blocklist.addToMyBlocklist({ server: servers[1].host }) |
199 | 199 | ||
200 | const res = await makeGetRequest({ | 200 | const res = await makeGetRequest({ |
201 | url: servers[0].url, | 201 | url: servers[0].url, |
@@ -206,7 +206,7 @@ describe('Official plugin auto-mute', function () { | |||
206 | const data = res.body.data | 206 | const data = res.body.data |
207 | expect(data).to.have.lengthOf(1) | 207 | expect(data).to.have.lengthOf(1) |
208 | expect(data[0].updatedAt).to.exist | 208 | expect(data[0].updatedAt).to.exist |
209 | expect(data[0].value).to.equal('root@localhost:' + servers[1].port) | 209 | expect(data[0].value).to.equal('root@' + servers[1].host) |
210 | 210 | ||
211 | await wait(2000) | 211 | await wait(2000) |
212 | 212 | ||