Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
peertube
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
flint media
peertube
Commits
d175a6f7
Unverified
Commit
d175a6f7
authored
Nov 19, 2018
by
Chocobozzz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup tests imports
parent
0b2f03d3
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
41 additions
and
47 deletions
+41
-47
travis.sh
scripts/travis.sh
+6
-9
ffmpeg-utils.ts
server/helpers/ffmpeg-utils.ts
+1
-1
user.ts
server/lib/user.ts
+2
-4
user.ts
server/models/account/user.ts
+2
-2
oauth-token.ts
server/models/oauth/oauth-token.ts
+2
-2
security.ts
server/tests/api/activitypub/security.ts
+2
-1
index.ts
server/tests/api/users/index.ts
+1
-1
video-blacklist-management.ts
server/tests/api/videos/video-blacklist-management.ts
+1
-2
video-channels.ts
server/tests/api/videos/video-channels.ts
+4
-2
video-schedule-update.ts
server/tests/api/videos/video-schedule-update.ts
+0
-1
video-transcoder.ts
server/tests/api/videos/video-transcoder.ts
+2
-4
index.ts
server/tests/utils/index.ts
+0
-1
check-api-params.ts
server/tests/utils/requests/check-api-params.ts
+1
-1
videos.ts
server/tests/utils/search/videos.ts
+1
-1
config.ts
server/tests/utils/server/config.ts
+1
-1
jobs.ts
server/tests/utils/server/jobs.ts
+2
-1
stats.ts
server/tests/utils/server/stats.ts
+1
-1
accounts.ts
server/tests/utils/users/accounts.ts
+1
-1
blocklist.ts
server/tests/utils/users/blocklist.ts
+1
-1
user-subscriptions.ts
server/tests/utils/users/user-subscriptions.ts
+1
-1
users.ts
server/tests/utils/users/users.ts
+1
-1
video-abuses.ts
server/tests/utils/videos/video-abuses.ts
+1
-1
video-captions.ts
server/tests/utils/videos/video-captions.ts
+2
-2
video-channels.ts
server/tests/utils/videos/video-channels.ts
+1
-1
video-comments.ts
server/tests/utils/videos/video-comments.ts
+1
-1
video-imports.ts
server/tests/utils/videos/video-imports.ts
+1
-1
videos.ts
server/tests/utils/videos/videos.ts
+2
-2
No files found.
scripts/travis.sh
View file @
d175a6f7
...
...
@@ -11,28 +11,25 @@ killall -q peertube || true
if
[
"
$1
"
=
"misc"
]
;
then
npm run build
--
--light-fr
mocha
--timeout
5000
--exit
--require
ts-node/register
/type-check
--bail
server/tests/client.ts
\
mocha
--timeout
5000
--exit
--require
ts-node/register
--bail
server/tests/client.ts
\
server/tests/feeds/index.ts
\
server/tests/misc-endpoints.ts
\
server/tests/helpers/index.ts
elif
[
"
$1
"
=
"api"
]
;
then
npm run build:server
mocha
--timeout
5000
--exit
--require
ts-node/register/type-check
--bail
server/tests/api/index.ts
elif
[
"
$1
"
=
"cli"
]
;
then
npm run build:server
mocha
--timeout
5000
--exit
--require
ts-node/register
/type-check
--bail
server/tests/cli/index.ts
mocha
--timeout
5000
--exit
--require
ts-node/register
--bail
server/tests/cli/index.ts
elif
[
"
$1
"
=
"api-1"
]
;
then
npm run build:server
mocha
--timeout
5000
--exit
--require
ts-node/register
/type-check
--bail
server/tests/api/index-1.ts
mocha
--timeout
5000
--exit
--require
ts-node/register
--bail
server/tests/api/index-1.ts
elif
[
"
$1
"
=
"api-2"
]
;
then
npm run build:server
mocha
--timeout
5000
--exit
--require
ts-node/register
/type-check
--bail
server/tests/api/index-2.ts
mocha
--timeout
5000
--exit
--require
ts-node/register
--bail
server/tests/api/index-2.ts
elif
[
"
$1
"
=
"api-3"
]
;
then
npm run build:server
mocha
--timeout
5000
--exit
--require
ts-node/register
/type-check
--bail
server/tests/api/index-3.ts
mocha
--timeout
5000
--exit
--require
ts-node/register
--bail
server/tests/api/index-3.ts
elif
[
"
$1
"
=
"api-4"
]
;
then
npm run build:server
mocha
--timeout
5000
--exit
--require
ts-node/register
/type-check
--bail
server/tests/api/index-4.ts
mocha
--timeout
5000
--exit
--require
ts-node/register
--bail
server/tests/api/index-4.ts
elif
[
"
$1
"
=
"lint"
]
;
then
npm run tslint
--
--project
./tsconfig.json
-c
./tslint.json server.ts
"server/**/*.ts"
"shared/**/*.ts"
...
...
server/helpers/ffmpeg-utils.ts
View file @
d175a6f7
import
*
as
ffmpeg
from
'fluent-ffmpeg'
import
{
join
}
from
'path'
import
{
getTargetBitrate
,
VideoResolution
}
from
'../../shared/models/videos'
import
{
CONFIG
,
FFMPEG_NICE
,
VIDEO_TRANSCODING_FPS
}
from
'../initializers'
import
{
CONFIG
,
FFMPEG_NICE
,
VIDEO_TRANSCODING_FPS
}
from
'../initializers
/constants
'
import
{
processImage
}
from
'./image-utils'
import
{
logger
}
from
'./logger'
import
{
checkFFmpegEncoders
}
from
'../initializers/checker-before-init'
...
...
server/lib/user.ts
View file @
d175a6f7
...
...
@@ -17,10 +17,8 @@ async function createUserAccountAndChannel (userToCreate: UserModel, validateUse
validate
:
validateUser
}
const
[
userCreated
,
accountCreated
]
=
await
Promise
.
all
([
userToCreate
.
save
(
userOptions
),
createLocalAccountWithoutKeys
(
userToCreate
.
username
,
userToCreate
.
id
,
null
,
t
)
])
const
userCreated
=
await
userToCreate
.
save
(
userOptions
)
const
accountCreated
=
await
createLocalAccountWithoutKeys
(
userCreated
.
username
,
userCreated
.
id
,
null
,
t
)
userCreated
.
Account
=
accountCreated
let
channelName
=
userCreated
.
username
+
'_channel'
...
...
server/models/account/user.ts
View file @
d175a6f7
import
*
as
Sequelize
from
'sequelize'
import
{
AfterDe
lete
,
AfterDe
stroy
,
AfterUpdate
,
AllowNull
,
BeforeCreate
,
...
...
@@ -179,7 +179,7 @@ export class UserModel extends Model<UserModel> {
}
@
AfterUpdate
@
AfterDe
lete
@
AfterDe
stroy
static
removeTokenCache
(
instance
:
UserModel
)
{
return
clearCacheByUserId
(
instance
.
id
)
}
...
...
server/models/oauth/oauth-token.ts
View file @
d175a6f7
import
{
AfterDe
lete
,
AfterDe
stroy
,
AfterUpdate
,
AllowNull
,
BelongsTo
,
...
...
@@ -126,7 +126,7 @@ export class OAuthTokenModel extends Model<OAuthTokenModel> {
OAuthClients
:
OAuthClientModel
[]
@
AfterUpdate
@
AfterDe
lete
@
AfterDe
stroy
static
removeTokenCache
(
token
:
OAuthTokenModel
)
{
return
clearCacheByToken
(
token
.
accessToken
)
}
...
...
server/tests/api/activitypub/security.ts
View file @
d175a6f7
...
...
@@ -2,12 +2,13 @@
import
'mocha'
import
{
flushAndRunMultipleServers
,
flushTests
,
killallServers
,
makePOSTAPRequest
,
makeFollowRequest
,
ServerInfo
}
from
'../../utils'
import
{
flushAndRunMultipleServers
,
flushTests
,
killallServers
,
ServerInfo
}
from
'../../utils'
import
{
HTTP_SIGNATURE
}
from
'../../../initializers'
import
{
buildDigest
,
buildGlobalHeaders
}
from
'../../../lib/job-queue/handlers/utils/activitypub-http-utils'
import
*
as
chai
from
'chai'
import
{
setActorField
}
from
'../../utils/miscs/sql'
import
{
activityPubContextify
,
buildSignedActivity
}
from
'../../../helpers/activitypub'
import
{
makeFollowRequest
,
makePOSTAPRequest
}
from
'../../utils/requests/activitypub'
const
expect
=
chai
.
expect
...
...
server/tests/api/users/index.ts
View file @
d175a6f7
import
'./blocklist'
import
'./user-subscriptions'
import
'./users'
import
'./users-verification'
import
'./users-multiple-servers'
import
'./users-verification'
server/tests/api/videos/video-blacklist-management.ts
View file @
d175a6f7
/* tslint:disable:no-unused-expression */
import
*
as
chai
from
'chai'
import
*
as
lodash
from
'lodash'
import
{
orderBy
}
from
'lodash'
import
'mocha'
import
{
addVideoToBlacklist
,
...
...
@@ -22,7 +22,6 @@ import { waitJobs } from '../../utils/server/jobs'
import
{
VideoAbuse
}
from
'../../../../shared/models/videos'
const
expect
=
chai
.
expect
const
orderBy
=
lodash
.
orderBy
describe
(
'Test video blacklist management'
,
function
()
{
let
servers
:
ServerInfo
[]
=
[]
...
...
server/tests/api/videos/video-channels.ts
View file @
d175a6f7
...
...
@@ -7,10 +7,12 @@ import {
createUser
,
doubleFollow
,
flushAndRunMultipleServers
,
getVideoChannelVideos
,
serverLogin
,
testImage
,
getVideoChannelVideos
,
testImage
,
updateVideo
,
updateVideoChannelAvatar
,
uploadVideo
,
wait
,
userLogin
uploadVideo
,
userLogin
}
from
'../../utils'
import
{
addVideoChannel
,
...
...
server/tests/api/videos/video-schedule-update.ts
View file @
d175a6f7
...
...
@@ -16,7 +16,6 @@ import {
uploadVideo
,
wait
}
from
'../../utils'
import
{
join
}
from
'path'
import
{
waitJobs
}
from
'../../utils/server/jobs'
const
expect
=
chai
.
expect
...
...
server/tests/api/videos/video-transcoder.ts
View file @
d175a6f7
...
...
@@ -3,13 +3,13 @@
import
*
as
chai
from
'chai'
import
'mocha'
import
{
omit
}
from
'lodash'
import
*
as
ffmpeg
from
'fluent-ffmpeg'
import
{
getMaxBitrate
,
VideoDetails
,
VideoResolution
,
VideoState
}
from
'../../../../shared/models/videos'
import
{
audio
,
getVideoFileBitrate
,
getVideoFileFPS
,
getVideoFileResolution
}
from
'../../../helpers/ffmpeg-utils'
import
{
buildAbsoluteFixturePath
,
doubleFollow
,
flushAndRunMultipleServers
,
generateHighBitrateVideo
,
getMyVideos
,
getVideo
,
getVideosList
,
...
...
@@ -18,12 +18,10 @@ import {
ServerInfo
,
setAccessTokensToServers
,
uploadVideo
,
webtorrentAdd
,
generateHighBitrateVideo
webtorrentAdd
}
from
'../../utils'
import
{
join
}
from
'path'
import
{
waitJobs
}
from
'../../utils/server/jobs'
import
{
pathExists
}
from
'fs-extra'
import
{
VIDEO_TRANSCODING_FPS
}
from
'../../../../server/initializers/constants'
const
expect
=
chai
.
expect
...
...
server/tests/utils/index.ts
View file @
d175a6f7
...
...
@@ -7,7 +7,6 @@ export * from './miscs/miscs'
export
*
from
'./miscs/stubs'
export
*
from
'./server/follows'
export
*
from
'./requests/requests'
export
*
from
'./requests/activitypub'
export
*
from
'./server/servers'
export
*
from
'./videos/services'
export
*
from
'./users/users'
...
...
server/tests/utils/requests/check-api-params.ts
View file @
d175a6f7
import
{
makeGetRequest
}
from
'./requests'
import
{
immutableAssign
}
from
'..'
import
{
immutableAssign
}
from
'..
/miscs/miscs
'
function
checkBadStartPagination
(
url
:
string
,
path
:
string
,
token
?:
string
,
query
=
{})
{
return
makeGetRequest
({
...
...
server/tests/utils/search/videos.ts
View file @
d175a6f7
...
...
@@ -2,7 +2,7 @@
import
*
as
request
from
'supertest'
import
{
VideosSearchQuery
}
from
'../../../../shared/models/search'
import
{
immutableAssign
}
from
'..'
import
{
immutableAssign
}
from
'..
/miscs/miscs
'
function
searchVideo
(
url
:
string
,
search
:
string
)
{
const
path
=
'/api/v1/search/videos'
...
...
server/tests/utils/server/config.ts
View file @
d175a6f7
import
{
makeDeleteRequest
,
makeGetRequest
,
makePutBodyRequest
}
from
'../'
import
{
makeDeleteRequest
,
makeGetRequest
,
makePutBodyRequest
}
from
'../
requests/requests
'
import
{
CustomConfig
}
from
'../../../../shared/models/server/custom-config.model'
function
getConfig
(
url
:
string
)
{
...
...
server/tests/utils/server/jobs.ts
View file @
d175a6f7
import
*
as
request
from
'supertest'
import
{
Job
,
JobState
}
from
'../../../../shared/models'
import
{
ServerInfo
,
wait
}
from
'../index'
import
{
ServerInfo
}
from
'./servers'
import
{
wait
}
from
'../miscs/miscs'
function
getJobsList
(
url
:
string
,
accessToken
:
string
,
state
:
JobState
)
{
const
path
=
'/api/v1/jobs/'
+
state
...
...
server/tests/utils/server/stats.ts
View file @
d175a6f7
import
{
makeGetRequest
}
from
'../'
import
{
makeGetRequest
}
from
'../
requests/requests
'
function
getStats
(
url
:
string
,
useCache
=
false
)
{
const
path
=
'/api/v1/server/stats'
...
...
server/tests/utils/users/accounts.ts
View file @
d175a6f7
...
...
@@ -4,7 +4,7 @@ import { expect } from 'chai'
import
{
existsSync
,
readdir
}
from
'fs-extra'
import
{
join
}
from
'path'
import
{
Account
}
from
'../../../../shared/models/actors'
import
{
root
}
from
'../
index
'
import
{
root
}
from
'../
miscs/miscs
'
import
{
makeGetRequest
}
from
'../requests/requests'
function
getAccountsList
(
url
:
string
,
sort
=
'-createdAt'
,
statusCodeExpected
=
200
)
{
...
...
server/tests/utils/users/blocklist.ts
View file @
d175a6f7
/* tslint:disable:no-unused-expression */
import
{
makeDeleteRequest
,
makePostBodyRequest
}
from
'../
index
'
import
{
makeDeleteRequest
,
makePostBodyRequest
}
from
'../
requests/requests
'
import
{
makeGetRequest
}
from
'../requests/requests'
function
getAccountBlocklistByAccount
(
...
...
server/tests/utils/users/user-subscriptions.ts
View file @
d175a6f7
import
{
makeDeleteRequest
,
makeGetRequest
,
makePostBodyRequest
}
from
'../'
import
{
makeDeleteRequest
,
makeGetRequest
,
makePostBodyRequest
}
from
'../
requests/requests
'
function
addUserSubscription
(
url
:
string
,
token
:
string
,
targetUri
:
string
,
statusCodeExpected
=
204
)
{
const
path
=
'/api/v1/users/me/subscriptions'
...
...
server/tests/utils/users/users.ts
View file @
d175a6f7
import
*
as
request
from
'supertest'
import
{
makePostBodyRequest
,
makePutBodyRequest
,
updateAvatarRequest
}
from
'../'
import
{
makePostBodyRequest
,
makePutBodyRequest
,
updateAvatarRequest
}
from
'../
requests/requests
'
import
{
UserRole
}
from
'../../../../shared/index'
import
{
NSFWPolicyType
}
from
'../../../../shared/models/videos/nsfw-policy.type'
...
...
server/tests/utils/videos/video-abuses.ts
View file @
d175a6f7
import
*
as
request
from
'supertest'
import
{
VideoAbuseUpdate
}
from
'../../../../shared/models/videos/abuse/video-abuse-update.model'
import
{
makeDeleteRequest
,
makePutBodyRequest
}
from
'..'
import
{
makeDeleteRequest
,
makePutBodyRequest
}
from
'..
/requests/requests
'
function
reportVideoAbuse
(
url
:
string
,
token
:
string
,
videoId
:
number
|
string
,
reason
:
string
,
specialStatus
=
200
)
{
const
path
=
'/api/v1/videos/'
+
videoId
+
'/abuse'
...
...
server/tests/utils/videos/video-captions.ts
View file @
d175a6f7
import
{
makeDeleteRequest
,
makeGetRequest
}
from
'../'
import
{
buildAbsoluteFixturePath
,
makeUploadRequest
}
from
'../index'
import
{
makeDeleteRequest
,
makeGetRequest
,
makeUploadRequest
}
from
'../requests/requests'
import
*
as
request
from
'supertest'
import
*
as
chai
from
'chai'
import
{
buildAbsoluteFixturePath
}
from
'../miscs/miscs'
const
expect
=
chai
.
expect
...
...
server/tests/utils/videos/video-channels.ts
View file @
d175a6f7
import
*
as
request
from
'supertest'
import
{
VideoChannelCreate
,
VideoChannelUpdate
}
from
'../../../../shared/models/videos'
import
{
updateAvatarRequest
}
from
'../
index
'
import
{
updateAvatarRequest
}
from
'../
requests/requests
'
function
getVideoChannelsList
(
url
:
string
,
start
:
number
,
count
:
number
,
sort
?:
string
)
{
const
path
=
'/api/v1/video-channels'
...
...
server/tests/utils/videos/video-comments.ts
View file @
d175a6f7
import
*
as
request
from
'supertest'
import
{
makeDeleteRequest
}
from
'../'
import
{
makeDeleteRequest
}
from
'../
requests/requests
'
function
getVideoCommentThreads
(
url
:
string
,
videoId
:
number
|
string
,
start
:
number
,
count
:
number
,
sort
?:
string
,
token
?:
string
)
{
const
path
=
'/api/v1/videos/'
+
videoId
+
'/comment-threads'
...
...
server/tests/utils/videos/video-imports.ts
View file @
d175a6f7
import
{
VideoImportCreate
}
from
'../../../../shared/models/videos'
import
{
makeGetRequest
,
makeUploadRequest
}
from
'..'
import
{
makeGetRequest
,
makeUploadRequest
}
from
'..
/requests/requests
'
function
getYoutubeVideoUrl
()
{
return
'https://youtu.be/msX3jv1XdvM'
...
...
server/tests/utils/videos/videos.ts
View file @
d175a6f7
...
...
@@ -17,8 +17,8 @@ import {
testImage
}
from
'../'
import
{
VideoDetails
,
VideoPrivacy
}
from
'../../../../shared/models/videos'
import
{
VIDEO_CATEGORIES
,
VIDEO_LANGUAGES
,
VIDEO_LICENCES
,
VIDEO_PRIVACIES
}
from
'../../../initializers'
import
{
dateIsValid
,
webtorrentAdd
}
from
'../
index
'
import
{
VIDEO_CATEGORIES
,
VIDEO_LANGUAGES
,
VIDEO_LICENCES
,
VIDEO_PRIVACIES
}
from
'../../../initializers
/constants
'
import
{
dateIsValid
,
webtorrentAdd
}
from
'../
miscs/miscs
'
type
VideoAttributes
=
{
name
?:
string
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment