Skip to content

Commit 338914a

Browse files
lsegallsegal
committed
Correct failing browser tests
1 parent 5e6567a commit 338914a

File tree

2 files changed

+89
-96
lines changed

2 files changed

+89
-96
lines changed

‎test/s3/managed_upload.spec.coffee

+86-86
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ describe 'AWS.S3.ManagedUpload', ->
5858
data: ETag: 'ETAG'
5959
]
6060

61-
send Body: smallbody, ContentEncoding: 'encoding'
62-
expect(err).not.to.exist
63-
expect(data.ETag).to.equal('ETAG')
64-
expect(data.Location).to.equal('https://bucket.s3.mock-region.amazonaws.com/key')
65-
expect(helpers.operationsForRequests(reqs)).to.eql ['s3.putObject']
66-
expect(reqs[0].params.ContentEncoding).to.equal('encoding')
61+
send Body: smallbody, ContentEncoding: 'encoding', ->
62+
expect(err).not.to.exist
63+
expect(data.ETag).to.equal('ETAG')
64+
expect(data.Location).to.equal('https://bucket.s3.mock-region.amazonaws.com/key')
65+
expect(helpers.operationsForRequests(reqs)).to.eql ['s3.putObject']
66+
expect(reqs[0].params.ContentEncoding).to.equal('encoding')
6767

6868
it 'can fail a single part', ->
6969
reqs = helpers.mockResponses [
@@ -84,34 +84,34 @@ describe 'AWS.S3.ManagedUpload', ->
8484
{ data: ETag: 'FINAL_ETAG', Location: 'FINAL_LOCATION' }
8585
]
8686

87-
send Body: bigbody, ContentEncoding: 'encoding'
88-
expect(helpers.operationsForRequests(reqs)).to.eql [
89-
's3.createMultipartUpload'
90-
's3.uploadPart'
91-
's3.uploadPart'
92-
's3.uploadPart'
93-
's3.uploadPart'
94-
's3.completeMultipartUpload'
95-
]
96-
expect(err).not.to.exist
97-
expect(data.ETag).to.equal('FINAL_ETAG')
98-
expect(data.Location).to.equal('FINAL_LOCATION')
99-
expect(reqs[0].params).to.eql(Bucket: 'bucket', Key: 'key', ContentEncoding: 'encoding')
100-
expect(reqs[1].params.ContentLength).to.equal(10)
101-
expect(reqs[1].params.UploadId).to.equal('uploadId')
102-
expect(reqs[2].params.UploadId).to.equal('uploadId')
103-
expect(reqs[2].params.ContentLength).to.equal(10)
104-
expect(reqs[3].params.UploadId).to.equal('uploadId')
105-
expect(reqs[3].params.ContentLength).to.equal(10)
106-
expect(reqs[4].params.UploadId).to.equal('uploadId')
107-
expect(reqs[4].params.ContentLength).to.equal(6)
108-
expect(reqs[5].params.UploadId).to.equal('uploadId')
109-
expect(reqs[5].params.MultipartUpload.Parts).to.eql [
110-
{ ETag: 'ETAG1', PartNumber: 1 }
111-
{ ETag: 'ETAG2', PartNumber: 2 }
112-
{ ETag: 'ETAG3', PartNumber: 3 }
113-
{ ETag: 'ETAG4', PartNumber: 4 }
114-
]
87+
send Body: bigbody, ContentEncoding: 'encoding', ->
88+
expect(helpers.operationsForRequests(reqs)).to.eql [
89+
's3.createMultipartUpload'
90+
's3.uploadPart'
91+
's3.uploadPart'
92+
's3.uploadPart'
93+
's3.uploadPart'
94+
's3.completeMultipartUpload'
95+
]
96+
expect(err).not.to.exist
97+
expect(data.ETag).to.equal('FINAL_ETAG')
98+
expect(data.Location).to.equal('FINAL_LOCATION')
99+
expect(reqs[0].params).to.eql(Bucket: 'bucket', Key: 'key', ContentEncoding: 'encoding')
100+
expect(reqs[1].params.ContentLength).to.equal(10)
101+
expect(reqs[1].params.UploadId).to.equal('uploadId')
102+
expect(reqs[2].params.UploadId).to.equal('uploadId')
103+
expect(reqs[2].params.ContentLength).to.equal(10)
104+
expect(reqs[3].params.UploadId).to.equal('uploadId')
105+
expect(reqs[3].params.ContentLength).to.equal(10)
106+
expect(reqs[4].params.UploadId).to.equal('uploadId')
107+
expect(reqs[4].params.ContentLength).to.equal(6)
108+
expect(reqs[5].params.UploadId).to.equal('uploadId')
109+
expect(reqs[5].params.MultipartUpload.Parts).to.eql [
110+
{ ETag: 'ETAG1', PartNumber: 1 }
111+
{ ETag: 'ETAG2', PartNumber: 2 }
112+
{ ETag: 'ETAG3', PartNumber: 3 }
113+
{ ETag: 'ETAG4', PartNumber: 4 }
114+
]
115115

116116
it 'aborts if ETag is not in response', ->
117117
helpers.spyOn(AWS.util, 'isBrowser').andReturn true
@@ -121,14 +121,14 @@ describe 'AWS.S3.ManagedUpload', ->
121121
{ data: {} }
122122
]
123123

124-
send Body: bigbody
125-
expect(helpers.operationsForRequests(reqs)).to.eql [
126-
's3.createMultipartUpload'
127-
's3.uploadPart'
128-
's3.abortMultipartUpload'
129-
]
130-
expect(err).to.exist
131-
expect(err.message).to.equal('No access to ETag property on response. Check CORS configuration to expose ETag header.')
124+
send Body: bigbody, ->
125+
expect(helpers.operationsForRequests(reqs)).to.eql [
126+
's3.createMultipartUpload'
127+
's3.uploadPart'
128+
's3.abortMultipartUpload'
129+
]
130+
expect(err).to.exist
131+
expect(err.message).to.equal('No access to ETag property on response. Check CORS configuration to expose ETag header.')
132132

133133
it 'allows changing part size', ->
134134
reqs = helpers.mockResponses [
@@ -141,18 +141,18 @@ describe 'AWS.S3.ManagedUpload', ->
141141
size = 18
142142
opts = partSize: size, queueSize: 1, service: s3, params: {Body: bigbody}
143143
upload = new AWS.S3.ManagedUpload(opts)
144-
send()
145-
expect(helpers.operationsForRequests(reqs)).to.eql [
146-
's3.createMultipartUpload'
147-
's3.uploadPart'
148-
's3.uploadPart'
149-
's3.completeMultipartUpload'
150-
]
151-
expect(err).not.to.exist
152-
expect(data.ETag).to.equal('FINAL_ETAG')
153-
expect(data.Location).to.equal('FINAL_LOCATION')
154-
expect(reqs[1].params.ContentLength).to.equal(size)
155-
expect(reqs[2].params.ContentLength).to.equal(size)
144+
send {}, ->
145+
expect(helpers.operationsForRequests(reqs)).to.eql [
146+
's3.createMultipartUpload'
147+
's3.uploadPart'
148+
's3.uploadPart'
149+
's3.completeMultipartUpload'
150+
]
151+
expect(err).not.to.exist
152+
expect(data.ETag).to.equal('FINAL_ETAG')
153+
expect(data.Location).to.equal('FINAL_LOCATION')
154+
expect(reqs[1].params.ContentLength).to.equal(size)
155+
expect(reqs[2].params.ContentLength).to.equal(size)
156156

157157
it 'errors if partSize is smaller than minPartSize', ->
158158
expect(-> new AWS.S3.ManagedUpload(partSize: 5)).to.throw(
@@ -167,16 +167,16 @@ describe 'AWS.S3.ManagedUpload', ->
167167
]
168168

169169
upload = new AWS.S3.ManagedUpload(queueSize: 1, params: {Body: bigbody})
170-
send()
171-
expect(helpers.operationsForRequests(reqs)).to.eql [
172-
's3.createMultipartUpload'
173-
's3.uploadPart'
174-
's3.uploadPart'
175-
's3.abortMultipartUpload'
176-
]
177-
expect(err).to.exist
178-
expect(data).not.to.exist
179-
expect(reqs[3].params.UploadId).to.equal('uploadId')
170+
send {}, ->
171+
expect(helpers.operationsForRequests(reqs)).to.eql [
172+
's3.createMultipartUpload'
173+
's3.uploadPart'
174+
's3.uploadPart'
175+
's3.abortMultipartUpload'
176+
]
177+
expect(err).to.exist
178+
expect(data).not.to.exist
179+
expect(reqs[3].params.UploadId).to.equal('uploadId')
180180

181181
it 'aborts if complete call fails', ->
182182
reqs = helpers.mockResponses [
@@ -188,19 +188,19 @@ describe 'AWS.S3.ManagedUpload', ->
188188
{ error: { code: 'CompleteFailed' }, data: null }
189189
]
190190

191-
send Body: bigbody
192-
expect(helpers.operationsForRequests(reqs)).to.eql [
193-
's3.createMultipartUpload'
194-
's3.uploadPart'
195-
's3.uploadPart'
196-
's3.uploadPart'
197-
's3.uploadPart'
198-
's3.completeMultipartUpload'
199-
's3.abortMultipartUpload'
200-
]
201-
expect(err).to.exist
202-
expect(err.code).to.equal('CompleteFailed')
203-
expect(data).not.to.exist
191+
send Body: bigbody, ->
192+
expect(helpers.operationsForRequests(reqs)).to.eql [
193+
's3.createMultipartUpload'
194+
's3.uploadPart'
195+
's3.uploadPart'
196+
's3.uploadPart'
197+
's3.uploadPart'
198+
's3.completeMultipartUpload'
199+
's3.abortMultipartUpload'
200+
]
201+
expect(err).to.exist
202+
expect(err.code).to.equal('CompleteFailed')
203+
expect(data).not.to.exist
204204

205205
it 'leaves parts if leavePartsOnError is set', ->
206206
reqs = helpers.mockResponses [
@@ -214,15 +214,15 @@ describe 'AWS.S3.ManagedUpload', ->
214214
queueSize: 1
215215
leavePartsOnError: true
216216
params: { Body: bigbody }
217-
send()
218-
expect(helpers.operationsForRequests(reqs)).to.eql [
219-
's3.createMultipartUpload'
220-
's3.uploadPart'
221-
's3.uploadPart'
222-
]
223-
expect(err).to.exist
224-
expect(err.code).to.equal('UploadPartFailed')
225-
expect(data).not.to.exist
217+
send {}, ->
218+
expect(helpers.operationsForRequests(reqs)).to.eql [
219+
's3.createMultipartUpload'
220+
's3.uploadPart'
221+
's3.uploadPart'
222+
]
223+
expect(err).to.exist
224+
expect(err.code).to.equal('UploadPartFailed')
225+
expect(data).not.to.exist
226226

227227
if AWS.util.isNode()
228228
describe 'streaming', ->

‎test/util.spec.coffee

+3-10
Original file line numberDiff line numberDiff line change
@@ -281,16 +281,9 @@ describe 'AWS.util.crypto', ->
281281
done()
282282

283283
if AWS.util.isBrowser()
284-
it 'handles ArrayBuffers', (done) ->
285-
result = '01d448afd928065458cf670b60f5a594d735af0172c8d67f22a81680132681ca'
286-
util.sha256 new ArrayBuffer(10), 'hex', (e, d) ->
287-
expect(e).to.eql(null)
288-
expect(d).to.equal(result)
289-
done()
290-
291-
it 'handles large ArrayBuffers', (done) ->
292-
result = 'fd2a4f95c056f31be0b80c8063950008563a700ebfb94c00aa62df90d6d62a03'
293-
util.sha256 new ArrayBuffer(1024 * 1024 + 256), 'hex', (e, d) ->
284+
it 'handles Blobs (no phantomjs)', (done) ->
285+
result = 'a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3'
286+
util.sha256 new Blob([1,2,3]), 'hex', (e, d) ->
294287
expect(e).to.eql(null)
295288
expect(d).to.equal(result)
296289
done()

0 commit comments

Comments
 (0)