Update for tessel-mjpeg-consumer

tessel · Oct 21, 2016 · a142183 · a142183
1 parent b91b758
commit a142183
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/lib/camera.js b/lib/camera.js
@@ -2,14 +2,12 @@
 
 // Dependencies: Built-in
 const cp = require('child_process');
-const fs = require('fs');
 const Stream = require('stream');
-const Readable = Stream.Readable;
 
 // Dependencies: Third Party
 const got = require('got');
 const ip = require('ip');
-const MjpegConsumer = require('mjpeg-consumer');
+const MjpegConsumer = require('tessel-mjpeg-consumer');
 
 // Dependencies: Internal
 const CaptureStream = require('./capture-stream');
@@ -33,7 +31,6 @@ class Camera extends Stream {
   constructor(options) {
     super();
 
-    let child;
     let device = '/dev/video0';
     let dimensions = '800x600';
     let fps = 30;
@@ -163,7 +160,7 @@ class Camera extends Stream {
 
     if (!state.stream) {
       state.stream = got.stream(state.remote.url);
-      state.stream.on('error', _ => {
+      state.stream.on('error', () => {
         state.stream = null;
         this.stream();
       });
@@ -172,7 +169,7 @@ class Camera extends Stream {
     let incoming = state.stream.pipe(new MjpegConsumer());
 
     incoming.on('data', frame => state.frame = frame);
-    incoming.on('error', _ => this.stream());
+    incoming.on('error', () => this.stream());
     incoming.pipe(this);
 
     return this;

diff --git a/test/common/bootstrap.js b/test/common/bootstrap.js
@@ -15,7 +15,7 @@ global.Writable = stream.Writable;
 
 // Dependencies: Third Party
 global.sinon = require('sinon');
-global.MjpegConsumer = require('mjpeg-consumer');
+global.MjpegConsumer = require('tessel-mjpeg-consumer');
 
 
 // Dependencies: Internal

diff --git a/test/unit/camera.js b/test/unit/camera.js
@@ -1,5 +1,5 @@
 exports['av.Camera'] = {
-  setUp: function(done) {
+  setUp(done) {
     this.sandbox = sinon.sandbox.create();
     this.emitter = new Emitter();
     this.spawn = this.sandbox.stub(cp, 'spawn', () => {
@@ -15,31 +15,33 @@ exports['av.Camera'] = {
     done();
   },
 
-  tearDown: function(done) {
+  tearDown(done) {
     this.sandbox.restore();
     done();
   },
 
-  basic: function(test) {
+  basic(test) {
     test.expect(1);
     test.equal(typeof av.Camera, 'function');
     test.done();
   },
 
-  emitter: function(test) {
+  emitter(test) {
     test.expect(1);
     test.equal((new av.Camera()) instanceof Emitter, true);
     test.done();
   },
 
-  captureToEmitter: function(test) {
-    test.expect(3);
-
-    var buffer = new Buffer([0]);
-    var cam = new av.Camera();
+  capture(test) {
+    test.expect(1);
+    test.equal(typeof av.Camera.prototype.capture, 'function');
+    test.done();
+  },
 
-    test.equal(typeof cam.capture, 'function');
+  captureReadable(test) {
+    test.expect(2);
 
+    var cam = new av.Camera();
     var capture = cam.capture();
 
     test.equal(capture instanceof CaptureStream, true);
@@ -48,7 +50,7 @@ exports['av.Camera'] = {
     test.done();
   },
 
-  captureToPipe: function(test) {
+  captureToPipe(test) {
     test.expect(1);
 
     var buffer = new Buffer([0]);
@@ -69,7 +71,7 @@ exports['av.Camera'] = {
     this.emitter.emit('close');
   },
 
-  spawned: function(test) {
+  spawned(test) {
     test.expect(3);
 
     var cam = new av.Camera();
@@ -88,7 +90,7 @@ exports['av.Camera'] = {
     test.done();
   },
 
-  stream: function(test) {
+  stream(test) {
     test.expect(1);
 
     var cam = new av.Camera();