Fix for issue #11, a visitor with a non-valid combination is now kick…

…ed to the next new valid one.

squabble/Squabble.cfc

@@ -68,18 +68,21 @@
 			access="public" returntype="void" output="false">
 	<cfargument name="testName" hint="the name of the test." type="string" required="Yes">
 	<cfscript>
-		//Question: would this section be easier to read as a single if with OR statement, or as it is?
-
 		//skip disabled
 		if(isTestDisabled(arguments.testname))
 		{
 			return;
 		}
 
-		//make it easier for testing, as deleting a cookie just makes it an empty string, rather than removing the key.
 		if(getVisitor().hasCombination(arguments.testName))
 		{
-			return;
+			if(arrayContains(listTestCombinations(arguments.testName), getCurrentCombination(arguments.testName)))
+			{
+				return;
+			}
+
+			//if the test has been disabled, or if someone has messed with thier cookie, give them something new.
+			getVisitor().clearCombination(arguments.testName);
 		}
 
 		//if it's a crawler, then dump it.

squabble/Visitor.cfc

@@ -83,6 +83,20 @@
     </cfscript>
 </cffunction>
 
+<cffunction name="clearCombination" hint="clear out the combination for a given test" access="public" returntype="void" output="false">
+	<cfargument name="testname" hint="the name of the test to get the variations for." type="string" required="Yes">
+
+	<cfif hasCombination(arguments.testname)>
+		<cfscript>
+			var cookieKey = createTestCombinationCookieKey(arguments.testname);
+			var requestKey = getRequestScopeKey(arguments.testname);
+
+			structDelete(request, requestKey);
+        </cfscript>
+	</cfif>
+	<cfcookie name="#cookieKey#" value="" expires="183">
+</cffunction>
+
 <!------------------------------------------- PACKAGE ------------------------------------------->
 
 <!------------------------------------------- PRIVATE ------------------------------------------->
@@ -93,7 +107,7 @@
 	<cfargument name="testname" hint="the name of the test to deserialise" type="string" required="Yes">
 	<cfscript>
 		//store all our bits in a request scope variable.
-		var key = "squabble-" & arguments.testName;
+		var key = getRequestScopeKey(arguments.testName);
 		if(!StructKeyExists(request, key))
 		{
 			request[key] = deserializeJSON(cookie[createTestCombinationCookieKey(arguments.testName)]);
@@ -103,6 +117,11 @@
     </cfscript>
 </cffunction>
 
+<cffunction name="getRequestScopeKey" hint="create the request scope key for storing deserialised combos" access="private" returntype="string" output="false">
+	<cfargument name="testname" hint="the name of the test to deserialise" type="string" required="Yes">
+	<cfreturn "squabble-" & arguments.testName />
+</cffunction>
+
 <cffunction name="getPreviewCombination" hint="returns a preview combination" access="public" returntype="struct" output="false">
 	<cfscript>
 		var combination = {};

unittests/service/ServiceTest.cfc

@@ -534,6 +534,41 @@
 	</cfscript>
 </cffunction>
 
+<cffunction name="testResetDisabledCombination" hint="test that a combination that has already been set, gets reset after it gets disabled"
+			access="public" returntype="void" output="false">
+	<cfscript>
+		clearSquabbleCookies();
+		service.registerTest("foo", testConfig);
+
+		//make sure it's not on control
+		service.runTest("foo");
+		clearSquabbleCookies();
+		service.runTest("foo");
+		clearSquabbleCookies();
+		service.runTest("foo");
+
+		var combos = service.listTestCombinations("foo");
+		combos = duplicate(combos);
+
+		debug(service.getCurrentCombination("foo"));
+
+		var combo = {barsection="test5", foosection="control"};
+
+		assertEquals(combo, service.getCurrentCombination("foo"));
+
+		service.removeCombination("foo", combo);
+
+		var reget = service.listTestCombinations("foo");
+
+		//make sure remove works
+		assertNotEquals(reget, combos);
+
+		service.runTest("foo");
+
+		assertNotEquals(combo, service.getCurrentCombination("foo"));
+    </cfscript>
+</cffunction>
+
 <!------------------------------------------- PACKAGE ------------------------------------------->
 
 <!------------------------------------------- PRIVATE ------------------------------------------->

unittests/tags/TagsTest.cfc

@@ -87,13 +87,7 @@
 <cffunction name="noSectionTest" hint="test tag functionality for a user whose cookie is missing a test section" access="public" returntype="void" output="false">
 	<cftransaction>
 		<cfscript>
-			//mock out the response we want
-			var visitor = mock(service.getVisitor());
-
-			visitor.isEnabled().returns(true);
-			visitor.hasCombination("foo").returns(true);
-			visitor.getCombination().returns({ barSection = "test4" });
-			service.setVisitor(visitor);
+			service.getVisitor().setCombination("foo", createUUID(),{ barSection = "test4" });
 
 			service.registerTest("foo", testConfig);
 			service.runTest("foo");