From f03bcf249527ba4945fdce673bae971a9ac11bb7 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 9 Nov 2009 22:30:26 -0600
Subject: Don't load all of railties just for Rails::Version

---
 railties/Rakefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'railties/Rakefile')

diff --git a/railties/Rakefile b/railties/Rakefile
index 3a87a88ddc..1280ad7f06 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -6,12 +6,8 @@ require 'rake/gempackagetask'
 require 'date'
 require 'rbconfig'
 
-begin
-  require File.expand_path('../../vendor/gems/environment', __FILE__)
-rescue LoadError
-end
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
-require 'rails'
+require 'rails/version'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = ENV['PKG_NAME'] || 'rails'
@@ -30,7 +26,7 @@ task :default => :test
 ## This is required until the regular test task
 ## below passes.  It's not ideal, but at least
 ## we can see the failures
-task :test do 
+task :test do
   dir = ENV["TEST_DIR"] || "**"
   Dir["test/#{dir}/*_test.rb"].all? do |file|
     next true if file.include?("fixtures")
@@ -152,7 +148,7 @@ end
 
 # Publishing -------------------------------------------------------
 desc "Publish the rails gem"
-task :pgem => [:gem] do 
+task :pgem => [:gem] do
   require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
-- 
cgit v1.2.3


From bbb3e5a858b2d078b2af7516a583fa12f3edb565 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 10 Nov 2009 16:50:15 -0800
Subject: Unify test:isolated across components and run by default at toplevel

---
 railties/Rakefile | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'railties/Rakefile')

diff --git a/railties/Rakefile b/railties/Rakefile
index 1280ad7f06..e6f698fc74 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -22,21 +22,23 @@ RUBY_FORGE_USER    = "webster132"
 
 
 task :default => :test
+task :test => 'test:isolated'
 
 ## This is required until the regular test task
 ## below passes.  It's not ideal, but at least
 ## we can see the failures
-task :test do
-  dir = ENV["TEST_DIR"] || "**"
-  Dir["test/#{dir}/*_test.rb"].all? do |file|
-    next true if file.include?("fixtures")
-    ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-    system(ruby, '-Itest', "-I#{File.dirname(__FILE__)}/../activesupport/lib", file)
-  end or raise "Failures"
+namespace :test do
+  task :isolated do
+    dir = ENV["TEST_DIR"] || "**"
+    Dir["test/#{dir}/*_test.rb"].all? do |file|
+      next true if file.include?("fixtures")
+      ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
+      system(ruby, '-Itest', "-I#{File.dirname(__FILE__)}/../activesupport/lib", file)
+    end or raise "Failures"
+  end
 end
-task :isolated_test => :test
 
-Rake::TestTask.new("regular_test") do |t|
+Rake::TestTask.new('test:regular') do |t|
   t.libs << 'test' << "#{File.dirname(__FILE__)}/../activesupport/lib"
   t.pattern = 'test/**/*_test.rb'
   t.warning = true
-- 
cgit v1.2.3