Correct page type resolver logic

markdalgleish · Sep 18, 2012 · dbd9b7c · dbd9b7c
1 parent a0c624d
commit dbd9b7c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/urlresolver.js b/lib/urlresolver.js
@@ -12,7 +12,7 @@ var shortenUrl = function(url) {
 };
 
 var resolvePageType = function(url, types) {
-	url = resolveUrl(url);
+	url = shortenUrl(url);
 	types = types || standardPageTypes;
 
 	var matches = Object.keys(types).filter(function(type) {

diff --git a/test/urlresolver_test.js b/test/urlresolver_test.js
@@ -28,7 +28,9 @@ exports['shortenUrl'] = {
 
 exports['resolvePageType'] = {
 	'returns the correct page type': function(test) {
-		test.equals(resolver.resolvePageType('/foobar', { foo: /foo/ } ), 'foo');
+		test.equals(resolver.resolvePageType('2012/melbjs-september'), 'event');
+		test.equals(resolver.resolvePageType('series/melbjs'), 'series');
+		test.equals(resolver.resolvePageType('foobar', { foo: /foo/ } ), 'foo');
 		test.done();
 	}
 };