test/fixtures/config.yml test/fixtures/selenium.yml test/paths_test.rb test/test_builder_functions_authortest.rb @@ -324,8 +324,9 @@ the Selenese format. * Jon Tirsen, http://jutopia.tirsen.com -- initial inspiration[http://wiki.rubyonrails.com/rails/pages/SeleniumIntegration] * Eric Kidd, http://www.randomhacks.net -- contribution of RSelenese * Jonas Bengston -- original creator -* Marcos Tapajos -- Several useful features +* 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 @@ -12,6 +12,16 @@ Rake::TestTask.new(:test) do |t| t.verbose = true end +desc 'Test the Selenium on Rails plugin, and run the _authortest.rb files, too' +Rake::TestTask.new(:alltests) do |t| + t.libs << 'lib' + # note: Both pattern and test_files are used, so the list of test files is + # the union of the two. + t.pattern = 'test/**/*_test.rb' + t.test_files = FileList['test/**/*_authortest.rb'] + t.verbose = true +end + desc 'Generate documentation for the Selenium on Rails plugin.' task :rdoc do rm_rf 'doc' @@ -22,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 @@ -1,3 +1,4 @@ +# Please read as our directions have changed: # Move this file to your rails apps config directory and rename it to selenium.yml in order to configure the plugin # @@ -31,3 +32,6 @@ browsers: #multi_window: false #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 config.yml.example @@ -1,5 +1,5 @@ require 'selenium_on_rails_config' -envs = SeleniumOnRailsConfig.new.get :environments +envs = SeleniumOnRailsConfig.get :environments if envs.include? RAILS_ENV #initialize the plugin init.rb @@ -5,12 +5,12 @@ class SeleniumController < ActionController::Base include SeleniumOnRails::Renderer def initialize - @config = SeleniumOnRailsConfig.new + @result_dir = SeleniumOnRailsConfig.get(:result_dir) end def setup unless params.has_key? :keep_session - reset_session + reset_session # IS THIS WORKING! NO THINK SO @session_wiped = true end @cleared_tables = clear_tables params[:clear_tables].to_s @@ -65,9 +65,9 @@ class SeleniumController < ActionController::Base end def record_table - return nil unless result_dir = @config.get(:result_dir) + return nil unless @result_dir - cur_result_dir = File.join(result_dir, (params[:logFile] || "default").sub(/\.yml$/, '')) + cur_result_dir = File.join(@result_dir, (params[:logFile] || "default").sub(/\.yml$/, '')) FileUtils.mkdir_p(cur_result_dir) File.open("#{cur_result_dir}/index.html", "wb") do |f| f.write <<EOS lib/controllers/selenium_controller.rb @@ -1,16 +1,16 @@ -class SwitchEnvironmentController < ActionController::Base - def index - readme_path = File.expand_path File.join(File.dirname(__FILE__), '..', 'README') - render :status => 500, :locals => {:readme_path => readme_path }, :inline => <<END -<p> - Selenium on Rails is only activated for <%= SeleniumOnRailsConfig.new.get(:environments).join ', ' %> - environment<%= SeleniumOnRailsConfig.get(:environments).size > 1 ? 's' : '' %> (you're running - <%= RAILS_ENV %>). -</p> -<p> - Start your server in a different environment or see <tt><%= readme_path %></tt> - for information regarding how to change this behavior. -</p> -END - end +class SwitchEnvironmentController < ActionController::Base + def index + readme_path = File.expand_path File.join(File.dirname(__FILE__), '..', 'README') + render :status => 500, :locals => {:readme_path => readme_path }, :inline => <<END +<p> + Selenium on Rails is only activated for <%= SeleniumOnRailsConfig.get(:environments).join ', ' %> + environment<%= SeleniumOnRailsConfig.get(:environments).size > 1 ? 's' : '' %> (you're running + <%= RAILS_ENV %>). +</p> +<p> + Start your server in a different environment or see <tt><%= readme_path %></tt> + for information regarding how to change this behavior. +</p> +END + end end \ No newline at end of file lib/controllers/switch_environment_controller.rb @@ -5,8 +5,8 @@ require 'net/http' require 'tempfile' -def c(var, default = nil) SeleniumOnRailsConfig.new.get var, default end -def c_b(var, default = nil) SeleniumOnRailsConfig.new.get(var, default) { yield } end +def c(var, default = nil) SeleniumOnRailsConfig.get var, default end +def c_b(var, default = nil) SeleniumOnRailsConfig.get(var, default) { yield } end BROWSERS = c :browsers, {} REUSE_EXISTING_SERVER = c :reuse_existing_server, true lib/selenium_on_rails/acceptance_test_runner.rb @@ -2,7 +2,6 @@ require 'selenium_on_rails_config' module SeleniumOnRails module Paths - attr_accessor :config def selenium_path @@selenium_path ||= find_selenium_path @@ -10,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 @@ -25,6 +25,7 @@ module SeleniumOnRails end def fixtures_path + return SeleniumOnRailsConfig.get("fixtures_path") if SeleniumOnRailsConfig.get("fixtures_path") File.expand_path File.join(RAILS_ROOT, 'test/fixtures') end @@ -42,7 +43,7 @@ module SeleniumOnRails private ############################################### def find_selenium_path - sel_dirs = @config.get :selenium_path do + sel_dirs = SeleniumOnRailsConfig.get :selenium_path do File.expand_path(File.dirname(__FILE__) + '/../../selenium-core') end lib/selenium_on_rails/paths.rb @@ -1,26 +1,28 @@ -require 'yaml' - -class SeleniumOnRailsConfig - attr_accessor :configs - - def initialize - @defaults = {:environments => ['test']} - initialize_configs - end - - def get var, default = nil - value = @configs[var.to_s] - value ||= @defaults[var] - value ||= default - value ||= yield if block_given? - value - end - - def initialize_configs - @configs = {} - files = [File.expand_path(File.dirname(__FILE__) + '/../config.yml')] - files << File.join(RAILS_ROOT, 'config', 'selenium.yml') - files.each { |file| @configs = YAML.load_file(file) if File.exist?(file) } - end - -end \ No newline at end of file +require 'yaml' +require 'erb' + +class SeleniumOnRailsConfig + @@defaults = {:environments => ['test']} + def self.get var, default = nil + value = configs[var.to_s] + value ||= @@defaults[var] + value ||= default + value ||= yield if block_given? + value + end + + private + def self.configs + @@configs ||= nil + unless @@configs + files = [File.expand_path(File.dirname(__FILE__) + '/../config.yml')] + files << File.join(RAILS_ROOT, 'config', 'selenium.yml') + files.each do |file| + @@configs = YAML.load(ERB.new(IO.read(file)).result) if File.exist?(file) + end + @@configs ||= {} + end + @@configs + end + +end lib/selenium_on_rails_config.rb @@ -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> <p>Testing plain HTML</p> @@ -32,8 +32,16 @@ END <p>and it works...</p> </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 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 @@ -26,7 +27,7 @@ EOS end def test_record_with_result - @controller.config.configs["result_dir"] = @result_dir + @controller.instance_variable_set(:@result_dir, @result_dir) post :record, :suite => @suite, "testTable.1" => "<table></table>", "testTable.2" => "<table></table>" test/selenium_controller_test.rb @@ -1,21 +1,47 @@ require File.dirname(__FILE__) + '/test_helper' require 'mocha' +class SeleniumOnRailsConfig + def self.reset_config + @@configs = nil + end +end + class SeleniumOnRailsConfigTest < Test::Unit::TestCase - def test_config_file_in_config_directory - File.stubs(:expand_path).returns("temporary") - File.expects(:exist?).with("temporary").returns(false) - File.expects(:exist?).with(File.join(RAILS_ROOT, 'config', 'selenium.yml')).returns(true) - YAML.expects(:load_file).with(File.join(RAILS_ROOT, 'config', 'selenium.yml')).returns({:fake => "hash"}) - - assert_equal({:fake => "hash"}, SeleniumOnRailsConfig.new.configs) + 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_when_config_yml_and_selenium_yaml_not_exists + File.expects(:exist?).with(@selenium_file).returns(false) + File.expects(:exist?).with(@config_file).returns(false) + IO.expects(:read).with(@config_file).never + IO.expects(:read).with(@selenium_file).never + assert_equal ["test"], SeleniumOnRailsConfig.get(:environments) end - def test_setting_config_manually - config = SeleniumOnRailsConfig.new - config.configs["test"] = "result" - - assert_equal("result", config.configs["test"]) + def test_get_when_config_yml_not_exists_but_selenium_yaml_exists + File.expects(:exist?).with(@selenium_file).returns(true) + File.expects(:exist?).with(@config_file).returns(false) + IO.expects(:read).with(@config_file).never + IO.expects(:read).with(@selenium_file).returns(@selenium_content) + 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) + assert_equal({"safari"=>"/Applications/Safari.app/Contents/MacOS/Safari", + "firefox"=>"/Applications/Firefox.app/Contents/MacOS/firefox-bin"}, 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 @@ -10,11 +10,8 @@ class SwitchEnvironmentControllerTest < Test::Unit::TestCase end def test_index - SeleniumOnRailsConfig.expects(:new).returns(@config) - @config.expects(:get).with(:environments).returns("hello dolly") - + SeleniumOnRailsConfig.expects(:get).with(:environments).returns("hello dolly") get :index - assert @response.body.include?('hello dolly') end end \ No newline at end of file test/switch_environment_controller_test.rb @@ -31,11 +31,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 +71,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 lib/selenium_on_rails/test_builder_functions_check.rb test_data/html.html d5ae7496b3f46673546b2ef8dc675a339750f59e 25e0918d65600c8c5fb76674368dbac4520434c4 eric@8thlight.com eric@8thlight.com@9274398c-e119-0410-8437-aa71ef7847aa http://github.com/paytonrules/selenium-on-rails/commit/dbb235f76e584eb017c459c2b449a219fad39955 dbb235f76e584eb017c459c2b449a219fad39955 2009-03-07T15:37:16-08:00 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