Skip to content

Commit

Permalink
Workaround for nock bug in nodejs 8
Browse files Browse the repository at this point in the history 
nock/nock#925
  • Loading branch information
Thomas Conner committed Jul 8, 2017
1 parent d7245b6 commit 20c383c
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions test/datastore/filestore.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,9 @@ describe('FileStore', function() {
});

// GCS status check response
nock('https://www.googleapis.com', { encodedQueryParams: true })
.matchHeader('content-range', `bytes */${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o')
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes */${fileSize}` }})
// .matchHeader('content-range', `bytes */${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
uploadType: 'resumable',
Expand All @@ -419,8 +419,8 @@ describe('FileStore', function() {
});

// GCS complete response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 0-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand Down Expand Up @@ -529,8 +529,8 @@ describe('FileStore', function() {
});

// GCS status check response
nock('https://www.googleapis.com', { encodedQueryParams: true })
.matchHeader('content-range', `bytes */${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes */${fileSize}` }})
// .matchHeader('content-range', `bytes */${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o')
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand All @@ -545,8 +545,8 @@ describe('FileStore', function() {
});

// GCS resumable response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 0-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand All @@ -560,8 +560,8 @@ describe('FileStore', function() {
});

// GCS complete response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 1001-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand Down Expand Up @@ -669,8 +669,8 @@ describe('FileStore', function() {
});

// GCS status check response
nock('https://www.googleapis.com', { encodedQueryParams: true })
.matchHeader('content-range', `bytes */${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes */${fileSize}` }})
// .matchHeader('content-range', `bytes */${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o')
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand All @@ -685,8 +685,8 @@ describe('FileStore', function() {
});

// GCS resumable response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 0-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand All @@ -700,8 +700,8 @@ describe('FileStore', function() {
});

// GCS error response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 1001-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand All @@ -714,8 +714,8 @@ describe('FileStore', function() {
});

// GCS complete response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 1001-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand Down Expand Up @@ -826,8 +826,8 @@ describe('FileStore', function() {
});

// GCS status check response
nock('https://www.googleapis.com', { encodedQueryParams: true })
.matchHeader('content-range', `bytes */${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes */${fileSize}` }})
// .matchHeader('content-range', `bytes */${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o')
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand All @@ -842,8 +842,8 @@ describe('FileStore', function() {
});

// GCS resumable response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 0-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand All @@ -857,8 +857,8 @@ describe('FileStore', function() {
});

// GCS error response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 1001-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand Down Expand Up @@ -924,8 +924,8 @@ describe('FileStore', function() {
});

// GCS status check response
nock('https://www.googleapis.com', { encodedQueryParams: true })
.matchHeader('content-range', `bytes */${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes */${fileSize}` }})
// .matchHeader('content-range', `bytes */${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o')
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand All @@ -940,8 +940,8 @@ describe('FileStore', function() {
});

// GCS resumable response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 0-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 0-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand All @@ -955,8 +955,8 @@ describe('FileStore', function() {
});

// GCS error response
nock('https://www.googleapis.com')
.matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
nock('https://www.googleapis.com', { encodedQueryParams: true, reqheaders: { 'content-range': `bytes 1001-${fileSize - 1}/${fileSize}` }})
// .matchHeader('content-range', `bytes 1001-${fileSize - 1}/${fileSize}`)
.put('/upload/storage/v1/b/5d91e6b552d148188e30d8eb106da6d8/o', () => true)
.query({
name: '58caed1d-9e42-4bf6-9a37-68d18cd29e3e/kinvey.png',
Expand Down

0 comments on commit 20c383c

Please sign in to comment.