diff options
author | Chocobozzz <me@florianbigard.com> | 2018-06-13 10:06:50 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-06-13 10:22:53 +0200 |
commit | 3cd0734fd9b0ff21aaef02317a874e8f1c06e027 (patch) | |
tree | 9e8622d269919addd35b462141ab5f22236aa6f4 /server/tests/api/videos/services.ts | |
parent | 2186386cca113506791583cb07d6ccacba7af4e0 (diff) | |
download | PeerTube-3cd0734fd9b0ff21aaef02317a874e8f1c06e027.tar.gz PeerTube-3cd0734fd9b0ff21aaef02317a874e8f1c06e027.tar.zst PeerTube-3cd0734fd9b0ff21aaef02317a874e8f1c06e027.zip |
Improve tests when waiting pending jobs
Diffstat (limited to 'server/tests/api/videos/services.ts')
-rw-r--r-- | server/tests/api/videos/services.ts | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/server/tests/api/videos/services.ts b/server/tests/api/videos/services.ts index 51db000a2..2f1424292 100644 --- a/server/tests/api/videos/services.ts +++ b/server/tests/api/videos/services.ts | |||
@@ -54,7 +54,8 @@ describe('Test services', function () { | |||
54 | const maxWidth = 50 | 54 | const maxWidth = 50 |
55 | 55 | ||
56 | const res = await getOEmbed(server.url, oembedUrl, format, maxHeight, maxWidth) | 56 | const res = await getOEmbed(server.url, oembedUrl, format, maxHeight, maxWidth) |
57 | const expectedHtml = `<iframe width="50" height="50" src="http://localhost:9001/videos/embed/${server.video.uuid}" ` + | 57 | const expectedHtml = '<iframe width="50" height="50" sandbox="allow-same-origin allow-scripts" ' + |
58 | `src="http://localhost:9001/videos/embed/${server.video.uuid}" ` + | ||
58 | 'frameborder="0" allowfullscreen></iframe>' | 59 | 'frameborder="0" allowfullscreen></iframe>' |
59 | 60 | ||
60 | expect(res.body.html).to.equal(expectedHtml) | 61 | expect(res.body.html).to.equal(expectedHtml) |
@@ -69,10 +70,5 @@ describe('Test services', function () { | |||
69 | 70 | ||
70 | after(async function () { | 71 | after(async function () { |
71 | killallServers([ server ]) | 72 | killallServers([ server ]) |
72 | |||
73 | // Keep the logs if the test failed | ||
74 | if (this['ok']) { | ||
75 | await flushTests() | ||
76 | } | ||
77 | }) | 73 | }) |
78 | }) | 74 | }) |