Corrected notification aggregator method names. Fixes #12947.

Author: Reinmar

plugins/notificationaggregator/plugin.js

@@ -226,7 +226,7 @@
 		 */
 		getPercentage: function() {
 			// In case there are no weights at all we'll return 1.
-			if ( this.getTasksCount() === 0 ) {
+			if ( this.getTaskCount() === 0 ) {
 				return 1;
 			}
 
@@ -238,20 +238,20 @@
 		 * (or there are no tasks at all).
 		 */
 		isFinished: function() {
-			return this.getDoneTasksCount() === this.getTasksCount();
+			return this.getDoneTaskCount() === this.getTaskCount();
 		},
 
 		/**
 		 * @returns {Number} Returns a total tasks count.
 		 */
-		getTasksCount: function() {
+		getTaskCount: function() {
 			return this._tasks.length;
 		},
 
 		/**
 		 * @returns {Number} Returns the number of done tasks.
 		 */
-		getDoneTasksCount: function() {
+		getDoneTaskCount: function() {
 			return this._doneTasks;
 		},
 
@@ -274,8 +274,8 @@
 		 * @returns {String}
 		 */
 		_getNotificationMessage: function() {
-			var tasksCount = this.getTasksCount(),
-				doneTasks = this.getDoneTasksCount(),
+			var tasksCount = this.getTaskCount(),
+				doneTasks = this.getDoneTaskCount(),
 				templateParams = {
 					current: doneTasks,
 					max: tasksCount,
@@ -474,7 +474,7 @@
 	 * Fired when all tasks are done. On this event notification may change type to success or be hidden:
 	 *
 	 *		aggregator.on( 'finished', function() {
-	 *			if ( aggregator.getTasksCount() == 0 ) {
+	 *			if ( aggregator.getTaskCount() == 0 ) {
 	 *				aggregator.notification.hide();
 	 *			} else {
 	 *				aggregator.notification.update( { message: 'Done', type: 'success' } );

plugins/uploadwidget/plugin.js

@@ -448,7 +448,7 @@
 				editor, editor.lang.uploadwidget.uploadMany, editor.lang.uploadwidget.uploadOne );
 
 			aggregator.once( 'finished', function() {
-				var tasks = aggregator.getTasksCount();
+				var tasks = aggregator.getTaskCount();
 
 				if ( tasks === 0 ) {
 					aggregator.notification.hide();

tests/plugins/notificationaggregator/aggregator.js

@@ -133,44 +133,44 @@
 		'test getPercentage empty': function() {
 			var instance = new Aggregator( this.editor, '' );
 
-			instance.getTasksCount = sinon.stub().returns( 0 );
+			instance.getTaskCount = sinon.stub().returns( 0 );
 
 			assert.areSame( 1, instance.getPercentage(), 'Invalid return value' );
 		},
 
 		'test isFinished': function() {
 			var instance = new Aggregator( this.editor, '' );
-			instance.getDoneTasksCount = sinon.stub().returns( 2 );
-			instance.getTasksCount = sinon.stub().returns( 2 );
+			instance.getDoneTaskCount = sinon.stub().returns( 2 );
+			instance.getTaskCount = sinon.stub().returns( 2 );
 			assert.isTrue( instance.isFinished(), 'Return value' );
 		},
 
 		'test isFinished falsy': function() {
 			var instance = new Aggregator( this.editor, '' );
-			instance.getDoneTasksCount = sinon.stub().returns( 1 );
-			instance.getTasksCount = sinon.stub().returns( 2 );
+			instance.getDoneTaskCount = sinon.stub().returns( 1 );
+			instance.getTaskCount = sinon.stub().returns( 2 );
 			assert.isFalse( instance.isFinished(), 'Return value' );
 		},
 
 		'test isFinished empty': function() {
 			var instance = new Aggregator( this.editor, '' );
-			instance.getDoneTasksCount = sinon.stub().returns( 0 );
-			instance.getTasksCount = sinon.stub().returns( 0 );
+			instance.getDoneTaskCount = sinon.stub().returns( 0 );
+			instance.getTaskCount = sinon.stub().returns( 0 );
 			assert.isTrue( instance.isFinished(), 'Return value' );
 		},
 
-		'test getTasksCount': function() {
+		'test getTaskCount': function() {
 			var instance = new Aggregator( this.editor, '' );
 			instance._tasks = [ 0, 0 ];
 
-			assert.areSame( 2, instance.getTasksCount() );
+			assert.areSame( 2, instance.getTaskCount() );
 		},
 
-		'test getDoneTasksCount': function() {
+		'test getDoneTaskCount': function() {
 			var instance = new Aggregator( this.editor, '' );
 			instance._doneTasks = 3;
 
-			assert.areSame( 3, instance.getDoneTasksCount() );
+			assert.areSame( 3, instance.getDoneTaskCount() );
 		},
 
 		'test _addTask': function() {
@@ -254,8 +254,8 @@
 		'test _updateNotification notification call': function() {
 			var instance = new Aggregator( this.editor, '' );
 			instance._message.output = sinon.stub().returns( 'foo' );
-			instance.getDoneTasksCount = sinon.stub().returns( 1 );
-			instance.getTasksCount = sinon.stub().returns( 4 );
+			instance.getDoneTaskCount = sinon.stub().returns( 1 );
+			instance.getTaskCount = sinon.stub().returns( 4 );
 			instance.getPercentage = sinon.stub().returns( 0.25 );
 			instance.notification = new NotificationMock();
 
@@ -318,8 +318,8 @@
 			instance._message = {
 				output: sinon.stub().returns( 'foo' )
 			};
-			instance.getTasksCount = sinon.stub().returns( 4 );
-			instance.getDoneTasksCount = sinon.stub().returns( 1 );
+			instance.getTaskCount = sinon.stub().returns( 4 );
+			instance.getDoneTaskCount = sinon.stub().returns( 1 );
 			instance.getPercentage = sinon.stub().returns( 0.25 );
 
 			assert.areSame( 'foo', instance._getNotificationMessage() );
@@ -337,8 +337,8 @@
 			instance._singularMessage = {
 				output: sinon.stub().returns( 'bar' )
 			};
-			instance.getTasksCount = sinon.stub().returns( 1 );
-			instance.getDoneTasksCount = sinon.stub().returns( 0 );
+			instance.getTaskCount = sinon.stub().returns( 1 );
+			instance.getDoneTaskCount = sinon.stub().returns( 0 );
 			instance.getPercentage = sinon.stub().returns( 0.2 );
 
 			assert.areSame( 'bar', instance._getNotificationMessage() );
@@ -354,8 +354,8 @@
 		'test _getNotificationMessage plural message even if single message defined': function() {
 			var instance = new Aggregator( this.editor, 'foo', 'bar' );
 
-			instance.getTasksCount = sinon.stub().returns( 2 );
-			instance.getDoneTasksCount = sinon.stub().returns( 1 );
+			instance.getTaskCount = sinon.stub().returns( 2 );
+			instance.getDoneTaskCount = sinon.stub().returns( 1 );
 
 			assert.areSame( 'foo', instance._getNotificationMessage() );
 		},
@@ -364,8 +364,8 @@
 		// defined, the standard message is used.
 		'test _getNotificationMessage missing singular': function() {
 			var instance = new Aggregator( this.editor, 'foo' );
-			instance.getTasksCount = sinon.stub().returns( 1 );
-			instance.getDoneTasksCount = sinon.stub().returns( 0 );
+			instance.getTaskCount = sinon.stub().returns( 1 );
+			instance.getDoneTaskCount = sinon.stub().returns( 0 );
 
 			assert.areSame( 'foo', instance._getNotificationMessage() );
 		},