Fix dependency issues
This commit is contained in:
parent
9639bd1757
commit
d4681c0074
|
@ -1,7 +1,7 @@
|
||||||
/* tslint:disable:no-unused-expression */
|
/* tslint:disable:no-unused-expression */
|
||||||
|
|
||||||
import * as request from 'supertest'
|
import * as request from 'supertest'
|
||||||
import { VideosSearchQuery } from '../../../../shared/models/search'
|
import { VideosSearchQuery } from '../../models/search'
|
||||||
import { immutableAssign } from '..'
|
import { immutableAssign } from '..'
|
||||||
|
|
||||||
function searchVideo (url: string, search: string) {
|
function searchVideo (url: string, search: string) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../'
|
import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../'
|
||||||
import { CustomConfig } from '../../../../shared/models/server/custom-config.model'
|
import { CustomConfig } from '../../models/server/custom-config.model'
|
||||||
|
|
||||||
function getConfig (url: string) {
|
function getConfig (url: string) {
|
||||||
const path = '/api/v1/config'
|
const path = '/api/v1/config'
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import * as request from 'supertest'
|
import * as request from 'supertest'
|
||||||
import { Job, JobState } from '../../../../shared/models'
|
import { Job, JobState } from '../../models'
|
||||||
import { ServerInfo, wait } from '../index'
|
import { ServerInfo, wait } from '../index'
|
||||||
|
|
||||||
function getJobsList (url: string, accessToken: string, state: JobState) {
|
function getJobsList (url: string, accessToken: string, state: JobState) {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
import { expect } from 'chai'
|
import { expect } from 'chai'
|
||||||
import { existsSync, readdir } from 'fs-extra'
|
import { existsSync, readdir } from 'fs-extra'
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { Account } from '../../../../shared/models/actors'
|
import { Account } from '../../models/actors'
|
||||||
import { root } from '../index'
|
import { root } from '../index'
|
||||||
import { makeGetRequest } from '../requests/requests'
|
import { makeGetRequest } from '../requests/requests'
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import * as request from 'supertest'
|
import * as request from 'supertest'
|
||||||
import { VideoAbuseUpdate } from '../../../../shared/models/videos/abuse/video-abuse-update.model'
|
import { VideoAbuseUpdate } from '../../models/videos/abuse/video-abuse-update.model'
|
||||||
import { makeDeleteRequest, makePutBodyRequest } from '..'
|
import { makeDeleteRequest, makePutBodyRequest } from '..'
|
||||||
|
|
||||||
function reportVideoAbuse (url: string, token: string, videoId: number | string, reason: string, specialStatus = 200) {
|
function reportVideoAbuse (url: string, token: string, videoId: number | string, reason: string, specialStatus = 200) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import * as request from 'supertest'
|
import * as request from 'supertest'
|
||||||
import { VideoChannelCreate, VideoChannelUpdate } from '../../../../shared/models/videos'
|
import { VideoChannelCreate, VideoChannelUpdate } from '../../models/videos'
|
||||||
import { updateAvatarRequest } from '../index'
|
import { updateAvatarRequest } from '../index'
|
||||||
|
|
||||||
function getVideoChannelsList (url: string, start: number, count: number, sort?: string) {
|
function getVideoChannelsList (url: string, start: number, count: number, sort?: string) {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { VideoImportCreate } from '../../../../shared/models/videos'
|
import { VideoImportCreate } from '../../models/videos'
|
||||||
import { makeGetRequest, makeUploadRequest } from '..'
|
import { makeGetRequest, makeUploadRequest } from '..'
|
||||||
|
|
||||||
function getYoutubeVideoUrl () {
|
function getYoutubeVideoUrl () {
|
||||||
|
|
|
@ -16,8 +16,8 @@ import {
|
||||||
ServerInfo,
|
ServerInfo,
|
||||||
testImage
|
testImage
|
||||||
} from '../'
|
} from '../'
|
||||||
import { VideoDetails, VideoPrivacy } from '../../../../shared/models/videos'
|
import { VideoDetails, VideoPrivacy } from '../../models/videos'
|
||||||
import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers'
|
import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers'
|
||||||
import { dateIsValid, webtorrentAdd } from '../index'
|
import { dateIsValid, webtorrentAdd } from '../index'
|
||||||
|
|
||||||
type VideoAttributes = {
|
type VideoAttributes = {
|
||||||
|
|
Loading…
Reference in New Issue