utilized new function from utils to generate a regexp based on a max …

…number supplied. resolves #8
ibm-cloud-solutions · Aug 18, 2016 · 2e53be1 · 2e53be1
1 parent 1735740
commit 2e53be1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/scripts/service.bind.js b/src/scripts/service.bind.js
@@ -92,7 +92,7 @@ module.exports = (robot) => {
 				prompt += '\n' + (i + 1) + ' - ' + serviceInstances[i].name;
 			}
 
-			var regex = new RegExp('([1-' + serviceInstances.length + ']+)');
+			var regex = utils.generateRegExpForNumberedList(serviceInstances.length);
 			utils.getExpectedResponse(res, robot, switchBoard, prompt, regex).then((selectionRes) => {
 				var selection = parseInt(selectionRes.match[1], 10);
 				var serviceInstanceIndex = parseInt(selection, 10);
@@ -107,7 +107,7 @@ module.exports = (robot) => {
 				}
 
 				// Prompt the user to select which app to unbind.
-				var regex = new RegExp('([1-' + apps.length + ']+)');
+				var regex = utils.generateRegExpForNumberedList(apps.length);
 				utils.getExpectedResponse(res, robot, switchBoard, prompt, regex).then((selectionRes) => {
 					selection = parseInt(selectionRes.match[1], 10);
 					var app = apps[selection - 1];

diff --git a/src/scripts/service.create.js b/src/scripts/service.create.js
@@ -100,7 +100,7 @@ module.exports = (robot) => {
 					prompt += '\n' + (i + 1) + ' - ' + plans[i].entity.name;
 				}
 
-				let regex = new RegExp('([1-' + plans.length + ']+)');
+				let regex = utils.generateRegExpForNumberedList(plans.length);
 				utils.getExpectedResponse(res, robot, switchBoard, prompt, regex).then((response) => {
 					var planIndex = parseInt(response.match[1], 10);
 
@@ -145,7 +145,7 @@ module.exports = (robot) => {
 									for (var i = 0; i < apps.length; i++) {
 										prompt += '\n' + (i + 1) + ' - ' + apps[i].name;
 									}
-									let regex = new RegExp('([1-' + apps.length + ']+)');
+									let regex = utils.generateRegExpForNumberedList(apps.length);
 									utils.getExpectedResponse(res, robot, switchBoard, prompt, regex).then((response) => {
 										// Selection made.
 										var appIndex = parseInt(response.match[1], 10);

diff --git a/src/scripts/service.unbind.js b/src/scripts/service.unbind.js
@@ -105,7 +105,7 @@ module.exports = (robot) => {
 				return;
 			}
 
-			var regex = new RegExp('([1-' + boundServices.length + ']+)');
+			var regex = utils.generateRegExpForNumberedList(boundServices.length);
 			utils.getExpectedResponse(res, robot, switchBoard, prompt, regex).then((response) => {
 				var selection = parseInt(response.match[1], 10);
 				var serviceInstanceIndex = parseInt(selection, 10);
@@ -127,7 +127,7 @@ module.exports = (robot) => {
 				}
 
 				// Prompt the user to select which app to unbind.
-				var regex = new RegExp('([1-' + appsBound.length + ']+)');
+				var regex = utils.generateRegExpForNumberedList(appsBound.length);
 				utils.getExpectedResponse(res, robot, switchBoard, prompt, regex).then((response) => {
 					selection = parseInt(response.match[1], 10);
 					var app = appsBound[selection - 1];