Fix tests

diff --git a/client/angular/videos/components/watch/videos-watch.component.ts b/client/angular/videos/components/watch/videos-watch.component.ts
index da7f942db4135fe865135eff0b37e11c8fc7dd3b..1a17e2b1ae9a4a8c36c3fcee01e5b1b4147321ab 100644 (file)
--- a/client/angular/videos/components/watch/videos-watch.component.ts
+++ b/client/angular/videos/components/watch/videos-watch.component.ts
@@ -39,8 +39,9 @@ export class VideosWatchComponent implements OnInit, CanDeactivate {
 
   loadVideo(video: Video) {
     this.video = video;
-
+    console.log('Adding ' + this.video.magnetUri + '.');
     this.client.add(this.video.magnetUri, (torrent) => {
+      console.log('Added ' + this.video.magnetUri + '.');
       torrent.files[0].appendTo(this._elementRef.nativeElement, (err) => {
         if (err) {
           alert('Cannot append the file.');

diff --git a/client/package.json b/client/package.json
index 78abde7527f0e8e61a67098a6d32be79b1736305..dbb065974201b0876b625a0d15bb91e1ddd55819 100644 (file)
--- a/client/package.json
+++ b/client/package.json
@@ -30,6 +30,7 @@
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
     "systemjs": "0.19.22",
+    "webtorrent": "^0.85.1",
     "zone.js": "0.5.15"
   },
   "devDependencies": {

diff --git a/package.json b/package.json
index 383e6165c853777163dad644662c9d29ce4c809c..1b83f5eca71b0493f68d3cb332905d22a8d950b9 100644 (file)
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "async": "^1.2.1",
     "bittorrent-tracker": "^7.0.0",
     "body-parser": "^1.12.4",
+    "concurrently": "^2.0.0",
     "config": "^1.14.0",
     "connect-livereload": "^0.5.3",
     "debug": "^2.2.0",

diff --git a/server/tests/api/utils.js b/server/tests/api/utils.js
index c706965714684fac06241d09d722dedd9228dcda..60c3c8d4ec3c9b1ecde363589d8ea6238b01a09b 100644 (file)
--- a/server/tests/api/utils.js
+++ b/server/tests/api/utils.js
@@ -176,7 +176,7 @@ function uploadVideo (url, name, description, fixture, end) {
     .field('name', name)
     .field('description', description)
     .attach('input_video', pathUtils.join(__dirname, 'fixtures', fixture))
-    .expect(201)
+    .expect(204)
     .end(end)
 }