From 282cc5afddcb61acf232367b15305b954dd75200 Mon Sep 17 00:00:00 2001
From: Pat Cavit <github@patcavit.com>
Date: Thu, 19 May 2016 09:51:36 -0700
Subject: [PATCH] Fix m.route() tests

- Wasn't calling route.prefix(), was assigning to it
- Needed to handle pushstate prefix (`""`) specially in assertions
---
 api/tests/test-router.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/api/tests/test-router.js b/api/tests/test-router.js
index 5dc6572a..5c17ac73 100644
--- a/api/tests/test-router.js
+++ b/api/tests/test-router.js
@@ -11,7 +11,13 @@ var createRouter = require("../router")
 o.spec("m.route", function() {
 	var $window, root, router
 	
-	["#", "?", "", "#!", "?!"].forEach(function(prefix) {
+	[
+		"#",
+		"?",
+		"#!",
+		"?!",
+		""
+	].forEach(function(prefix) {
 		var spec = prefix ? "prefix " + prefix : "pushstate";
 		
 		o.spec(spec, function() {
@@ -41,7 +47,7 @@ o.spec("m.route", function() {
 				var redraw = {}
 				var router = createRouter($window, redraw)
 				
-				router.prefix = prefix
+				router.prefix(prefix)
 				
 				router(root, "/", {
 					"/" : {
@@ -57,7 +63,7 @@ o.spec("m.route", function() {
 			o("renders into `root`", function() {
 				var router = createRouter($window, {})
 				
-				router.prefix = prefix
+				router.prefix(prefix)
 				
 				router(root, "/", {
 					"/" : {
@@ -76,7 +82,7 @@ o.spec("m.route", function() {
 				var redraw = {}
 				var router = createRouter($window, redraw)
 				
-				router.prefix = prefix
+				router.prefix(prefix)
 				
 				router(root, "/", {
 					"/" : {
@@ -110,7 +116,7 @@ o.spec("m.route", function() {
 				
 				e.initEvent("click", true, true)
 				
-				router.prefix = prefix
+				router.prefix(prefix)
 				
 				router(root, "/", {
 					"/" : {
@@ -147,7 +153,7 @@ o.spec("m.route", function() {
 				
 				e.initEvent("click", true, true)
 				
-				router.prefix = prefix
+				router.prefix(prefix)
 				
 				router(root, "/", {
 					"/" : {
@@ -165,9 +171,11 @@ o.spec("m.route", function() {
                     }
 				})
 				
+				o($window.location.href).equals("http://localhost/" + (prefix ? prefix + "/" : ""))
+				
 				root.firstChild.dispatchEvent(e)
 				
-				o($window.location.href).equals("http://localhost/" + prefix + "/test")
+				o($window.location.href).equals("http://localhost/" + (prefix ? prefix + "/test" : "test"))
 			})
 		})
 	})