Skip to content

Fix image not found response #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Amir-61 merged 2 commits into from
Dec 7, 2016
Merged

Fix image not found response #179

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a2de90
make sure tests fail upon error
Dec 1, 2016
2df5bc1
Image not found should return 404
Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions test/upload-download.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ describe('storage service', function() {
.set('Content-Type', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
if (err) return done(err);
verifyMetadata(res.body, 'test-container');
done();
});
Expand All @@ -102,6 +103,7 @@ describe('storage service', function() {
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
if (err) return done(err);
verifyMetadata(res.body, 'test-container');
done();
});
Expand All @@ -113,6 +115,7 @@ describe('storage service', function() {
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
if (err) return done(err);
assert(Array.isArray(res.body));
assert.equal(res.body.length, 2);
res.body.forEach(function(c) {
Expand All @@ -127,9 +130,7 @@ describe('storage service', function() {
.del('/containers/test-container')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
done();
});
.expect(200, done);
});

it('should list containers after delete', function(done) {
Expand All @@ -138,6 +139,7 @@ describe('storage service', function() {
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
if (err) return done(err);
assert(Array.isArray(res.body));
assert.equal(res.body.length, 1);
done();
Expand All @@ -150,6 +152,7 @@ describe('storage service', function() {
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
if (err) return done(err);
assert(Array.isArray(res.body));
res.body.forEach(function(f) {
verifyMetadata(f);
Expand All @@ -165,6 +168,7 @@ describe('storage service', function() {
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
if (err) return done(err);
assert.deepEqual(res.body, {'result': {'files': {'image': [
{'container': 'album1', 'name': 'test.jpg', 'type': 'image/jpeg',
'size': 60475},
Expand All @@ -180,6 +184,7 @@ describe('storage service', function() {
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
if (err) return done(err);
assert.deepEqual(res.body, {'result': {'files': {'image': [
{'container': 'album1', 'name': 'image-test.jpg', 'originalFilename': 'test.jpg', 'type': 'image/jpeg', 'acl': 'public-read', 'size': 60475},
]}, 'fields': {}}});
Expand Down Expand Up @@ -248,6 +253,7 @@ describe('storage service', function() {
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
if (err) return done(err);
verifyMetadata(res.body, 'test.jpg');
done();
});
Expand All @@ -259,6 +265,7 @@ describe('storage service', function() {
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
if (err) return done(err);
verifyMetadata(res.body, 'image-test.jpg');
done();
});
Expand All @@ -268,10 +275,7 @@ describe('storage service', function() {
request('http://localhost:' + app.get('port'))
.get('/containers/album1/download/test.jpg')
.expect('Content-Type', 'image/jpeg')
.expect(200, function(err, res) {
if (err) done(err);
done();
});
.expect(200, done);
});

it('should run a function before a download is started by a client', function(done) {
Expand All @@ -288,7 +292,7 @@ describe('storage service', function() {
.get('/containers/album1/download/test.jpg')
.expect('Content-Type', 'image/jpeg')
.expect(200, function(err, res) {
if (err) done(err);
if (err) return done(err);
assert(hookCalled, 'beforeRemote hook was not called');
done();
});
Expand All @@ -308,7 +312,7 @@ describe('storage service', function() {
.get('/containers/album1/download/test.jpg')
.expect('Content-Type', 'image/jpeg')
.expect(200, function(err, res) {
if (err) done(err);
if (err) return done(err);
assert(hookCalled, 'afterRemote hook was not called');
done();
});
Expand Down Expand Up @@ -337,16 +341,15 @@ describe('storage service', function() {
.del('/containers/album1/files/test.jpg')
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
done();
});
.expect(200, done);
});

it('reports errors if it fails to find the file to download', function(done) {
request('http://localhost:' + app.get('port'))
.get('/containers/album1/download/test_not_exist.jpg')
.expect('Content-Type', /json/)
.expect(500, function(err, res) {
.expect(404, function(err, res) {
if (err) return done(err);
assert(res.body.error);
done();
});
Expand Down