.gitmodules test/unit/templates/default.erb vendor/unittest_js @@ -45,6 +45,9 @@ From the root Prototype directory, Check out the Prototype source with $ git clone git://github.com/sstephenson/prototype.git + $ cd prototype + $ git submodule init + $ git submodule update Find out how to contribute: http://prototypejs.org/contribute README.rdoc @@ -1,13 +1,14 @@ require 'rake' require 'rake/packagetask' -PROTOTYPE_ROOT = File.expand_path(File.dirname(__FILE__)) -PROTOTYPE_SRC_DIR = File.join(PROTOTYPE_ROOT, 'src') -PROTOTYPE_DIST_DIR = File.join(PROTOTYPE_ROOT, 'dist') -PROTOTYPE_PKG_DIR = File.join(PROTOTYPE_ROOT, 'pkg') -PROTOTYPE_TEST_DIR = File.join(PROTOTYPE_ROOT, 'test') -PROTOTYPE_TMP_DIR = File.join(PROTOTYPE_TEST_DIR, 'unit', 'tmp') -PROTOTYPE_VERSION = '1.6.0.3' +PROTOTYPE_ROOT = File.expand_path(File.dirname(__FILE__)) +PROTOTYPE_SRC_DIR = File.join(PROTOTYPE_ROOT, 'src') +PROTOTYPE_DIST_DIR = File.join(PROTOTYPE_ROOT, 'dist') +PROTOTYPE_PKG_DIR = File.join(PROTOTYPE_ROOT, 'pkg') +PROTOTYPE_TEST_DIR = File.join(PROTOTYPE_ROOT, 'test') +PROTOTYPE_TEST_UNIT_DIR = File.join(PROTOTYPE_TEST_DIR, 'unit') +PROTOTYPE_TMP_DIR = File.join(PROTOTYPE_TEST_UNIT_DIR, 'tmp') +PROTOTYPE_VERSION = '1.6.0.3' task :default => [:dist, :dist_helper, :package, :clean_package_source] @@ -47,46 +48,71 @@ Rake::PackageTask.new('prototype', PROTOTYPE_VERSION) do |package| ) end -desc "Builds the distribution and the test suite, runs the tests and collects their results." -task :test => [:dist, :test_units] +task :clean_package_source do + rm_rf File.join(PROTOTYPE_PKG_DIR, "prototype-#{PROTOTYPE_VERSION}") +end -require 'test/lib/jstest' -desc "Runs all the JavaScript unit tests and collects the results" -JavaScriptTestTask.new(:test_units => [:build_unit_tests]) 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("/test") +task :test => ['test:build', 'test:run'] +namespace :test do + desc 'Runs all the JavaScript unit tests and collects the results' + task :run => [:require] do + testcases = ENV['TESTCASES'] + browsers_to_test = ENV['BROWSERS'] && ENV['BROWSERS'].split(',') + tests_to_run = ENV['TESTS'] && ENV['TESTS'].split(',') + runner = UnittestJS::WEBrickRunner::Runner.new(:test_dir => PROTOTYPE_TMP_DIR) + + Dir[File.join(PROTOTYPE_TMP_DIR, '*_test.html')].each do |file| + file = File.basename(file) + test = file.sub('_test.html', '') + unless tests_to_run && !tests_to_run.include?(test) + runner.add_test(file, testcases) + end + end + + UnittestJS::Browser::SUPPORTED.each do |browser| + unless browsers_to_test && !browsers_to_test.include?(browser) + runner.add_browser(browser.to_sym) + end + end + + trap('INT') { runner.teardown; exit } + runner.run + end - Dir.mkdir(PROTOTYPE_TMP_DIR) unless File.exist?(PROTOTYPE_TMP_DIR) + task :build => [:clean, :dist] do + builder = UnittestJS::Builder::SuiteBuilder.new({ + :input_dir => PROTOTYPE_TEST_UNIT_DIR, + :assets_dir => PROTOTYPE_DIST_DIR + }) + selected_tests = (ENV['TESTS'] || '').split(',') + builder.collect(*selected_tests) + builder.render + end - Dir["test/unit/tmp/*_test.html"].each do |file| - test_name = File.basename(file).sub("_test.html", "") - unless tests_to_run && !tests_to_run.include?(test_name) - t.run("/#{file}", testcases) - end + task :clean => [:require] do + UnittestJS::Builder.empty_dir!(PROTOTYPE_TMP_DIR) end - %w( safari firefox ie konqueror opera chrome ).each do |browser| - t.browser(browser.to_sym) unless browsers_to_test && !browsers_to_test.include?(browser) + task :require do + lib = 'vendor/unittest_js/lib/unittest_js' + unless File.exists?(lib) + puts "\nYou'll need UnittestJS to run the tests. Just run:\n\n" + puts " $ git submodule init" + puts " $ git submodule update" + puts "\nand you should be all set.\n\n" + end + require lib end end -task :build_unit_tests do - Dir[File.join('test', 'unit', '*_test.js')].each do |file| - PageBuilder.new(file, 'prototype.erb').render - end +task :test_units do + puts '"rake test_units" is deprecated. Please use "rake test" instead.' end -task :clean_package_source do - rm_rf File.join(PROTOTYPE_PKG_DIR, "prototype-#{PROTOTYPE_VERSION}") +task :build_unit_tests do + puts '"rake test_units" is deprecated. Please use "rake test:build" instead.' end -desc 'Generates an empty tmp directory for building tests.' task :clean_tmp do - puts 'Generating an empty tmp directory for building tests.' - FileUtils.rm_rf(PROTOTYPE_TMP_DIR) if File.exist?(PROTOTYPE_TMP_DIR) - Dir.mkdir(PROTOTYPE_TMP_DIR) + puts '"rake clean_tmp" is deprecated. Please use "rake test:clean" instead.' end Rakefile @@ -313,7 +313,7 @@ new Test.Unit.Runner({ // with empty action attribute request = $("ffe").request({ method: 'post' }); - this.assert(request.url.include("unit/tmp/form_test.html"), + this.assert(request.url.include("/tmp/form_test.html"), 'wrong default action for form element with empty action attribute'); }, test/unit/form_test.js test/lib/assets/test.css test/lib/assets/unittest.js test/lib/jstest.rb test/lib/templates/default.erb test/lib/templates/prototype.erb 1d617df4df4b2ae8dff41038c59ee67928e0f3cd Tobie Langel tobie.langel@gmail.com http://github.com/sstephenson/prototype/commit/52a781ae2a9a078d38869e8a7f76d9561fb31d8a 52a781ae2a9a078d38869e8a7f76d9561fb31d8a 2008-12-11T09:01:31-08:00 2008-12-11T09:01:31-08:00 Switch to UnittestJS. 7bf95223cb4be824da96da93edca778322e0f1e9 Tobie Langel tobie.langel@gmail.com