Skip to content

Commit 3969942

Browse files
authored
Merge pull request stripe#500 from stripe/ob-file-resource
Rename `FileUploads` to `Files`
2 parents e926176 + 4cf3475 commit 3969942

File tree

4 files changed

+130
-11
lines changed

4 files changed

+130
-11
lines changed

lib/resources/FileUploads.js lib/resources/Files.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,16 @@ module.exports = StripeResource.extend({
7171
headers: {
7272
'Content-Type': 'multipart/form-data',
7373
},
74-
host: 'uploads.stripe.com',
74+
host: 'files.stripe.com',
7575
}),
7676

7777
list: stripeMethod({
7878
method: 'GET',
79-
host: 'uploads.stripe.com',
8079
}),
8180

8281
retrieve: stripeMethod({
8382
method: 'GET',
8483
path: '/{id}',
8584
urlParams: ['id'],
86-
host: 'uploads.stripe.com',
8785
}),
8886
});

lib/stripe.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ var resources = {
4444
EphemeralKeys: require('./resources/EphemeralKeys'),
4545
Events: require('./resources/Events'),
4646
ExchangeRates: require('./resources/ExchangeRates'),
47+
Files: require('./resources/Files'),
4748
FileLinks: require('./resources/FileLinks'),
48-
FileUploads: require('./resources/FileUploads'),
4949
InvoiceItems: require('./resources/InvoiceItems'),
5050
Invoices: require('./resources/Invoices'),
5151
IssuerFraudRecords: require('./resources/IssuerFraudRecords'),
@@ -99,6 +99,9 @@ var resources = {
9999
}),
100100
};
101101

102+
// For backwards compatibility, `Files` is aliased to `FileUploads`
103+
resources.FileUploads = resources.Files;
104+
102105
Stripe.StripeResource = require('./StripeResource');
103106
Stripe.resources = resources;
104107

test/resources/FileUploads.spec.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ describe('File Uploads Resource', function() {
1616
url: '/v1/files/fil_12345',
1717
headers: {},
1818
data: {},
19-
host: 'uploads.stripe.com',
2019
});
2120
});
2221

@@ -28,7 +27,6 @@ describe('File Uploads Resource', function() {
2827
headers: {},
2928
data: {},
3029
auth: TEST_AUTH_KEY,
31-
host: 'uploads.stripe.com',
3230
});
3331
});
3432
});
@@ -41,7 +39,6 @@ describe('File Uploads Resource', function() {
4139
url: '/v1/files',
4240
headers: {},
4341
data: {},
44-
host: 'uploads.stripe.com',
4542
});
4643
});
4744
});
@@ -60,7 +57,7 @@ describe('File Uploads Resource', function() {
6057
},
6158
});
6259

63-
expect(stripe.LAST_REQUEST).to.deep.property('host', 'uploads.stripe.com');
60+
expect(stripe.LAST_REQUEST).to.deep.property('host', 'files.stripe.com');
6461
expect(stripe.LAST_REQUEST).to.deep.property('method', 'POST');
6562
expect(stripe.LAST_REQUEST).to.deep.property('url', '/v1/files');
6663
});
@@ -78,7 +75,7 @@ describe('File Uploads Resource', function() {
7875
},
7976
}, TEST_AUTH_KEY);
8077

81-
expect(stripe.LAST_REQUEST).to.deep.property('host', 'uploads.stripe.com');
78+
expect(stripe.LAST_REQUEST).to.deep.property('host', 'files.stripe.com');
8279
expect(stripe.LAST_REQUEST).to.deep.property('method', 'POST');
8380
expect(stripe.LAST_REQUEST).to.deep.property('url', '/v1/files');
8481
expect(stripe.LAST_REQUEST).to.deep.property('auth', TEST_AUTH_KEY);
@@ -96,7 +93,7 @@ describe('File Uploads Resource', function() {
9693
type: 'application/octet-stream',
9794
},
9895
}).then(function() {
99-
expect(stripe.LAST_REQUEST).to.deep.property('host', 'uploads.stripe.com');
96+
expect(stripe.LAST_REQUEST).to.deep.property('host', 'files.stripe.com');
10097
expect(stripe.LAST_REQUEST).to.deep.property('method', 'POST');
10198
expect(stripe.LAST_REQUEST).to.deep.property('url', '/v1/files');
10299
});
@@ -114,7 +111,7 @@ describe('File Uploads Resource', function() {
114111
type: 'application/octet-stream',
115112
},
116113
}, TEST_AUTH_KEY).then(function() {
117-
expect(stripe.LAST_REQUEST).to.deep.property('host', 'uploads.stripe.com');
114+
expect(stripe.LAST_REQUEST).to.deep.property('host', 'files.stripe.com');
118115
expect(stripe.LAST_REQUEST).to.deep.property('method', 'POST');
119116
expect(stripe.LAST_REQUEST).to.deep.property('url', '/v1/files');
120117
expect(stripe.LAST_REQUEST).to.deep.property('auth', TEST_AUTH_KEY);

test/resources/Files.spec.js

+121
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
'use strict';
2+
3+
var stripe = require('../../testUtils').getSpyableStripe();
4+
var expect = require('chai').expect;
5+
var fs = require('fs');
6+
var path = require('path');
7+
8+
var TEST_AUTH_KEY = 'aGN0bIwXnHdw5645VABjPdSn8nWY7G11';
9+
10+
describe('Files Resource', function() {
11+
describe('retrieve', function() {
12+
it('Sends the correct request', function() {
13+
stripe.files.retrieve('fil_12345');
14+
expect(stripe.LAST_REQUEST).to.deep.equal({
15+
method: 'GET',
16+
url: '/v1/files/fil_12345',
17+
headers: {},
18+
data: {},
19+
});
20+
});
21+
22+
it('Sends the correct request [with specified auth]', function() {
23+
stripe.files.retrieve('fil_12345', TEST_AUTH_KEY);
24+
expect(stripe.LAST_REQUEST).to.deep.equal({
25+
method: 'GET',
26+
url: '/v1/files/fil_12345',
27+
headers: {},
28+
data: {},
29+
auth: TEST_AUTH_KEY,
30+
});
31+
});
32+
});
33+
34+
describe('list', function() {
35+
it('Sends the correct request', function() {
36+
stripe.files.list();
37+
expect(stripe.LAST_REQUEST).to.deep.equal({
38+
method: 'GET',
39+
url: '/v1/files',
40+
headers: {},
41+
data: {},
42+
});
43+
});
44+
});
45+
46+
describe('create', function() {
47+
it('Sends the correct file upload request', function() {
48+
var testFilename = path.join(__dirname, 'data/minimal.pdf');
49+
var f = fs.readFileSync(testFilename);
50+
51+
stripe.files.create({
52+
purpose: 'dispute_evidence',
53+
file: {
54+
data: f,
55+
name: 'minimal.pdf',
56+
type: 'application/octet-stream',
57+
},
58+
});
59+
60+
expect(stripe.LAST_REQUEST).to.deep.property('host', 'files.stripe.com');
61+
expect(stripe.LAST_REQUEST).to.deep.property('method', 'POST');
62+
expect(stripe.LAST_REQUEST).to.deep.property('url', '/v1/files');
63+
});
64+
65+
it('Sends the correct file upload request [with specified auth]', function() {
66+
var testFilename = path.join(__dirname, 'data/minimal.pdf');
67+
var f = fs.readFileSync(testFilename);
68+
69+
stripe.files.create({
70+
purpose: 'dispute_evidence',
71+
file: {
72+
data: f,
73+
name: 'minimal.pdf',
74+
type: 'application/octet-stream',
75+
},
76+
}, TEST_AUTH_KEY);
77+
78+
expect(stripe.LAST_REQUEST).to.deep.property('host', 'files.stripe.com');
79+
expect(stripe.LAST_REQUEST).to.deep.property('method', 'POST');
80+
expect(stripe.LAST_REQUEST).to.deep.property('url', '/v1/files');
81+
expect(stripe.LAST_REQUEST).to.deep.property('auth', TEST_AUTH_KEY);
82+
});
83+
84+
it('Streams a file and sends the correct file upload request', function() {
85+
var testFilename = path.join(__dirname, 'data/minimal.pdf');
86+
var f = fs.createReadStream(testFilename);
87+
88+
return stripe.files.create({
89+
purpose: 'dispute_evidence',
90+
file: {
91+
data: f,
92+
name: 'minimal.pdf',
93+
type: 'application/octet-stream',
94+
},
95+
}).then(function() {
96+
expect(stripe.LAST_REQUEST).to.deep.property('host', 'files.stripe.com');
97+
expect(stripe.LAST_REQUEST).to.deep.property('method', 'POST');
98+
expect(stripe.LAST_REQUEST).to.deep.property('url', '/v1/files');
99+
});
100+
});
101+
102+
it('Streams a file and sends the correct file upload request [with specified auth]', function() {
103+
var testFilename = path.join(__dirname, 'data/minimal.pdf');
104+
var f = fs.createReadStream(testFilename);
105+
106+
return stripe.files.create({
107+
purpose: 'dispute_evidence',
108+
file: {
109+
data: f,
110+
name: 'minimal.pdf',
111+
type: 'application/octet-stream',
112+
},
113+
}, TEST_AUTH_KEY).then(function() {
114+
expect(stripe.LAST_REQUEST).to.deep.property('host', 'files.stripe.com');
115+
expect(stripe.LAST_REQUEST).to.deep.property('method', 'POST');
116+
expect(stripe.LAST_REQUEST).to.deep.property('url', '/v1/files');
117+
expect(stripe.LAST_REQUEST).to.deep.property('auth', TEST_AUTH_KEY);
118+
});
119+
});
120+
});
121+
});

0 commit comments

Comments
 (0)