test/fixtures/config.yml test/paths_test.rb @@ -327,6 +327,7 @@ the Selenese format. * Jonas Bengston -- original creator * Marcos Tapajós http://www.improveit.com.br/en/company/tapajos -- Several useful features * Ryan Bates, http://railscasts.com -- Fixes for Rails 2.1 +* Nando Vieira, http://simplesideias.com.br == Information README @@ -32,6 +32,7 @@ begin require 'rcov/rcovtask' Rcov::RcovTask.new do |t| t.test_files = FileList['test/*_test.rb'] + t.rcov_opts = ['-x /site_ruby/ -x .*gems.* --rails'] end rescue LoadError #if rcov isn't available, ignore end Rakefile @@ -9,6 +9,7 @@ module SeleniumOnRails end def selenium_tests_path + return SeleniumOnRailsConfig.get("selenium_tests_path") if SeleniumOnRailsConfig.get("selenium_tests_path") File.expand_path(File.join(RAILS_ROOT, 'test/selenium')) end lib/selenium_on_rails/paths.rb @@ -1,4 +1,5 @@ require 'yaml' +require 'erb' class SeleniumOnRailsConfig @@defaults = {:environments => ['test']} @@ -14,9 +15,12 @@ class SeleniumOnRailsConfig def self.configs @@configs ||= nil unless @@configs - files = [File.join(RAILS_ROOT, 'config', 'selenium.yml')] + files = [File.join(RAILS_ROOT, 'config', 'selenium.yml'), File.expand_path(File.dirname(__FILE__) + '/../config.yml')] files.each do |file| - @@configs = YAML.load(ERB.new(IO.read(file)).result) if File.exist?(file) + if File.exist?(file) + @@configs = YAML.load(ERB.new(IO.read(file)).result) + break + end end @@configs ||= {} end lib/selenium_on_rails_config.rb @@ -34,3 +34,4 @@ browsers: #result_dir: 'c:\result' # the directory where the results will be stored after a test:acceptance run #fixtures_path: <%= "#{RAILS_ROOT}/spec/fixtures" %> +#selenium_tests_path: <%= "#{RAILS_ROOT}/spec/selenium" %> \ No newline at end of file selenium.yml.example @@ -2,7 +2,9 @@ require File.dirname(__FILE__) + '/test_helper' class RendererTest < Test::Unit::TestCase def setup + SeleniumOnRails::PartialsSupport.send(:include, SeleniumOnRails::PathsTestHelper) @controller = SeleniumController.new + @controller.extend(SeleniumOnRails::PathsTestHelper) ActionController::Routing::Routes.draw @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new @@ -20,8 +22,6 @@ END end def test_html - get :test_file, :testname => 'html.html' - assert_headers expected =<<END <html><head><title>test layout</title></head><body> Testing plain HTML @@ -32,8 +32,16 @@ END and it works... </body></html> END + File.open(test_path_for('html.html'), 'w+') { |index_file| index_file << expected } + get :test_file, :testname => 'html.html' + assert_headers + assert_text_equal expected, @response.body end + + def test_path_for(name) + "#{File.expand_path(File.dirname(__FILE__) + "/../test_data")}/#{name}" + end def test_rhtml get :test_file, :testname => 'rhtml.rhtml' test/renderer_test.rb @@ -9,8 +9,8 @@ class RSeleneseTest < Test::Unit::TestCase create_rsel_file_from(input, "html.rsel") @view = TestView.new + @view.extend(SeleniumOnRails::PathsTestHelper) @sel = SeleniumOnRails::RSelenese.new(@view) - @sel.render ActionView::Template.new(test_path_for("html.rsel")), {'page_title' => page_title} end test/rselenese_test.rb @@ -4,6 +4,7 @@ class SeleneseTest < Test::Unit::TestCase def setup @view = TestView.new + @view.extend(SeleniumOnRails::PathsTestHelper) @sel = SeleniumOnRails::Selenese.new(@view) end @@ -46,7 +47,7 @@ END assert_selenese expected, 'One line', input end - def test_comments_only + def test_comments_only expected = <<END Comment 1 @@ -57,7 +58,6 @@ END </table> END input = <<END - Comment *1* Comment 2 test/selenese_test.rb @@ -5,6 +5,7 @@ class SeleniumControllerTest < Test::Unit::TestCase def setup @controller = SeleniumController.new + @controller.extend(SeleniumOnRails::PathsTestHelper) ActionController::Routing::Routes.draw SeleniumController.any_instance.stubs(:layout_path).returns(false) @request = ActionController::TestRequest.new test/selenium_controller_test.rb @@ -12,14 +12,32 @@ class SeleniumOnRailsConfigTest < Test::Unit::TestCase def setup SeleniumOnRailsConfig.reset_config @selenium_file = File.join(RAILS_ROOT, 'config', 'selenium.yml') + @config_file = File.expand_path(File.dirname(__FILE__) + '/../config.yml') @selenium_content = File.read(File.dirname(__FILE__) + '/fixtures/selenium.yml') + @config_content = File.read(File.dirname(__FILE__) + '/fixtures/config.yml') end def test_get_selenium_yaml File.expects(:exist?).with(@selenium_file).returns(true) IO.expects(:read).with(@selenium_file).returns(@selenium_content) + IO.expects(:read).with(@config_file).never + IO.expects(:exist?).with(@config_file).never + assert_equal ["test_cache"], SeleniumOnRailsConfig.get(:environments) assert_equal({"firefox"=>"script/openfirefox"}, SeleniumOnRailsConfig.get(:browsers)) end - + + def test_get_when_config_yml_exists_but_selenium_yaml_not + File.expects(:exist?).with(@selenium_file).returns(false) + File.expects(:exist?).with(@config_file).returns(true) + IO.expects(:read).with(@config_file).returns(@config_content) + IO.expects(:read).with(@selenium_file).never + + assert_equal ["test"], SeleniumOnRailsConfig.get(:environments) + expected_config = {"safari"=>"/Applications/Safari.app/Contents/MacOS/Safari", + "firefox"=>"/Applications/Firefox.app/Contents/MacOS/firefox-bin"} + + assert_equal(expected_config, SeleniumOnRailsConfig.get(:browsers)) + end + end \ No newline at end of file test/selenium_on_rails_config_test.rb @@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/test_helper' class SeleniumSupportTest < Test::Unit::TestCase def setup @controller = SeleniumController.new + @controller.extend(SeleniumOnRails::PathsTestHelper) ActionController::Routing::Routes.draw @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new test/selenium_support_test.rb @@ -5,6 +5,7 @@ RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/") class SetupTest < Test::Unit::TestCase def setup @controller = SeleniumController.new + @controller.extend(SeleniumOnRails::PathsTestHelper) SeleniumController.any_instance.stubs(:clear_tables).returns([]) SeleniumController.any_instance.stubs(:layout_path).returns(false) ActionController::Routing::Routes.draw test/setup_test.rb @@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/test_helper' class SuiteRendererTest < Test::Unit::TestCase def setup @controller = SeleniumController.new + @controller.extend(SeleniumOnRails::PathsTestHelper) ActionController::Routing::Routes.draw @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new test/suite_renderer_test.rb @@ -6,6 +6,7 @@ require 'rubygems' gem 'activesupport' require 'active_support' +gem 'actionpack' require 'action_view/template_handler' require 'action_view/template_handlers/builder' require 'action_view/template_handlers/erb' @@ -31,11 +32,6 @@ def setup_controller_test(controller) @response = ActionController::TestResponse.new end -module SeleniumOnRails::Paths - def selenium_tests_path - File.expand_path(File.dirname(__FILE__) + '/../test_data') - end -end class SeleniumController attr_accessor :layout_override @@ -76,6 +72,12 @@ class Test::Unit::TestCase end +module SeleniumOnRails::PathsTestHelper + def selenium_tests_path + File.expand_path(File.dirname(__FILE__) + '/../test_data') + end +end + class TestView < ActionView::Base include SeleniumOnRails::PartialsSupport test/test_helper.rb test_data/html.html d5ae7496b3f46673546b2ef8dc675a339750f59e 25e0918d65600c8c5fb76674368dbac4520434c4 eric@8thlight.com eric@8thlight.com@9274398c-e119-0410-8437-aa71ef7847aa http://github.com/fnando/selenium-on-rails/commit/dbb235f76e584eb017c459c2b449a219fad39955 dbb235f76e584eb017c459c2b449a219fad39955

2009-03-07T15:37:16-08:00

Merge branch 'master' of git@github.com:paytonrules/selenium-on-rails Conflicts: .gitignore test/selenium_on_rails_config_test.rb Huge number of changes, but mostly relating to testing. git-svn-id: https://svn.openqa.org/svn/selenium-on-rails/selenium-on-rails@126 9274398c-e119-0410-8437-aa71ef7847aa c0ee868cce803ac4fbb8806f99d2c5a7a9085fba eric@8thlight.com eric@8thlight.com@9274398c-e119-0410-8437-aa71ef7847aa