Integrated loc.replace issues noted at http://code.google.com/p/respo…

…nds-to-parent/issues/detail?id=2
grosser · May 18, 2008 · 939e6ba · 939e6ba
1 parent 8ed4e51
commit 939e6ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/parent_selector_assertion.rb b/lib/parent_selector_assertion.rb
@@ -16,7 +16,7 @@ module SelectorAssertions
       def assert_select_parent(*args, &block)
         wrapper_re_str = Regexp.escape("with(window.parent) { setTimeout(function() { window.eval('") +
                        "(.*)" +
-                       Regexp.escape("'); loc.replace('about:blank'); }, 1) }")
+                       Regexp.escape("'); window.loc && loc.replace('about:blank'); }, 1) }")
         match = @response.body.match(Regexp.new(wrapper_re_str))
 
         if match
@@ -64,7 +64,7 @@ module SelectorAssertions
       def assert_select_parent(*args, &block)
         wrapper_re_str = Regexp.escape("with(window.parent) { setTimeout(function() { window.eval('") +
                        "(.*)" +
-                       Regexp.escape("'); loc.replace('about:blank'); }, 1) }")
+                       Regexp.escape("'); window.loc && loc.replace('about:blank'); }, 1) }")
         match = @response.body.match(Regexp.new(wrapper_re_str))
 
         if match
@@ -112,7 +112,7 @@ module SelectorAssertions
       def assert_select_parent(*args, &block)
         wrapper_re_str = Regexp.escape("with(window.parent) { setTimeout(function() { window.eval('") +
                        "(.*)" +
-                       Regexp.escape("'); loc.replace('about:blank'); }, 1) }")
+                       Regexp.escape("'); window.loc && loc.replace('about:blank'); }, 1) }")
         match = @response.body.match(Regexp.new(wrapper_re_str))
 
         if match

diff --git a/lib/responds_to_parent.rb b/lib/responds_to_parent.rb
@@ -37,7 +37,7 @@ def responds_to_parent(&block)
       # window.eval - legal eval for Opera
       render :text => "<html><body><script type='text/javascript' charset='utf-8'>
         var loc = document.location;
-        with(window.parent) { setTimeout(function() { window.eval('#{script}'); loc.replace('about:blank'); }, 1) } 
+        with(window.parent) { setTimeout(function() { window.eval('#{script}'); window.loc && loc.replace('about:blank'); }, 1) } 
       </script></body></html>"
     end
   end