From 700f3b7e26ee76757f4f680e82ba4ed84826880a Mon Sep 17 00:00:00 2001 From: brainopia Date: Fri, 9 Jan 2015 12:54:11 +0300 Subject: Drop old test locations from `rake stats` - test/functional - test/unit --- railties/CHANGELOG.md | 6 ++++++ railties/lib/rails/code_statistics.rb | 4 +--- railties/lib/rails/tasks/statistics.rake | 4 +--- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'railties') 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) } -- cgit v1.2.3