Commit 5fd3ccde authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Refina reconexión de módulos, testea funcionalidad 

Al reconectar un módulo que tuviera acciones concretas desconectadas, no
se reconectan automáticamente como hasta ahora. En su lugar, se puede
especificar una propiedad en la publicación para forzar este
comportamiento, que no siempre es el deseado.

Corrige tests desactualizados y añade nuevos para verificar este
comportamiento.
parent 647b080d

public/javascript/redmic/modules/base/_Module.js

+7 −4
Original line number Diff line number Diff line
@@ -612,12 +612,13 @@ define([ 


		_subConnect: function(req) {



			var actions = req.actions;

			var actions = req.actions,

				forceResumeActions = req.forceResumeActions;



			if (actions) {

				this._connectActions(actions);

			} else {

				this._resume();

				this._resume(forceResumeActions);



				this._emitEvt('CONNECT', {

					moduleChannel: this.getChannel()
@@ -650,11 +651,13 @@ define([ 
			this.statusFlags.paused = value;

		},



		_resume: function() {

		_resume: function(forceResumeActions) {



			this._getPaused() && this._setPaused(false);



			if (forceResumeActions) {

				this.actionsPaused = {};

			}

		},



		_subDisconnect: function(req) {

tests/unit/redmic/modules/base/test_Module.js

+66 −4
Original line number Diff line number Diff line
@@ -114,7 +114,36 @@ define([ 
				});

			},



			Should_RestoreResponsePublication_When_ModuleWithDisconnectedActionIsReconnected: function() {

			Should_NotRestoreResponsePublication_When_ModuleWithDisconnectedActionIsReconnected: function() {



				var dfd = this.async(timeout),

					cbk = function(obj) {



						dfd.reject({

							message: 'El módulo ha reconectado una acción desconectada tras una conexión genérica'

						});

					};



				setTimeout(function() {



					Mediator.remove(module.getChannel('GOT_PROPS'), cbk);

					dfd.resolve();

				}, timeout - 1);



				Mediator.publish(module.getChannel('DISCONNECT'), {

					actions: ['GET_PROPS']

				});



				Mediator.once(module.getChannel('GOT_PROPS'), cbk);



				Mediator.publish(module.getChannel('CONNECT'));



				Mediator.publish(module.getChannel('GET_PROPS'), {

					rootChannel: true

				});

			},



			Should_RestoreResponsePublication_When_ModuleWithDisconnectedActionIsReconnectedWithForceActions: function() {



				var dfd = this.async(timeout);
@@ -124,7 +153,9 @@ define([ 


				Mediator.once(module.getChannel('GOT_PROPS'), dfd.callback(function() {}));



				Mediator.publish(module.getChannel('CONNECT'));

				Mediator.publish(module.getChannel('CONNECT'), {

					forceResumeActions: true

				});



				Mediator.publish(module.getChannel('GET_PROPS'), {

					rootChannel: true
@@ -336,7 +367,36 @@ define([ 
				});

			},



			Should_RestoreChildResponsePublication_When_ParentModuleWithDisconnectedActionIsReconnected: function() {

			Should_NotRestoreChildResponsePublication_When_ParentModuleWithDisconnectedActionIsReconnected: function() {



				var dfd = this.async(timeout),

					cbk = function(obj) {



						dfd.reject({

							message: 'El módulo hijo ha reconectado una acción desconectada tras una conexión genérica del módulo padre'

						});

					};



				setTimeout(function() {



					Mediator.remove(module.getChannel('GOT_PROPS'), cbk);

					dfd.resolve();

				}, timeout - 1);



				Mediator.publish(parentModule.getChannel('DISCONNECT'), {

					actions: ['GET_PROPS']

				});



				Mediator.once(module.getChannel('GOT_PROPS'), cbk);



				Mediator.publish(module.getChannel('CONNECT'));



				Mediator.publish(module.getChannel('GET_PROPS'), {

					rootChannel: true

				});

			},



			Should_RestoreChildResponsePublication_When_ParentModuleWithDisconnectedActionIsReconnectedWithForceActions: function() {



				var dfd = this.async(timeout);
@@ -346,7 +406,9 @@ define([ 


				Mediator.once(module.getChannel('GOT_PROPS'), dfd.callback(function() {}));



				Mediator.publish(parentModule.getChannel('CONNECT'));

				Mediator.publish(parentModule.getChannel('CONNECT'), {

					forceResumeActions: true

				});



				Mediator.publish(module.getChannel('GET_PROPS'), {

					rootChannel: true