diff options
author | Chocobozzz <me@florianbigard.com> | 2017-12-14 10:07:57 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2017-12-14 10:07:57 +0100 |
commit | d48ff09d27d234425c3e9f091ae9072d8e6d8b7a (patch) | |
tree | 3a842b79aec40ca55d68c1cb6cf9b8aadcf2a1d1 /server/tests | |
parent | 94edfc3b2a9cf83f1c9c470a76e4769bc37aad14 (diff) | |
download | PeerTube-d48ff09d27d234425c3e9f091ae9072d8e6d8b7a.tar.gz PeerTube-d48ff09d27d234425c3e9f091ae9072d8e6d8b7a.tar.zst PeerTube-d48ff09d27d234425c3e9f091ae9072d8e6d8b7a.zip |
Use sequelize scopes
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/api/single-server.ts | 3 | ||||
-rw-r--r-- | server/tests/api/video-abuse.ts | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/server/tests/api/single-server.ts b/server/tests/api/single-server.ts index 174fb480d..7f4351f5e 100644 --- a/server/tests/api/single-server.ts +++ b/server/tests/api/single-server.ts | |||
@@ -132,7 +132,6 @@ describe('Test a single server', function () { | |||
132 | expect(video.serverHost).to.equal('localhost:9001') | 132 | expect(video.serverHost).to.equal('localhost:9001') |
133 | expect(video.accountName).to.equal('root') | 133 | expect(video.accountName).to.equal('root') |
134 | expect(video.isLocal).to.be.true | 134 | expect(video.isLocal).to.be.true |
135 | expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ]) | ||
136 | expect(dateIsValid(video.createdAt)).to.be.true | 135 | expect(dateIsValid(video.createdAt)).to.be.true |
137 | expect(dateIsValid(video.updatedAt)).to.be.true | 136 | expect(dateIsValid(video.updatedAt)).to.be.true |
138 | 137 | ||
@@ -181,7 +180,6 @@ describe('Test a single server', function () { | |||
181 | expect(video.serverHost).to.equal('localhost:9001') | 180 | expect(video.serverHost).to.equal('localhost:9001') |
182 | expect(video.accountName).to.equal('root') | 181 | expect(video.accountName).to.equal('root') |
183 | expect(video.isLocal).to.be.true | 182 | expect(video.isLocal).to.be.true |
184 | expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ]) | ||
185 | expect(dateIsValid(video.createdAt)).to.be.true | 183 | expect(dateIsValid(video.createdAt)).to.be.true |
186 | expect(dateIsValid(video.updatedAt)).to.be.true | 184 | expect(dateIsValid(video.updatedAt)).to.be.true |
187 | expect(video.channel.name).to.equal('Default root channel') | 185 | expect(video.channel.name).to.equal('Default root channel') |
@@ -248,7 +246,6 @@ describe('Test a single server', function () { | |||
248 | expect(video.serverHost).to.equal('localhost:9001') | 246 | expect(video.serverHost).to.equal('localhost:9001') |
249 | expect(video.accountName).to.equal('root') | 247 | expect(video.accountName).to.equal('root') |
250 | expect(video.isLocal).to.be.true | 248 | expect(video.isLocal).to.be.true |
251 | expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ]) | ||
252 | expect(dateIsValid(video.createdAt)).to.be.true | 249 | expect(dateIsValid(video.createdAt)).to.be.true |
253 | expect(dateIsValid(video.updatedAt)).to.be.true | 250 | expect(dateIsValid(video.updatedAt)).to.be.true |
254 | 251 | ||
diff --git a/server/tests/api/video-abuse.ts b/server/tests/api/video-abuse.ts index 60bee9c3d..4a0b6b504 100644 --- a/server/tests/api/video-abuse.ts +++ b/server/tests/api/video-abuse.ts | |||
@@ -47,7 +47,7 @@ describe('Test video abuses', function () { | |||
47 | await uploadVideo(servers[1].url, servers[1].accessToken, video2Attributes) | 47 | await uploadVideo(servers[1].url, servers[1].accessToken, video2Attributes) |
48 | 48 | ||
49 | // Wait videos propagation, server 2 has transcoding enabled | 49 | // Wait videos propagation, server 2 has transcoding enabled |
50 | await wait(10000) | 50 | await wait(15000) |
51 | 51 | ||
52 | const res = await getVideosList(servers[0].url) | 52 | const res = await getVideosList(servers[0].url) |
53 | const videos = res.body.data | 53 | const videos = res.body.data |