Merge pull request #11032 from strzalek/extract-actionview

Extract ActionView to separate directory

1 files changed, 3 insertions, 16 deletions

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 56fc92963a..567d7b589f 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -7,14 +7,14 @@ task :default => :test
 # Run the unit tests
 
 desc "Run all unit tests"
-task :test => [:test_action_pack, :test_active_record_integration]
+task :test => [:test_action_pack]
 
 Rake::TestTask.new(:test_action_pack) do |t|
   t.libs << 'test'
 
   # 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
-  t.test_files = Dir.glob('test/{abstract,controller,dispatch,template,assertions,journey}/**/*_test.rb').sort
+  t.test_files = Dir.glob('test/{abstract,controller,dispatch,assertions,journey}/**/*_test.rb').sort
 
   t.warning = true
   t.verbose = true
@@ -23,25 +23,12 @@ end
 namespace :test do
   task :isolated do
     ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-    Dir.glob("test/{abstract,controller,dispatch,template}/**/*_test.rb").all? do |file|
+    Dir.glob("test/{abstract,controller,dispatch}/**/*_test.rb").all? do |file|
       sh(ruby, '-Ilib:test', file)
     end or raise "Failures"
   end
 end
 
-namespace :test do
-  Rake::TestTask.new(:template) do |t|
-    t.libs << 'test'
-    t.pattern = 'test/template/**/*.rb'
-  end
-end
-
-desc 'ActiveRecord Integration Tests'
-Rake::TestTask.new(:test_active_record_integration) do |t|
-  t.libs << 'test'
-  t.test_files = Dir.glob("test/activerecord/*_test.rb")
-end
-
 spec = eval(File.read('actionpack.gemspec'))
 
 Gem::PackageTask.new(spec) do |p|