From 0482c032034b83f7f30d9932010cc64cbd2e8108 Mon Sep 17 00:00:00 2001
From: Klaus Laube <klaus@corp.globo.com>
Date: Fri, 24 Aug 2012 01:17:40 -0300
Subject: [PATCH] Improvements in tests

---
 tests/jasmine/SpecRunner.html     |   6 +-
 tests/jasmine/spec/jsRouteSpec.js | 110 ++++++++++++++++--------------
 2 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/tests/jasmine/SpecRunner.html b/tests/jasmine/SpecRunner.html
index 392a228..d8fdf67 100644
--- a/tests/jasmine/SpecRunner.html
+++ b/tests/jasmine/SpecRunner.html
@@ -10,11 +10,11 @@
   <script type="text/javascript" src="lib/jasmine-1.2.0.rc3/jasmine-html.js"></script>
 
   <!-- include source files here... -->
-  <script type="text/javascript" src="spec/SpecHelper.js"></script>
-  <script type="text/javascript" src="spec/jsRouteSpec.js"></script>
+  <script type="text/javascript" src="../../jsRoute.js"></script>
 
   <!-- include spec files here... -->
-  <script type="text/javascript" src="../../jsRoute.js"></script>
+  <script type="text/javascript" src="spec/SpecHelper.js"></script>
+  <script type="text/javascript" src="spec/jsRouteSpec.js"></script>
 
   <script type="text/javascript">
     (function() {
diff --git a/tests/jasmine/spec/jsRouteSpec.js b/tests/jasmine/spec/jsRouteSpec.js
index ac3c7d9..09d16ee 100644
--- a/tests/jasmine/spec/jsRouteSpec.js
+++ b/tests/jasmine/spec/jsRouteSpec.js
@@ -1,51 +1,59 @@
-describe("jsRoute", function() {
-
-	beforeEach(function() {
-
-	});
-
-	it("should be able to add routes", function() {
-		route.add('^$', function(){self.x = self.x+1;});
-		expect(route.routes.indexOf("^$") > -1).toBeTruthy();
-	});
-
-	it("should be able to init routing", function() {
-		location.hash="#22-10-2012";
-		
-		route.add('^\\d{1,2}\\-\\d{1,2}\-\\d{4}$', function(x){
-			if(x==='22-10-2012'){
-				location.hash='#alterado';
-			}
-		});
-		
-		runs(function(){
-			route.init();
-		});
-		
-		waits(1000);
-		
-		runs(function(){
-			expect(location.hash).toEqual('#alterado');
-		});
-		
-	});
-	
-	it("should be able to force a route", function() {		
-		route.add('^\\d{1,2}\\-\\d{1,2}\-\\d{4}$', function(x){
-			if(x==='23-10-2012'){
-				location.hash='#alterado';
-			}
-		});
-		
-		runs(function(){
-			route.call('#23-10-2012');
-		});
-		
-		waits(1000);
-		
-		runs(function(){
-			expect(location.hash).toEqual('#alterado');
-		});
-		
-	});
-});
\ No newline at end of file
+/*global describe, afterEach, beforeEach, it, expect, runs, waits, window, route*/
+
+(function (window, route) {
+
+    'use strict';
+
+    describe("jsRoute", function () {
+
+        var self = this;
+
+        beforeEach(function () {
+            route.routes = [];
+            route.funcs = [];
+            self.hash = false;
+            window.clearInterval(route.interval);
+        });
+
+        it("should be able to add routes", function () {
+            route.add('^$', function () {
+                self.x = self.x + 1;
+            });
+            expect(route.routes.indexOf("^$") > -1).toBeTruthy();
+        });
+
+        it("should be able to init routing", function () {
+            window.location.hash = "#22-10-2012";
+            
+            route.add('^\\d{1,2}-\\d{1,2}-\\d{4}$', function (day) {
+                self.hash = day;
+            });
+            
+            route.init();
+
+            waits(1000);
+
+            runs(function () {
+                expect('22-10-2012').toEqual(self.hash);
+            });
+        });
+        
+        it("should be able to force a route", function () {
+            route.add('^\\d{1,2}-\\d{1,2}-\\d{4}$', function (day) {
+                self.hash = day;
+            });
+
+            route.call('23-10-2012');
+            expect('23-10-2012').toEqual(self.hash);
+        });
+
+        it("should be able to use pure regexp as route", function () {
+            route.add(/^\d{1,2}-\d{1,2}-\d{4}$/, function (day) {
+                self.hash = day;
+            });
+
+            route.call('24-08-2012');
+            expect('24-08-2012').toEqual(self.hash);
+        });
+    });
+}(window, route));