for i in $(seq 1 6); do
printf "use peertube-test%s;\ndb.dropDatabase();" "$i" | mongo
- rm -rf "$basePath/../server/test$i"
+ rm -rf "$basePath/../test$i"
done
"dev": "concurrently \"npm run livereload\" \"npm run client:tsc:watch\" \"npm run client:sass:watch\" \"npm start\"",
"livereload": "livereload ./client",
"start": "node server",
- "test": "standard && mocha tests"
+ "test": "standard && mocha server/tests"
},
"dependencies": {
"async": "^1.2.1",
"supertest": "^1.1.0"
},
"standard": {
+ "ignore": [
+ "client/"
+ ],
"globals": [
"alert",
"confirm",
router.use('/pods', podsController)
router.use('/remotevideos', remoteVideosController)
router.use('/videos', videosController)
+router.use('/*', badRequest)
// ---------------------------------------------------------------------------
module.exports = router
+
+// ---------------------------------------------------------------------------
+
+function badRequest (req, res, next) {
+ res.sendStatus(400)
+}
var winston = require('winston')
winston.emitErrs = true
-var logDir = path.join(__dirname, '..', config.get('storage.logs'))
+var logDir = path.join(__dirname, '..', '..', config.get('storage.logs'))
var logger = new winston.Logger({
transports: [
new winston.transports.File({
var logger = require('./logger')
-var certDir = path.join(__dirname, '..', config.get('storage.certs'))
+var certDir = path.join(__dirname, '..', '..', config.get('storage.certs'))
var algorithm = 'aes-256-ctr'
var peertubeCrypto = {
for (var key of Object.keys(storages)) {
var dir = storages[key]
try {
- mkdirp.sync(path.join(__dirname, '..', dir))
+ mkdirp.sync(path.join(__dirname, '..', '..', dir))
} catch (error) {
throw new Error('Cannot create ' + path + ':' + error)
}
var logger = require('../helpers/logger')
var Videos = require('../models/videos')
-var uploadDir = path.join(__dirname, '..', config.get('storage.uploads'))
+var uploadDir = path.join(__dirname, '..', '..', config.get('storage.uploads'))
var videos = {
seed: seed,
var http = config.get('webserver.https') === true ? 'https' : 'http'
var host = config.get('webserver.host')
var port = config.get('webserver.port')
-var uploadDir = path.join(__dirname, '..', config.get('storage.uploads'))
+var uploadDir = path.join(__dirname, '..', '..', config.get('storage.uploads'))
// ---------------------------------------------------------------------------
it('Should have 404 with nothing', function (done) {
request(url)
.delete(path)
- .expect(404, done)
+ .expect(400, done)
})
it('Should fail without a mongodb id', function (done) {
utils.removeVideo(url, video_id, function (err) {
if (err) throw err
- fs.readdir(pathUtils.join(__dirname, '../../test1/uploads/'), function (err, files) {
+ fs.readdir(pathUtils.join(__dirname, '../../../test1/uploads/'), function (err, files) {
if (err) throw err
expect(files.length).to.equal(0)
// ---------------------- Export functions --------------------
function flushTests (callback) {
- exec(pathUtils.join(__dirname, '../../scripts/clean_test.sh'), callback)
+ exec(pathUtils.join(__dirname, '../../../bin/clean_test.sh'), callback)
}
function getFriendsList (url, end) {
detached: true
}
- var app = fork(pathUtils.join(__dirname, '../../server.js'), [], options)
+ var app = fork(pathUtils.join(__dirname, '../../../server.js'), [], options)
app.stdout.on('data', function onStdout (data) {
var dont_continue = false
// Check if all required sentences are here