From dbd9b7c49a54c868a805406ab6d60e8fb78cf809 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Tue, 18 Sep 2012 21:46:21 +1000 Subject: [PATCH] Correct page type resolver logic --- lib/urlresolver.js | 2 +- test/urlresolver_test.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/urlresolver.js b/lib/urlresolver.js index f99a611..c53d710 100644 --- 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 index fd2aeb3..7374696 100644 --- 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(); } }; \ No newline at end of file