@@ -10,7 +10,7 @@ class SeleniumOnRails::RSelenese < SeleniumOnRails::TestBuilder end ActionView::Template.register_template_handler 'rsel', SeleniumOnRails::RSelenese -class SeleniumOnRails::RSelenese < SeleniumOnRails::TestBuilder +class SeleniumOnRails::RSelenese attr_accessor :view def initialize view @@ -18,21 +18,15 @@ class SeleniumOnRails::RSelenese < SeleniumOnRails::TestBuilder @view = view end - def render template, local_assigns + def render template, local_assigns = {} title = (@view.assigns['page_title'] or local_assigns['page_title']) - # table(title) do - # test = self #to enable test.command - # - # assign_locals_code = '' - # local_assigns.each_key {|key| assign_locals_code << "#{key} = local_assigns[#{key.inspect}];"} - # - # eval assign_locals_code + "\n" + template.source - # end - assign_locals_code = '' - local_assigns.each_key {|key| assign_locals_code << "#{key} = local_assigns[#{key.inspect}];"} - + evaluator = Evaluator.new(@view) - evaluator.run_script title, assign_locals_code + "\n" + template.source, local_assigns + evaluator.run_script title, assign_locals_code_from(local_assigns) + "\n" + template.source, local_assigns + end + + def assign_locals_code_from(local_assigns) + return local_assigns.keys.collect {|key| "#{key} = local_assigns[#{key.inspect}];"}.join end def self.call(template) lib/selenium_on_rails/rselenese.rb @@ -50,6 +50,21 @@ END input = "#{name}(#{args_str})" assert_rselenese expected_html, 'Selenese Commands', input end + + def test_render_rselenese_without_locals + expected_html = <<END +<table> +<tr><th colspan="3"></th></tr> +</table> +END + create_rsel_file_from('', "html.rsel") + + @view = TestView.new + @view.extend(SeleniumOnRails::PathsTestHelper) + @sel = SeleniumOnRails::RSelenese.new(@view) + + assert_text_equal expected_html, @sel.render(ActionView::Template.new(test_path_for("html.rsel"))) + end def test_element_locators assert_generates_command %w{click aCheckbox}, :click, 'aCheckbox' test/rselenese_test.rb dda05ad88ad45a06258ecc41dfa7e54acc5aa3ee eric@8thlight.com eric@8thlight.com@9274398c-e119-0410-8437-aa71ef7847aa http://github.com/paytonrules/selenium-on-rails/commit/fe10df9112b143932f531769942507219304b346 fe10df9112b143932f531769942507219304b346 2009-03-07T15:37:52-08:00 2009-03-07T15:37:52-08:00 Quick refactoring in rselense. git-svn-id: https://svn.openqa.org/svn/selenium-on-rails/selenium-on-rails@130 9274398c-e119-0410-8437-aa71ef7847aa 4c1cb51c019805475c61dd80b3e2fe8c04dceb81 eric@8thlight.com eric@8thlight.com@9274398c-e119-0410-8437-aa71ef7847aa