Refactor uploads

test/web/file.spec.js

@@ -1,3 +1,4 @@
+import path from 'path';
 import assert from 'assert';
 import sizeOf from 'image-size';
 import { agent } from 'supertest';
@@ -12,7 +13,7 @@ describe('setup hostr-web file', function() {
       this.timeout(30000);
       request
         .post('/api/file')
-        .attach('file', 'test/fixtures/utah-arches.jpg')
+        .attach('file', path.join(__dirname, '..', 'fixtures', 'utah-arches.jpg'))
         .auth('test@hostr.co', 'test-password')
         .expect(201)
         .expect(function(response) {
@@ -25,7 +26,6 @@ describe('setup hostr-web file', function() {
 });
 
 describe('hostr-web file', function() {
-
   describe('when GET /file/:id/:name', function() {
     it('should receive an image', function(done) {
       request
@@ -40,41 +40,40 @@ describe('hostr-web file', function() {
   });
 
   describe('when GET /file/150/:id/:name', function() {
-    it('should receive a 150px wide thumbnail of the image', function(done) {
+    it('should receive a 150px wide thumbnail of the image', function() {
       request
         .get('/file/150/' + file.id + '/' + file.name)
         .expect(200)
         .expect('Content-type', 'image/jpeg')
         .expect(function(response) {
-          assert(sizeOf(response.body).width === 150);
-        })
-        .end(done);
+          const width = sizeOf(response.body).width;
+          assert(width === 150);
+        });
     });
   });
 
   describe('when GET /file/970/:id/:name', function() {
-    it('should receive a 970px wide thumbnail of the image', function(done) {
+    it('should receive a 970px wide thumbnail of the image', function() {
       request
         .get('/file/970/' + file.id + '/' + file.name)
         .expect(200)
         .expect('Content-type', 'image/jpeg')
         .expect(function(response) {
-          assert(sizeOf(response.body).width === 970);
-        })
-        .end(done);
+          const width = sizeOf(response.body).width;
+          assert(width === 970);
+        });
     });
   });
 
   describe('when GET /:id', function() {
-    it('should receive some HTML', function(done) {
+    it('should receive some HTML', function() {
       request
         .get('/' + file.id)
         .expect(200)
         .expect('Content-type', /text\/html/) // Could include charset
         .expect(function(response) {
           assert(response.text.indexOf('src="/file/970/' + file.id + '/' + file.name + '"') > -1);
-        })
-        .end(done);
+        });
     });
   });
 

test/web/user.spec.js

@@ -5,20 +5,20 @@ const request = agent(app.listen());
 
 describe('hostr-web user', function() {
   describe('when POST /signin with invalid credentials', function() {
-    it('should not redirect to /', function(done) {
+    it('should not redirect to /', function() {
       request.get('/signin').end(function(err, response) {
         const match = response.text.match(/name="_csrf" value="([^"]+)"/);
         const csrf = match[1];
         request
           .post('/signin')
           .send({'email': 'test@hostr.co', 'password': 'test-passworddeded', '_csrf': csrf})
-          .expect(200, done);
+          .expect(200);
       });
     });
   });
 
   describe('when POST /signin with valid credentials', function() {
-    it('should redirect to /', function(done) {
+    it('should redirect to /', function() {
       request.get('/signin').end(function(err, response) {
         const match = response.text.match(/name="_csrf" value="([^"]+)"/);
         const csrf = match[1];
@@ -27,7 +27,7 @@ describe('hostr-web user', function() {
           .send({'email': 'test@hostr.co', 'password': 'test-password', '_csrf': csrf})
           .expect(302)
           .expect('Location', '/')
-          .end(done);
+          .end();
       });
     });
   });