Fix unit tests

Signed-off-by: Tomasz Grobelny <[email protected]>
nextcloud · Nov 24, 2018 · 04d326f · 04d326f
1 parent c83c268
commit 04d326f
Show file tree

Hide file tree

Showing 3 changed files with 286 additions and 180 deletions.
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
@@ -2132,6 +2132,9 @@
 			options = options || {};
 			var fileEl = this.findFileEl(name);
 			var fileData = _.findWhere(this.files, {name: name});
+			if (!fileData) {
+				return;
+			}
 			var fileId = fileData.id;
 			if (this._selectedFiles[fileId]) {
 				// remove from selection first
@@ -2227,7 +2230,7 @@
 				return self.filesClient.move(dir + fileName, targetPath + fileName)
 					.done(function() {
 						// if still viewing the same directory
-						if (OC.joinPaths(self.getCurrentDirectory(), '/') === dir) {
+						if (OC.joinPaths(self.getCurrentDirectory(), '/') === OC.joinPaths(dir, '/')) {
 							// recalculate folder size
 							var oldFile = self.findFileEl(target);
 							var newFile = self.findFileEl(fileName);
@@ -2367,7 +2370,7 @@
 						filesToNotify.push(fileName);
 
 						// if still viewing the same directory
-						if (OC.joinPaths(self.getCurrentDirectory(), '/') === dir) {
+						if (OC.joinPaths(self.getCurrentDirectory(), '/') === OC.joinPaths(dir, '/')) {
 							// recalculate folder size
 							var oldFile = self.findFileEl(target);
 							var newFile = self.findFileEl(fileName);
@@ -2869,14 +2872,14 @@
 				self.showFileBusyState($tr, true);
 				return self.filesClient.remove(dir + '/' + fileName)
 					.done(function() {
-						if (OC.joinPaths(self.getCurrentDirectory(), '/') === dir) {
+						if (OC.joinPaths(self.getCurrentDirectory(), '/') === OC.joinPaths(dir, '/')) {
 							self.remove(fileName);
 						}
 					})
 					.fail(function(status) {
 						if (status === 404) {
 							// the file already did not exist, remove it from the list
-							if (OC.joinPaths(self.getCurrentDirectory(), '/') === dir) {
+							if (OC.joinPaths(self.getCurrentDirectory(), '/') === OC.joinPaths(dir, '/')) {
 								self.remove(fileName);
 							}
 						} else {

diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
@@ -24,6 +24,7 @@ describe('OC.Upload tests', function() {
 	var testFile;
 	var uploader;
 	var failStub;
+	var progressBarStub;
 
 	beforeEach(function() {
 		testFile = {
@@ -45,7 +46,8 @@ describe('OC.Upload tests', function() {
 			'</div>'
 		);
 		$dummyUploader = $('#file_upload_start');
-		uploader = new OC.Uploader($dummyUploader);
+		progressBarStub = {on: function(){}};
+		uploader = new OC.Uploader($dummyUploader, {progressBar: progressBarStub});
 		failStub = sinon.stub();
 		uploader.on('fail', failStub);
 	});
@@ -142,6 +144,7 @@ describe('OC.Upload tests', function() {
 			conflictDialogStub = sinon.stub(OC.dialogs, 'fileexists');
 
 			uploader = new OC.Uploader($dummyUploader, {
+				progressBar: progressBarStub,
 				fileList: fileList
 			});