Skip to content

Commit 59ed527

Browse files
committed
Remove space + move preserve filename args to files controller initializer
1 parent 39f48bd commit 59ed527

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

spec/FilesController.spec.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ describe('FilesController', () => {
233233
adapterWithReturn.getFileLocation = () => {
234234
return Promise.resolve('http://default.url/file.txt');
235235
};
236-
const controllerWithReturn = new FilesController(adapterWithReturn);
236+
const controllerWithReturn = new FilesController(adapterWithReturn, null, { preserveFileName: true });
237+
// preserveFileName is true to make filename behaviors predictable
237238
const result1 = await controllerWithReturn.createFile(
238239
config,
239240
'originalFile.txt',
@@ -252,14 +253,13 @@ describe('FilesController', () => {
252253
return Promise.resolve(`http://default.url/${filename}`);
253254
};
254255

255-
const controllerWithoutReturn = new FilesController(adapterWithoutReturn);
256+
const controllerWithoutReturn = new FilesController(adapterWithoutReturn, null, { preserveFileName: true });
256257
const result2 = await controllerWithoutReturn.createFile(
257258
config,
258259
'originalFile.txt',
259260
'data',
260261
'text/plain',
261-
{},
262-
{ preserveFileName: true } // To make filename predictable
262+
{}
263263
);
264264

265265
expect(result2.name).toBe('originalFile.txt');
@@ -278,14 +278,13 @@ describe('FilesController', () => {
278278
return Promise.resolve('http://default.url/file.txt');
279279
};
280280

281-
const controllerWithPartial = new FilesController(adapterWithOnlyURL);
281+
const controllerWithPartial = new FilesController(adapterWithOnlyURL, null, { preserveFileName: true });
282282
const result3 = await controllerWithPartial.createFile(
283283
config,
284284
'originalFile.txt',
285285
'data',
286286
'text/plain',
287-
{},
288-
{ preserveFileName: true } // To make filename predictable
287+
{}
289288
);
290289

291290
expect(result3.name).toBe('originalFile.txt');
@@ -302,14 +301,13 @@ describe('FilesController', () => {
302301
return Promise.resolve(`http://default.url/${filename}`);
303302
};
304303

305-
const controllerWithOnlyFilename = new FilesController(adapterWithOnlyFilename);
304+
const controllerWithOnlyFilename = new FilesController(adapterWithOnlyFilename, null, { preserveFileName: true });
306305
const result4 = await controllerWithOnlyFilename.createFile(
307306
config,
308307
'originalFile.txt',
309308
'data',
310309
'text/plain',
311-
{},
312-
{ preserveFileName: true }
310+
{}
313311
);
314312

315313
expect(result4.name).toBe('newname.txt');

src/Controllers/FilesController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class FilesController extends AdaptableController {
3333
filename = createResult?.name || filename; // if createFile returns a new filename, use it
3434

3535
const url = createResult?.url || await this.adapter.getFileLocation(config, filename); // if createFile returns a new url, use it otherwise get the url from the adapter
36-
36+
3737
return {
3838
url: url,
3939
name: filename,

0 commit comments

Comments
 (0)