diff options
author | Chocobozzz <me@florianbigard.com> | 2022-12-07 09:00:49 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-12-07 09:00:49 +0100 |
commit | c2fba93a60e3352e68c50e40f8fe0db684129fe9 (patch) | |
tree | 0c73763a126b44e5f137725d5b254605f5aea68c /server | |
parent | b6640fa0af863ae99fc33297bf59744bcd8fb2b8 (diff) | |
parent | e453759d1886f61b135a4d77abe4488faeca4064 (diff) | |
download | PeerTube-c2fba93a60e3352e68c50e40f8fe0db684129fe9.tar.gz PeerTube-c2fba93a60e3352e68c50e40f8fe0db684129fe9.tar.zst PeerTube-c2fba93a60e3352e68c50e40f8fe0db684129fe9.zip |
Merge remote-tracking branch 'weblate/develop' into release/5.0.0
Diffstat (limited to 'server')
-rw-r--r-- | server/tests/api/notifications/comments-notifications.ts | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/server/tests/api/notifications/comments-notifications.ts b/server/tests/api/notifications/comments-notifications.ts index 4214687f8..8b8c5712a 100644 --- a/server/tests/api/notifications/comments-notifications.ts +++ b/server/tests/api/notifications/comments-notifications.ts | |||
@@ -45,7 +45,7 @@ describe('Test comments notifications', function () { | |||
45 | }) | 45 | }) |
46 | 46 | ||
47 | it('Should not send a new comment notification after a comment on another video', async function () { | 47 | it('Should not send a new comment notification after a comment on another video', async function () { |
48 | this.timeout(20000) | 48 | this.timeout(30000) |
49 | 49 | ||
50 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) | 50 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) |
51 | 51 | ||
@@ -57,7 +57,7 @@ describe('Test comments notifications', function () { | |||
57 | }) | 57 | }) |
58 | 58 | ||
59 | it('Should not send a new comment notification if I comment my own video', async function () { | 59 | it('Should not send a new comment notification if I comment my own video', async function () { |
60 | this.timeout(20000) | 60 | this.timeout(30000) |
61 | 61 | ||
62 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) | 62 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) |
63 | 63 | ||
@@ -69,7 +69,7 @@ describe('Test comments notifications', function () { | |||
69 | }) | 69 | }) |
70 | 70 | ||
71 | it('Should not send a new comment notification if the account is muted', async function () { | 71 | it('Should not send a new comment notification if the account is muted', async function () { |
72 | this.timeout(20000) | 72 | this.timeout(30000) |
73 | 73 | ||
74 | await servers[0].blocklist.addToMyBlocklist({ token: userToken, account: 'root' }) | 74 | await servers[0].blocklist.addToMyBlocklist({ token: userToken, account: 'root' }) |
75 | 75 | ||
@@ -85,7 +85,7 @@ describe('Test comments notifications', function () { | |||
85 | }) | 85 | }) |
86 | 86 | ||
87 | it('Should send a new comment notification after a local comment on my video', async function () { | 87 | it('Should send a new comment notification after a local comment on my video', async function () { |
88 | this.timeout(20000) | 88 | this.timeout(30000) |
89 | 89 | ||
90 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) | 90 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) |
91 | 91 | ||
@@ -97,7 +97,7 @@ describe('Test comments notifications', function () { | |||
97 | }) | 97 | }) |
98 | 98 | ||
99 | it('Should send a new comment notification after a remote comment on my video', async function () { | 99 | it('Should send a new comment notification after a remote comment on my video', async function () { |
100 | this.timeout(20000) | 100 | this.timeout(30000) |
101 | 101 | ||
102 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) | 102 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) |
103 | 103 | ||
@@ -115,7 +115,7 @@ describe('Test comments notifications', function () { | |||
115 | }) | 115 | }) |
116 | 116 | ||
117 | it('Should send a new comment notification after a local reply on my video', async function () { | 117 | it('Should send a new comment notification after a local reply on my video', async function () { |
118 | this.timeout(20000) | 118 | this.timeout(30000) |
119 | 119 | ||
120 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) | 120 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) |
121 | 121 | ||
@@ -128,7 +128,7 @@ describe('Test comments notifications', function () { | |||
128 | }) | 128 | }) |
129 | 129 | ||
130 | it('Should send a new comment notification after a remote reply on my video', async function () { | 130 | it('Should send a new comment notification after a remote reply on my video', async function () { |
131 | this.timeout(20000) | 131 | this.timeout(30000) |
132 | 132 | ||
133 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) | 133 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) |
134 | await waitJobs(servers) | 134 | await waitJobs(servers) |
@@ -154,7 +154,7 @@ describe('Test comments notifications', function () { | |||
154 | }) | 154 | }) |
155 | 155 | ||
156 | it('Should convert markdown in comment to html', async function () { | 156 | it('Should convert markdown in comment to html', async function () { |
157 | this.timeout(20000) | 157 | this.timeout(30000) |
158 | 158 | ||
159 | const { uuid } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'cool video' } }) | 159 | const { uuid } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'cool video' } }) |
160 | 160 | ||
@@ -184,7 +184,7 @@ describe('Test comments notifications', function () { | |||
184 | }) | 184 | }) |
185 | 185 | ||
186 | it('Should not send a new mention comment notification if I mention the video owner', async function () { | 186 | it('Should not send a new mention comment notification if I mention the video owner', async function () { |
187 | this.timeout(10000) | 187 | this.timeout(30000) |
188 | 188 | ||
189 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) | 189 | const { uuid, shortUUID } = await servers[0].videos.upload({ token: userToken, attributes: { name: 'super video' } }) |
190 | 190 | ||
@@ -195,7 +195,7 @@ describe('Test comments notifications', function () { | |||
195 | }) | 195 | }) |
196 | 196 | ||
197 | it('Should not send a new mention comment notification if I mention myself', async function () { | 197 | it('Should not send a new mention comment notification if I mention myself', async function () { |
198 | this.timeout(10000) | 198 | this.timeout(30000) |
199 | 199 | ||
200 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) | 200 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) |
201 | 201 | ||
@@ -206,7 +206,7 @@ describe('Test comments notifications', function () { | |||
206 | }) | 206 | }) |
207 | 207 | ||
208 | it('Should not send a new mention notification if the account is muted', async function () { | 208 | it('Should not send a new mention notification if the account is muted', async function () { |
209 | this.timeout(10000) | 209 | this.timeout(30000) |
210 | 210 | ||
211 | await servers[0].blocklist.addToMyBlocklist({ token: userToken, account: 'root' }) | 211 | await servers[0].blocklist.addToMyBlocklist({ token: userToken, account: 'root' }) |
212 | 212 | ||
@@ -221,7 +221,7 @@ describe('Test comments notifications', function () { | |||
221 | }) | 221 | }) |
222 | 222 | ||
223 | it('Should not send a new mention notification if the remote account mention a local account', async function () { | 223 | it('Should not send a new mention notification if the remote account mention a local account', async function () { |
224 | this.timeout(20000) | 224 | this.timeout(30000) |
225 | 225 | ||
226 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) | 226 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) |
227 | 227 | ||
@@ -235,7 +235,7 @@ describe('Test comments notifications', function () { | |||
235 | }) | 235 | }) |
236 | 236 | ||
237 | it('Should send a new mention notification after local comments', async function () { | 237 | it('Should send a new mention notification after local comments', async function () { |
238 | this.timeout(10000) | 238 | this.timeout(30000) |
239 | 239 | ||
240 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) | 240 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) |
241 | 241 | ||
@@ -251,7 +251,7 @@ describe('Test comments notifications', function () { | |||
251 | }) | 251 | }) |
252 | 252 | ||
253 | it('Should send a new mention notification after remote comments', async function () { | 253 | it('Should send a new mention notification after remote comments', async function () { |
254 | this.timeout(20000) | 254 | this.timeout(30000) |
255 | 255 | ||
256 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) | 256 | const { uuid, shortUUID } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) |
257 | 257 | ||
@@ -283,7 +283,7 @@ describe('Test comments notifications', function () { | |||
283 | }) | 283 | }) |
284 | 284 | ||
285 | it('Should convert markdown in comment to html', async function () { | 285 | it('Should convert markdown in comment to html', async function () { |
286 | this.timeout(10000) | 286 | this.timeout(30000) |
287 | 287 | ||
288 | const { uuid } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) | 288 | const { uuid } = await servers[0].videos.upload({ attributes: { name: 'super video' } }) |
289 | 289 | ||