aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-11-15 17:12:41 +0100
committerChocobozzz <me@florianbigard.com>2018-11-15 17:13:27 +0100
commit8cf998733496d44fa564e2e252356b871756c984 (patch)
tree1db5a0d9fd99895404ff7b1494ee14155543c08b
parent8f9e8be1fc46ce1744ed6ff537ce2fb995fe7b58 (diff)
downloadPeerTube-8cf998733496d44fa564e2e252356b871756c984.tar.gz
PeerTube-8cf998733496d44fa564e2e252356b871756c984.tar.zst
PeerTube-8cf998733496d44fa564e2e252356b871756c984.zip
Fix video channel videos url when scrolling
-rw-r--r--client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts4
-rw-r--r--server/tests/api/server/handle-down.ts8
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'
25export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { 25export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
26 titlePage: string 26 titlePage: string
27 marginContent = false // Disable margin 27 marginContent = false // Disable margin
28 currentRoute = '/video-channel/videos' 28 currentRoute = '/video-channels/videos'
29 loadOnInit = false 29 loadOnInit = false
30 30
31 private videoChannel: VideoChannel 31 private videoChannel: VideoChannel
@@ -55,7 +55,7 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On
55 this.videoChannelSub = this.videoChannelService.videoChannelLoaded 55 this.videoChannelSub = this.videoChannelService.videoChannelLoaded
56 .subscribe(videoChannel => { 56 .subscribe(videoChannel => {
57 this.videoChannel = videoChannel 57 this.videoChannel = videoChannel
58 this.currentRoute = '/video-channel/' + this.videoChannel.uuid + '/videos' 58 this.currentRoute = '/video-channels/' + this.videoChannel.uuid + '/videos'
59 59
60 this.reloadVideos() 60 this.reloadVideos()
61 this.generateSyndicationList() 61 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'
5import { JobState, Video } from '../../../../shared/models' 5import { JobState, Video } from '../../../../shared/models'
6import { VideoPrivacy } from '../../../../shared/models/videos' 6import { VideoPrivacy } from '../../../../shared/models/videos'
7import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' 7import { VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
8import { completeVideoCheck, getVideo, immutableAssign, reRunServer, unfollow, viewVideo } from '../../utils' 8import { completeVideoCheck, getVideo, immutableAssign, reRunServer, unfollow, updateVideo, viewVideo } from '../../utils'
9import { 9import {
10 flushAndRunMultipleServers, 10 flushAndRunMultipleServers,
11 getVideosList, 11 getVideosList,
@@ -194,15 +194,15 @@ describe('Test handle downs', function () {
194 expect(res.body.data).to.have.lengthOf(2) 194 expect(res.body.data).to.have.lengthOf(2)
195 }) 195 })
196 196
197 it('Should send a view to server 3, and automatically fetch the video', async function () { 197 it('Should send an update to server 3, and automatically fetch the video', async function () {
198 this.timeout(15000) 198 this.timeout(15000)
199 199
200 const res1 = await getVideosList(servers[2].url) 200 const res1 = await getVideosList(servers[2].url)
201 expect(res1.body.data).to.be.an('array') 201 expect(res1.body.data).to.be.an('array')
202 expect(res1.body.data).to.have.lengthOf(11) 202 expect(res1.body.data).to.have.lengthOf(11)
203 203
204 await viewVideo(servers[0].url, missedVideo1.uuid) 204 await updateVideo(servers[0].url, servers[0].accessToken, missedVideo1.uuid, { })
205 await viewVideo(servers[0].url, unlistedVideo.uuid) 205 await updateVideo(servers[0].url, servers[0].accessToken, unlistedVideo.uuid, { })
206 206
207 await waitJobs(servers) 207 await waitJobs(servers)
208 208