aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-05-23 01:40:50 +0200
committerPratik Naik <pratiknaik@gmail.com>2009-05-23 01:46:37 +0200
commitb77602824afe07dfd8fd8e48407a6086802ec7ef (patch)
treeb9334a3bb453bfc08e719cb45e4282acce20fbb1 /actionpack
parentf766f669464fa9900197d6b3559c2e00e53de9cd (diff)
downloadrails-b77602824afe07dfd8fd8e48407a6086802ec7ef.tar.gz
rails-b77602824afe07dfd8fd8e48407a6086802ec7ef.tar.bz2
rails-b77602824afe07dfd8fd8e48407a6086802ec7ef.zip
Add some more tests to the test_new_base_on_old_tests task
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/Rakefile2
-rw-r--r--actionpack/test/controller/routing_test.rb1
-rw-r--r--actionpack/test/controller/selector_test.rb1
-rw-r--r--actionpack/test/new_base/abstract_unit.rb1
4 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 2b48b2cad5..448acf20cb 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -68,7 +68,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
http_digest_authentication layout mime_responds
record_identifier redirect render render_json render_xml
send_file request_forgery_protection rescue url_rewriter
- verification webservice logging
+ verification webservice logging resources routing
).map { |name| "test/controller/#{name}_test.rb" }
t.verbose = true
end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 77abb68f32..11bffdb42e 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1,5 +1,6 @@
require 'abstract_unit'
require 'controller/fake_controllers'
+require 'active_support/dependencies'
class MilestonesController < ActionController::Base
def index() head :ok end
diff --git a/actionpack/test/controller/selector_test.rb b/actionpack/test/controller/selector_test.rb
index 9d0613d1e2..5a5dc840b5 100644
--- a/actionpack/test/controller/selector_test.rb
+++ b/actionpack/test/controller/selector_test.rb
@@ -5,6 +5,7 @@
require 'abstract_unit'
require 'controller/fake_controllers'
+require 'action_controller/vendor/html-scanner'
class SelectorTest < Test::Unit::TestCase
#
diff --git a/actionpack/test/new_base/abstract_unit.rb b/actionpack/test/new_base/abstract_unit.rb
index 569e4e764f..0b71488bd6 100644
--- a/actionpack/test/new_base/abstract_unit.rb
+++ b/actionpack/test/new_base/abstract_unit.rb
@@ -10,6 +10,7 @@ $stderr.puts "Running old tests on new_base"
require 'test/unit'
require 'active_support'
+require 'active_support/core_ext'
require 'active_support/test_case'
require 'action_controller/abstract'
require 'action_controller/new_base'