aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-26 04:37:15 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-26 04:37:15 -0700
commit342de058c44f6ba93c1cfeeedfc4768ea5325a3a (patch)
tree431f7d0963385a7dba19235300b7bc89650bc278
parentd9a0e0d853205b5946b9271d80224d309a13688d (diff)
parentc4f588213be992315df93f0379efd3133a8be905 (diff)
downloadrails-342de058c44f6ba93c1cfeeedfc4768ea5325a3a.tar.gz
rails-342de058c44f6ba93c1cfeeedfc4768ea5325a3a.tar.bz2
rails-342de058c44f6ba93c1cfeeedfc4768ea5325a3a.zip
Merge pull request #11112 from arunagw/rakefile_changes
Minor changes to actionpack/actionview Rakefile
-rw-r--r--actionpack/Rakefile6
-rw-r--r--actionview/Rakefile4
2 files changed, 1 insertions, 9 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 5433e584af..114d3a7c0c 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -5,11 +5,7 @@ desc "Default Task"
task :default => :test
# Run the unit tests
-
-desc "Run all unit tests"
-task :test => [:test_action_pack]
-
-Rake::TestTask.new(:test_action_pack) do |t|
+Rake::TestTask.new do |t|
t.libs << 'test'
# make sure we include the tests in alphabetical order as on some systems
diff --git a/actionview/Rakefile b/actionview/Rakefile
index ee670b5cc0..1cbd35cda4 100644
--- a/actionview/Rakefile
+++ b/actionview/Rakefile
@@ -12,11 +12,7 @@ task :test => [:test_action_view, :test_active_record_integration]
Rake::TestTask.new(:test_action_view) 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/template/**/*_test.rb').sort
-
t.warning = true
t.verbose = true
end