@@ -39,13 +39,11 @@ <script type='text/ruby' src='console_tutorial.rb'></script> <script type="text/ruby"> - $repl = Microsoft::Scripting::Silverlight::Repl.show('ruby') - $stdout = $repl.output_buffer - $stderr = $repl.output_buffer + include Microsoft::Scripting::Silverlight def load_assembly_from_path(path) - Microsoft::Scripting::Silverlight::DynamicApplication. - current.runtime.host.platform_adaptation_layer.load_assembly_from_path(path) + DynamicApplication.current.runtime.host.platform_adaptation_layer. + load_assembly_from_path(path) end # From Silverlight 3 SDK @@ -57,11 +55,12 @@ require 'System.Windows.Controls.Toolkit' require 'gui_tutorial' - Application.Current.RootVisual = GuiTutorial::Window.current - include System::Windows::Browser - if HtmlPage.document.query_string.contains_key "test".to_clr_string + if document.query_string.keys.include?('test') + $repl = Repl.show('ruby') + $stdout = $repl.output_buffer + $stderr = $repl.output_buffer require "test/silverlight" end </script> Merlin/Main/Languages/Ruby/Samples/Tutorial/sl_tutorial.html @@ -18,8 +18,7 @@ class ReplBufferStream def write_to_repl(str) GuiTutorial::Window.current.begin_invoke do - #TODO: Jimmy, fix me! - #$repl.output_buffer.write str + $repl.output_buffer.write str end end Merlin/Main/Languages/Ruby/Samples/Tutorial/test/silverlight.rb @@ -15,7 +15,9 @@ require 'stringio' -if !defined?(SILVERLIGHT) || !SILVERLIGHT +SILVERLIGHT = false unless defined?(SILVERLIGHT) + +if not SILVERLIGHT $: << File.expand_path(File.dirname(__FILE__) + '/..') $: << File.expand_path(File.dirname(__FILE__) + '/../app') end @@ -126,7 +128,7 @@ module TutorialTests def self.run_test spec, context, chapter chapter.tasks.each do |task| - if not task.should_run? context.bind + if not task.should_run? context.bind return end task.setup.call(context.bind) if task.setup @@ -161,12 +163,12 @@ describe "TryRubyTutorial" do end if not SILVERLIGHT -describe "HtmlGeneratorTests" do - it "basically works" do - tutorial = get_standard_tutorial('tryruby_tutorial.rb') - html_tutorial = HtmlTutorial.new tutorial - html = html_tutorial.generate_html - assert_match %r{<h2>Table of Contents</h2>}, html + describe "HtmlGeneratorTests" do + it "basically works" do + tutorial = get_standard_tutorial('tryruby_tutorial.rb') + html_tutorial = HtmlTutorial.new tutorial + html = html_tutorial.generate_html + assert_match %r{<h2>Table of Contents</h2>}, html + end end end -end Merlin/Main/Languages/Ruby/Samples/Tutorial/test/test_console.rb 36ad18639ac7b49d26ad029764190aca6e81f530 Jimmy Schementi jschementi@gmail.com http://github.com/ironruby/ironruby/commit/c96b1551effae5677b6b04812ecf490296dad4e3 c96b1551effae5677b6b04812ecf490296dad4e3 2009-10-23T15:37:07-07:00 2009-10-21T01:51:25-07:00 Get IronRuby tutorial tests running in Silverlight again, and only show the console when running tests. 036b969f8cb4fb9755eaaa96265446a90ad39f44 Jimmy Schementi jschementi@gmail.com