aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-22 16:11:54 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-22 16:11:54 -0700
commitca7207838844f02f50afbb18beb0f535903f7929 (patch)
treed116ce21039e3382989bd33a581f95990c91f424 /actionpack
parent98f856d7723bd8aa8ccc05dfb7219c897b4dcab7 (diff)
downloadrails-ca7207838844f02f50afbb18beb0f535903f7929.tar.gz
rails-ca7207838844f02f50afbb18beb0f535903f7929.tar.bz2
rails-ca7207838844f02f50afbb18beb0f535903f7929.zip
Move fake controllers and models to a common load path
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/Rakefile12
-rw-r--r--actionpack/test/controller/layout_test.rb2
-rw-r--r--actionpack/test/lib/controller/fake_controllers.rb (renamed from actionpack/test/controller/fake_controllers.rb)0
-rw-r--r--actionpack/test/lib/controller/fake_models.rb (renamed from actionpack/test/controller/fake_models.rb)0
4 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 79a582033a..6ad061b0b1 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -24,9 +24,9 @@ task :default => [ :test ]
desc "Run all unit tests"
task :test => [:test_action_pack, :test_active_record_integration, :test_new_base, :test_new_base_on_old_tests]
-test_lib_dir = ENV["NEW"] ? "test/new_base" : "test"
+test_lib_dirs = [ENV["NEW"] ? "test/new_base" : "test", "test/lib"]
Rake::TestTask.new(:test_action_pack) do |t|
- t.libs << test_lib_dir
+ t.libs.concat test_lib_dirs
# make sure we include the tests in alphabetical order as on some systems
# this will not happen automatically and the tests (as a whole) will error
@@ -38,27 +38,27 @@ end
task :isolated_test do
ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
Dir.glob("test/{controller,dispatch,template}/**/*_test.rb").all? do |file|
- system(ruby, "-Ilib:#{test_lib_dir}", file)
+ system(ruby, "-Ilib:#{test_lib_dirs * ':'}", file)
end or raise "Failures"
end
desc 'ActiveRecord Integration Tests'
Rake::TestTask.new(:test_active_record_integration) do |t|
- t.libs << test_lib_dir
+ t.libs.concat test_lib_dirs
t.test_files = Dir.glob("test/activerecord/*_test.rb")
t.verbose = true
end
desc 'New Controller Tests'
Rake::TestTask.new(:test_new_base) do |t|
- t.libs << "test/new_base"
+ t.libs << "test/new_base" << "test/lib"
t.test_files = Dir.glob("test/{abstract_controller,new_base}/*_test.rb")
t.verbose = true
end
desc 'Old Controller Tests on New Base'
Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
- t.libs << "test/new_base"
+ t.libs << "test/new_base" << "test/lib"
# layout
# Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
t.test_files = %w(
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 04da0a7f86..cb9bdf57bb 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -9,7 +9,7 @@ ActionView::Template::register_template_handler :mab,
ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/layout_tests/' ]
-require "lib/fixture_template"
+require "fixture_template"
class LayoutTest < ActionController::Base
def self.controller_path; 'views' end
diff --git a/actionpack/test/controller/fake_controllers.rb b/actionpack/test/lib/controller/fake_controllers.rb
index 75c114c103..75c114c103 100644
--- a/actionpack/test/controller/fake_controllers.rb
+++ b/actionpack/test/lib/controller/fake_controllers.rb
diff --git a/actionpack/test/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb
index 0b30c79b10..0b30c79b10 100644
--- a/actionpack/test/controller/fake_models.rb
+++ b/actionpack/test/lib/controller/fake_models.rb