Merge pull request #16326 from owncloud/fix-16192

include base dn test in functionality test

1 files changed, 7 insertions, 2 deletions

diff --git a/apps/user_ldap/js/wizard/wizardTabElementary.js b/apps/user_ldap/js/wizard/wizardTabElementary.js
index 75664275a9c..7c1a550c097 100644
--- a/apps/user_ldap/js/wizard/wizardTabElementary.js
+++ b/apps/user_ldap/js/wizard/wizardTabElementary.js
@@ -17,6 +17,8 @@ OCA = OCA || {};
 		/** @property {number} */
 		_configChooserNextServerNumber: 1,
 
+		baseDNTestTriggered: false,
+
 		/**
 		 * initializes the instance. Always call it after initialization.
 		 *
@@ -198,8 +200,8 @@ OCA = OCA || {};
 		 * @param {Object} configuration
 		 */
 		onConfigSwitch: function(view, configuration) {
+			this.baseDNTestTriggered = false;
 			view.disableElement(view.managedItems.ldap_port.$relatedElements);
-
 			view.onConfigLoaded(view, configuration);
 		},
 
@@ -261,7 +263,8 @@ OCA = OCA || {};
 		 * @param {FeaturePayload} payload
 		 */
 		onTestResultReceived: function(view, payload) {
-			if(payload.feature === 'TestBaseDN') {
+			if(view.baseDNTestTriggered && payload.feature === 'TestBaseDN') {
+				view.enableElement(view.managedItems.ldap_base.$testButton);
 				var message;
 				if(payload.data.status === 'success') {
 					var objectsFound = parseInt(payload.data.changes.ldap_test_base, 10);
@@ -310,7 +313,9 @@ OCA = OCA || {};
 		 */
 		onBaseDNTestButtonClick: function(event) {
 			event.preventDefault();
+			this.baseDNTestTriggered = true;
 			this.configModel.requestWizard('ldap_test_base');
+			this.disableElement(this.managedItems.ldap_base.$testButton);
 		},
 
 		/**