From c67aa2a72a4e716ef0316bea81c3fe2655fc7a97 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Wed, 14 Oct 2015 23:00:12 +0200 Subject: [PATCH 1/3] feat(docker): use `:latest` Docker Image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 44fac00..1170d43 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ dev: - image: starefossen/iojs-imagemagick:2-6 + image: starefossen/iojs-imagemagick:latest working_dir: /usr/src/app volumes: - ".:/usr/src/app" From 62d4c367fa01d232a101e0a1339a2a8adea70212 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Wed, 14 Oct 2015 23:01:31 +0200 Subject: [PATCH 2/3] style(test): use done callback directly --- test/suite.coffee | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/test/suite.coffee b/test/suite.coffee index 20f2eff..5c7b23e 100644 --- a/test/suite.coffee +++ b/test/suite.coffee @@ -105,9 +105,7 @@ describe 'Upload', -> upload = new Upload process.env.AWS_BUCKET_NAME - upload.s3.headBucket upload.opts.aws.params, (err, data) -> - assert.ifError err - done() + upload.s3.headBucket upload.opts.aws.params, done it 'connects to AWS S3 using constructor options', (done) -> @timeout 10000 @@ -116,9 +114,7 @@ describe 'Upload', -> accessKeyId: process.env.AWS_ACCESS_KEY_ID secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY - upload.s3.headBucket upload.opts.aws.params, (err, data) -> - assert.ifError err - done() + upload.s3.headBucket upload.opts.aws.params, done describe '#_getRandomPath()', -> it 'returns a new random path', -> From 91b309d29a6dec567704f064925bcfabf288f618 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Wed, 14 Oct 2015 23:02:02 +0200 Subject: [PATCH 3/3] style(test): use consistent bucket names --- test/suite.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/suite.coffee b/test/suite.coffee index 5c7b23e..8cd0939 100644 --- a/test/suite.coffee +++ b/test/suite.coffee @@ -97,7 +97,7 @@ describe 'Upload', -> assert.equal upload.opts.url, 'https://s3-my-region-1.amazonaws.com/b/' it 'sets custom url', -> - upload = new Upload 'myBucket', url: 'http://cdn.app.com/' + upload = new Upload 'b', url: 'http://cdn.app.com/' assert.equal upload.opts.url, 'http://cdn.app.com/' it 'connects to AWS S3 using environment variables', (done) ->