Skip to content

Commit fd13c24

Browse files
committed
Fix wrong reference in upload operation and update unit tests
1 parent 34deeb2 commit fd13c24

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

lib/js/src/manager/file/_FileManagerBase.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ class _FileManagerBase extends _SubManagerBase {
170170
this._deleteRemoteFileWithNamePrivate(fileName, (success, bytesAvailable, fileNames, errorMessage) => {
171171
if (!success) {
172172
failedDeletes.set(fileName, errorMessage);
173-
} else {
174-
this._bytesAvailable = bytesAvailable;
175173
}
176174
resolve();
177175
});

lib/js/src/manager/file/_UploadFileOperation.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ class _UploadFileOperation extends _Task {
4747
}
4848

4949
if (!this._fileManager.fileNeedsUpload(file)) {
50-
const errorMessage = this.fileManagerCannotOverwriteError;
50+
const errorMessage = _UploadFileOperation.fileManagerCannotOverwriteError;
5151
console.log(errorMessage);
52-
this._fileWrapper.getCompletionListener(false, null, null, errorMessage);
52+
if (typeof this._fileWrapper.getCompletionListener() === 'function') {
53+
this._fileWrapper.getCompletionListener()(false, null, null, errorMessage);
54+
}
5355
return this.onFinished();
5456
}
5557

tests/managers/file/UploadFileOperationTests.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ const Validator = require('../../Validator');
1111
module.exports = function (appClient) {
1212
const sdlManager = appClient._sdlManager;
1313
const fileManager = sdlManager.getFileManager();
14-
const uploadOverwriteFailure = 'File is already on the head unit, aborting upload operation';
15-
1614
describe('UploadFileOperationTests', function () {
1715
describe('when the file is already on the head unit', function () {
1816
describe('when not overwriting', function () {
@@ -28,7 +26,7 @@ module.exports = function (appClient) {
2826
Validator.assertNull(bytesAvailable);
2927
Validator.assertNull(fileNames);
3028
Validator.assertNotNullUndefined(errorMessage);
31-
Validator.assertEquals(errorMessage, uploadOverwriteFailure);
29+
Validator.assertEquals(errorMessage, SDL.manager.file._UploadFileOperation.fileManagerCannotOverwriteError);
3230
});
3331
const operation = new SDL.manager.file._UploadFileOperation(sdlManager._lifecycleManager, sdlManager.getFileManager(), testFileWrapper);
3432
await operation._start();

0 commit comments

Comments
 (0)