lib/blue_ridge.rb spec/rubies/blue_ridge_spec.rb spec/rubies/spec_helper.rb @@ -1,4 +1,15 @@ ENV["BLUE_RIDGE_PREFIX"] = File.dirname(__FILE__) import File.dirname(__FILE__) + '/tasks/javascript_testing_tasks.rake' -task :default => "test:javascripts" \ No newline at end of file +gem "spicycode-micronaut", ">= 0.2.4" +require 'micronaut' +require 'micronaut/rake_task' + +namespace :test do + desc "Run all micronaut examples using rcov" + Micronaut::RakeTask.new :rubies do |t| + t.pattern = "spec/rubies/**/*_spec.rb" + end +end + +task :default => ["test:rubies", "test:javascripts"] \ No newline at end of file Rakefile @@ -1,6 +1,10 @@ +require File.expand_path(File.dirname(__FILE__) + '/../../lib/blue_ridge') + class BlueRidgeGenerator < Rails::Generator::Base def manifest record do |m| + base_dir = BlueRidge.javascript_spec_dir + m.directory base_dir m.file 'application_spec.js', "#{base_dir}/application_spec.js" m.file 'spec_helper.js', "#{base_dir}/spec_helper.js" @@ -10,9 +14,4 @@ class BlueRidgeGenerator < Rails::Generator::Base m.file 'screw.css', "#{base_dir}/fixtures/screw.css" end end - - def base_dir - @base_dir ||= File.exist?("examples") ? "examples/javascripts" : File.exist?("spec") ? "spec/javascripts" : "test/javascript" - end - end generators/blue_ridge/blue_ridge_generator.rb @@ -3,6 +3,8 @@ class JavascriptSpecGenerator < Rails::Generator::NamedBase file_path_with_spec, file_path_without_spec = file_path_with_and_without_spec record do |m| + base_dir = BlueRidge.javascript_spec_dir + m.directory base_dir m.directory "#{base_dir}/fixtures" @@ -12,10 +14,6 @@ class JavascriptSpecGenerator < Rails::Generator::NamedBase end end - def base_dir - @base_dir ||= File.exist?("spec") ? "spec/javascripts" : "test/javascript" - end - def file_path_with_and_without_spec if (file_path =~ /_spec$/i) [file_path, file_path.gsub(/_spec$/, "")] generators/javascript_spec/javascript_spec_generator.rb @@ -1,29 +1,18 @@ -plugin_prefix = ENV["BLUE_RIDGE_PREFIX"] || "#{RAILS_ROOT}/vendor/plugins/blue-ridge" -rhino_command = "java -Dblue.ridge.prefix=\"#{plugin_prefix}\" -jar #{plugin_prefix}/lib/js.jar -w -debug" -test_runner_command = "#{rhino_command} #{plugin_prefix}/lib/test_runner.js" +require File.expand_path(File.dirname(__FILE__) + '/../lib/blue_ridge') -def find_base_dir - target_dirs = ["test/javascript", "spec/javascripts", "examples/javascripts"] - base_dir = target_dirs.find {|d| File.exist?(d) } - raise "Could not find JavaScript test directory.\nNone of the following directories existed: #{target_dirs.join(", ")}.\nMaybe you need to call './script/generate blue_ridge'?" unless base_dir - base_dir +def error_message_for_missing_spec_dir + %Q{Could not find JavaScript test directory. +None of the following directories existed: #{BlueRidge::JavaScriptSpecDirs.join(", ")}. +Maybe you need to call './script/generate blue_ridge'? +} end # Support Test::Unit & Test/Spec style namespace :test do desc "Runs all the JavaScript tests and outputs the results" task :javascripts do - Dir.chdir(find_base_dir) do - all_fine = true - if ENV["TEST"] - all_fine = false unless system("#{test_runner_command} #{ENV["TEST"]}_spec.js") - else - Dir.glob("**/*_spec.js").each do |file| - all_fine = false unless system("#{test_runner_command} #{file}") - end - end - raise "JavaScript test failures" unless all_fine - end + js_spec_dir = BlueRidge.find_javascript_spec_dir || (raise error_message_for_missing_spec_dir) + raise "JavaScript test failures" unless BlueRidge.run_specs_in_dir(js_spec_dir, ENV["TEST"]) end task :javascript => :javascripts @@ -31,20 +20,21 @@ end # Support RSpec style namespace :spec do - task :javascripts => ["test:javascripts"] - task :javascript => ["test:javascripts"] + task :javascripts => "test:javascripts" + task :javascript => "test:javascripts" end # Support Micronaut style namespace :examples do - task :javascripts => ["test:javascripts"] - task :javascript => ["test:javascripts"] + task :javascripts => "test:javascripts" + task :javascript => "test:javascripts" end namespace :js do task :fixtures do - fixture_dir = "#{RAILS_ROOT}/#{find_base_dir}/fixtures" + js_spec_dir = BlueRidge.find_javascript_spec_dir || (raise error_message_for_missing_spec_dir) + fixture_dir = "#{js_spec_dir}/fixtures" if PLATFORM[/darwin/] system("open #{fixture_dir}") @@ -57,6 +47,6 @@ namespace :js do task :shell do rlwrap = `which rlwrap`.chomp - system("#{rlwrap} #{rhino_command} -f #{plugin_prefix}/lib/shell.js -f -") + system("#{rlwrap} #{BlueRidge.rhino_command} -f #{BlueRidge.plugin_prefix}/lib/shell.js -f -") end end \ No newline at end of file tasks/javascript_testing_tasks.rake b87569ecef75eb1de7d6873d08a1a705b6df2ea5 Larry Karnowski and Jason Rudolph pair@thinkrelevance.com http://github.com/relevance/blue-ridge/commit/88fe37342da0b460b7f1f7e2f455e8f304e99784 88fe37342da0b460b7f1f7e2f455e8f304e99784 2009-07-31T11:28:47-07:00 2009-07-31T11:28:47-07:00 Tested & refactored Ruby code into a BlueRidge module - moved common rake and generator Ruby into a blue_ridge.rb file - added Micronaut & Mocha-based tests for BlueRidge Ruby code - default "rake" task runs both Ruby & JavaScript specs - fixed "rake js:fixtures" for Micronaut 'examples' directory - fixed bug where JavaScript specs would not generate in the Micronaut 'examples' directory 6ebaae28a5b651fd23fcad0ca233bc56e11c5840 Larry Karnowski and Jason Rudolph pair@thinkrelevance.com