@@ -4,12 +4,12 @@ module Johnson module Conversions class ThreadTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_manipulate_thread thread = Thread.new { } - @context['thread'] = thread + @runtime['thread'] = thread assert_js_equal(false, "thread.send('alive?')") end end test/johnson/conversions/thread_test.rb @@ -4,18 +4,18 @@ module Johnson module Extensions class DefinePropertyTest < Johnson::TestCase def setup - @context = Johnson::Context.new - @context.evaluate("x = {}") + @runtime = Johnson::Runtime.new + @runtime.evaluate("x = {}") end def test_object_can_define_property - @context.evaluate("Object.defineProperty(x, 'answer', 42)") + @runtime.evaluate("Object.defineProperty(x, 'answer', 42)") assert_js_equal(42, "x.answer") end def test_object_can_define_unenumerable_property - @context.evaluate("Object.defineProperty(x, 'answer', 42)") - @context.evaluate <<-JS + @runtime.evaluate("Object.defineProperty(x, 'answer', 42)") + @runtime.evaluate <<-JS y = []; for(prop in x) if(prop == "answer") y.push(prop) JS @@ -23,8 +23,8 @@ module Johnson end def test_object_can_define_enumerable_property - @context.evaluate("Object.defineProperty(x, 'answer', 42, Object.ITERABLE)") - @context.evaluate <<-JS + @runtime.evaluate("Object.defineProperty(x, 'answer', 42, Object.ITERABLE)") + @runtime.evaluate <<-JS y = []; for(prop in x) if(prop == "answer") y.push(prop) JS @@ -32,22 +32,22 @@ module Johnson end def test_object_can_define_read_only_property - @context.evaluate("Object.defineProperty(x, 'answer', 42, Object.READ_ONLY)") - @context.evaluate("x.answer = 47") + @runtime.evaluate("Object.defineProperty(x, 'answer', 42, Object.READ_ONLY)") + @runtime.evaluate("x.answer = 47") assert_js_equal(42, "x.answer") end def test_object_can_define_non_deletable_property - @context.evaluate("Object.defineProperty(x, 'answer', 42, Object.NON_DELETABLE)") - @context.evaluate("r = (delete x.answer)") + @runtime.evaluate("Object.defineProperty(x, 'answer', 42, Object.NON_DELETABLE)") + @runtime.evaluate("r = (delete x.answer)") assert_js_equal(false, "r") assert_js_equal(42, "x.answer") end def test_object_can_define_mixed_property - @context.evaluate("Object.defineProperty(x, 'answer', 42, Object.NON_DELETABLE | Object.READ_ONLY)") - @context.evaluate("r = (delete x.answer)") - @context.evaluate("x.answer = 47") + @runtime.evaluate("Object.defineProperty(x, 'answer', 42, Object.NON_DELETABLE | Object.READ_ONLY)") + @runtime.evaluate("r = (delete x.answer)") + @runtime.evaluate("x.answer = 47") assert_js_equal(false, "r") assert_js_equal(42, "x.answer") end test/johnson/extensions_test.rb 41f0d9c7734080e6ce05f156eaaaf08e01707c14 Aaron Patterson aaron.patterson@gmail.com http://github.com/jbarnette/johnson/commit/4507bf52e909971dd1184256e0cfba3429ac3d3a 4507bf52e909971dd1184256e0cfba3429ac3d3a 2008-05-30T16:54:20-07:00 2008-05-30T16:54:20-07:00 making more shit work f2deeaf1fdb762533dd53d6e253d10627d751c89 Aaron Patterson aaron.patterson@gmail.com