diff options
-rw-r--r-- | client/src/app/+videos/+video-watch/video-watch.component.scss | 1 | ||||
-rw-r--r-- | server/tests/api/check-params/user-notifications.ts | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss index 4bf5ff808..712022141 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.scss +++ b/client/src/app/+videos/+video-watch/video-watch.component.scss | |||
@@ -29,6 +29,7 @@ $video-info-margin-left: 44px; | |||
29 | 29 | ||
30 | #videojs-wrapper { | 30 | #videojs-wrapper { |
31 | width: 100%; | 31 | width: 100%; |
32 | height: auto; | ||
32 | } | 33 | } |
33 | 34 | ||
34 | ::ng-deep .video-js { | 35 | ::ng-deep .video-js { |
diff --git a/server/tests/api/check-params/user-notifications.ts b/server/tests/api/check-params/user-notifications.ts index c6384677e..4aab7eba4 100644 --- a/server/tests/api/check-params/user-notifications.ts +++ b/server/tests/api/check-params/user-notifications.ts | |||
@@ -238,7 +238,7 @@ describe('Test user notifications API validators', function () { | |||
238 | it('Should fail with no token', function (next) { | 238 | it('Should fail with no token', function (next) { |
239 | const socket = io(`http://localhost:${server.port}/user-notifications`, { reconnection: false }) | 239 | const socket = io(`http://localhost:${server.port}/user-notifications`, { reconnection: false }) |
240 | 240 | ||
241 | socket.on('error', () => { | 241 | socket.on('error', function () { |
242 | socket.removeListener('error', this) | 242 | socket.removeListener('error', this) |
243 | socket.disconnect() | 243 | socket.disconnect() |
244 | next() | 244 | next() |
@@ -256,7 +256,7 @@ describe('Test user notifications API validators', function () { | |||
256 | reconnection: false | 256 | reconnection: false |
257 | }) | 257 | }) |
258 | 258 | ||
259 | socket.on('error', () => { | 259 | socket.on('error', function () { |
260 | socket.removeListener('error', this) | 260 | socket.removeListener('error', this) |
261 | socket.disconnect() | 261 | socket.disconnect() |
262 | next() | 262 | next() |
@@ -274,9 +274,11 @@ describe('Test user notifications API validators', function () { | |||
274 | reconnection: false | 274 | reconnection: false |
275 | }) | 275 | }) |
276 | 276 | ||
277 | const errorListener = socket.on('error', err => { | 277 | function errorListener (err) { |
278 | next(new Error('Error in connection: ' + err)) | 278 | next(new Error('Error in connection: ' + err)) |
279 | }) | 279 | } |
280 | |||
281 | socket.on('error', errorListener) | ||
280 | 282 | ||
281 | socket.on('connect', async () => { | 283 | socket.on('connect', async () => { |
282 | socket.removeListener('error', errorListener) | 284 | socket.removeListener('error', errorListener) |