@@ -1,4 +1,8 @@ +== 0.7.0 2008-02-16 + * ajaxMock: user Ajax.Request.prepareMocks/clearMocks in setup/teardown respectively +* Improved Event.simulate [thx Juriy Zaytsev] +* Moved test/*.html -> test/unit/*.html as per newjs 1.1.0 == 0.6.0 2008-02-16 History.txt @@ -12,7 +12,7 @@ require 'rake/packagetask' $:.unshift File.dirname(__FILE__) + "/lib" -APP_VERSION = '0.6.0' +APP_VERSION = '0.7.0' APP_NAME = 'drnic_js_test_helpers' RUBYFORGE_PROJECT = 'drnicutilities' APP_FILE_NAME= "#{APP_NAME}.js" @@ -66,11 +66,11 @@ Rake::PackageTask.new(APP_NAME, APP_VERSION) do |package| end desc "Builds the distribution, runs the JavaScript unit tests and collects their results." -task :test => [:dist, :test_units] +task :test => [:dist, :test_units, :test_functionals] require 'jstest' desc "Runs all the JavaScript unit tests and collects the results" -JavaScriptTestTask.new(:test_units) do |t| +JavaScriptTestTask.new(:test_units, 4711) do |t| testcases = ENV['TESTCASES'] tests_to_run = ENV['TESTS'] && ENV['TESTS'].split(',') browsers_to_test = ENV['BROWSERS'] && ENV['BROWSERS'].split(',') @@ -90,6 +90,27 @@ JavaScriptTestTask.new(:test_units) do |t| end end +desc "Runs all the JavaScript functional tests and collects the results" +JavaScriptTestTask.new(:test_functionals, 4712) do |t| + testcases = ENV['TESTCASES'] + tests_to_run = ENV['TESTS'] && ENV['TESTS'].split(',') + browsers_to_test = ENV['BROWSERS'] && ENV['BROWSERS'].split(',') + + t.mount("/dist") + t.mount("/src") + t.mount("/test") + + Dir["test/functional/*_test.html"].sort.each do |test_file| + tests = testcases ? { :url => "/#{test_file}", :testcases => testcases } : "/#{test_file}" + test_filename = test_file[/.*\/(.+?)\.html/, 1] + t.run(tests) unless tests_to_run && !tests_to_run.include?(test_filename) + end + + %w( safari firefox ie konqueror opera ).each do |browser| + t.browser(browser.to_sym) unless browsers_to_test && !browsers_to_test.include?(browser) + end +end + task :clean_package_source do rm_rf File.join(APP_PKG_DIR, "#{APP_NAME}-#{APP_VERSION}") end Rakefile @@ -268,14 +268,14 @@ end class JavaScriptTestTask < ::Rake::TaskLib - def initialize(name=:test) + def initialize(name=:test, port=4711) @name = name @tests = [] @browsers = [] - + @port = port @queue = Queue.new - @server = WEBrick::HTTPServer.new(:Port => 4711) # TODO: make port configurable + @server = WEBrick::HTTPServer.new(:Port => @port) # TODO: make port configurable @server.mount_proc("/results") do |req, res| @queue.push({ :tests => req.query['tests'].to_i, @@ -308,12 +308,12 @@ class JavaScriptTestTask < ::Rake::TaskLib browser.setup puts "\nStarted tests in #{browser}" @tests.each do |test| - params = "resultsURL=http://localhost:4711/results&t=" + ("%.6f" % Time.now.to_f) + params = "resultsURL=http://localhost:#{@port}/results&t=" + ("%.6f" % Time.now.to_f) if test.is_a?(Hash) params << "&tests=#{test[:testcases]}" if test[:testcases] test = test[:url] end - browser.visit("http://localhost:4711#{test}?#{params}") + browser.visit("http://localhost:#{@port}#{test}?#{params}") result = @queue.pop result.each { |k, v| results[k] += v } lib/jstest.rb 22fe34b655e57bb6bec6d95f1231ec3bdbb0e3af Dr Nic drnicwilliams@gmail.com http://github.com/drnic/drnic_js_test_helpers/commit/65eefcc6370ab10c3fc44fc271e3c203ace17682 65eefcc6370ab10c3fc44fc271e3c203ace17682 2008-02-16T20:34:48-08:00 2008-02-16T20:34:48-08:00 release 0.7.0 + Improved Event.simulate [thx Juriy Zaytsev] b46bc25e47c34851c1253e6dc77d8ccfe7e5d9c0 Dr Nic drnicwilliams@gmail.com