aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorbrainopia <brainopia@evilmartians.com>2015-01-09 12:54:11 +0300
committerbrainopia <brainopia@evilmartians.com>2015-01-09 12:54:11 +0300
commit700f3b7e26ee76757f4f680e82ba4ed84826880a (patch)
tree3e5bf3aeb5707cb177a4f05c782247e48afd0471 /railties
parent37704547d94c5a5faf3cfb176984d4877922a5bd (diff)
downloadrails-700f3b7e26ee76757f4f680e82ba4ed84826880a.tar.gz
rails-700f3b7e26ee76757f4f680e82ba4ed84826880a.tar.bz2
rails-700f3b7e26ee76757f4f680e82ba4ed84826880a.zip
Drop old test locations from `rake stats`
- test/functional - test/unit
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md6
-rw-r--r--railties/lib/rails/code_statistics.rb4
-rw-r--r--railties/lib/rails/tasks/statistics.rake4
3 files changed, 8 insertions, 6 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 606d5f2a53..3e797e03cb 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,9 @@
+* Drop old test locations from `rake stats`
+ - test/functional
+ - test/unit
+
+ *Ravil Bayramgalin*
+
* Update `rake stats` to correctly count declarative tests
as methods in `_test.rb` files.
diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb
index 27779857b7..0bdf63943f 100644
--- a/railties/lib/rails/code_statistics.rb
+++ b/railties/lib/rails/code_statistics.rb
@@ -7,9 +7,7 @@ class CodeStatistics #:nodoc:
'Model tests',
'Mailer tests',
'Job tests',
- 'Integration tests',
- 'Functional tests (old)',
- 'Unit tests (old)']
+ 'Integration tests']
def initialize(*pairs)
@pairs = pairs
diff --git a/railties/lib/rails/tasks/statistics.rake b/railties/lib/rails/tasks/statistics.rake
index ba6168e208..735c36eb3a 100644
--- a/railties/lib/rails/tasks/statistics.rake
+++ b/railties/lib/rails/tasks/statistics.rake
@@ -14,10 +14,8 @@ STATS_DIRECTORIES = [
%w(Helper\ tests test/helpers),
%w(Model\ tests test/models),
%w(Mailer\ tests test/mailers),
- %w(Job\ tests test/jobs),
+ %w(Job\ tests test/jobs),
%w(Integration\ tests test/integration),
- %w(Functional\ tests\ (old) test/functional),
- %w(Unit\ tests \ (old) test/unit)
].collect do |name, dir|
[ name, "#{File.dirname(Rake.application.rakefile_location)}/#{dir}" ]
end.select { |name, dir| File.directory?(dir) }