Fixed specs.

honkster · Feb 7, 2012 · 81b8cef · 81b8cef
1 parent c624571
commit 81b8cef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/generators/jelly/templates/javascripts/jelly.js b/generators/jelly/templates/javascripts/jelly.js
@@ -163,7 +163,10 @@
 
     Location: {
       on_redirect: function(location) {
-        top.location.href = location;
+        this.Window().top.location.href = location;
+      },
+      window: function() {
+        return window;
       }
     }
   });

diff --git a/spec/javascript/jelly_spec.js b/spec/javascript/jelly_spec.js
@@ -641,7 +641,8 @@ describe("Jelly.Location", function() {
 
   describe(".on_redirect", function() {
     it("sets top.location.href to the given location", function() {
-      window.top = {location: {}};
+      var window = {top: {location: {}}}
+      spyOn(Jelly.Location, "window").andReturn(window);
       Jelly.Location.on_redirect("http://mars.com");
       expect(window.top.location.href).toEqual("http://mars.com");
     });