@@ -29,7 +29,6 @@ print = function(txt) { Ruby.puts(txt); }; window.__defineSetter__("location", function(url){ var xhr = new XMLHttpRequest(); - xhr.async = false; xhr.open("GET", url); xhr.onreadystatechange = function(){ curLocation = curLocation.merge(url); @@ -652,7 +651,6 @@ print = function(txt) { Ruby.puts(txt); }; } if (this.async) - // FIXME: This is segfaulting new Ruby.Thread(function() { makeRequest(); }); else makeRequest(); js/johnson/browser/env.js @@ -9,9 +9,18 @@ module Johnson def test_set_location_returns_location filename = "file://#{File.expand_path(__FILE__)}" - @runtime.evaluate("window.location = '#{filename}'") + + may_thread { + @runtime.evaluate("window.location = '#{filename}'") + } + uri = URI.parse(filename) assert_equal(uri.to_s, @runtime.evaluate('window.location').to_s) end + + def may_thread(&block) + block.call + (Thread.list - [Thread.main]).each { |t| t.join } + end end end test/johnson/browser_test.rb ae3584f2d4e47d82c063c89631bcd8b23acfd9db Aaron Patterson aaron.patterson@gmail.com http://github.com/jbarnette/johnson/commit/68c9c39f88088f96eed26922a141c0fbb8dc24e2 68c9c39f88088f96eed26922a141c0fbb8dc24e2 2008-05-30T18:54:36-07:00 2008-05-30T18:54:36-07:00 location = is supposed to be async 57c32e7aa5d4061f3f96fa4ae64cc912ab78e5c3 Aaron Patterson aaron.patterson@gmail.com