From 8cf998733496d44fa564e2e252356b871756c984 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 15 Nov 2018 17:12:41 +0100 Subject: [PATCH] Fix video channel videos url when scrolling --- .../video-channel-videos.component.ts | 4 ++-- server/tests/api/server/handle-down.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts index 800d97b7f..1f0744fb1 100644 --- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts +++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts @@ -25,7 +25,7 @@ import { ScreenService } from '@app/shared/misc/screen.service' export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { titlePage: string marginContent = false // Disable margin - currentRoute = '/video-channel/videos' + currentRoute = '/video-channels/videos' loadOnInit = false private videoChannel: VideoChannel @@ -55,7 +55,7 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On this.videoChannelSub = this.videoChannelService.videoChannelLoaded .subscribe(videoChannel => { this.videoChannel = videoChannel - this.currentRoute = '/video-channel/' + this.videoChannel.uuid + '/videos' + this.currentRoute = '/video-channels/' + this.videoChannel.uuid + '/videos' this.reloadVideos() this.generateSyndicationList() diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts index ed15c8090..0421b2b40 100644 --- a/server/tests/api/server/handle-down.ts +++ b/server/tests/api/server/handle-down.ts @@ -5,7 +5,7 @@ import 'mocha' import { JobState, Video } from '../../../../shared/models' import { VideoPrivacy } from '../../../../shared/models/videos' import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' -import { completeVideoCheck, getVideo, immutableAssign, reRunServer, unfollow, viewVideo } from '../../utils' +import { completeVideoCheck, getVideo, immutableAssign, reRunServer, unfollow, updateVideo, viewVideo } from '../../utils' import { flushAndRunMultipleServers, getVideosList, @@ -194,15 +194,15 @@ describe('Test handle downs', function () { expect(res.body.data).to.have.lengthOf(2) }) - it('Should send a view to server 3, and automatically fetch the video', async function () { + it('Should send an update to server 3, and automatically fetch the video', async function () { this.timeout(15000) const res1 = await getVideosList(servers[2].url) expect(res1.body.data).to.be.an('array') expect(res1.body.data).to.have.lengthOf(11) - await viewVideo(servers[0].url, missedVideo1.uuid) - await viewVideo(servers[0].url, unlistedVideo.uuid) + await updateVideo(servers[0].url, servers[0].accessToken, missedVideo1.uuid, { }) + await updateVideo(servers[0].url, servers[0].accessToken, unlistedVideo.uuid, { }) await waitJobs(servers) -- 2.25.1