Merge pull request rails#19703 from vizcay/fix_code_statics

bugfix CodeStatics#calculate_directory_statics when dir has source ext

Author: rafaelfranca

railties/lib/rails/code_statistics.rb

@@ -43,11 +43,9 @@ def calculate_directory_statistics(directory, pattern = /.*\.(rb|js|coffee)$/)
 
         if File.directory?(path) && (/^\./ !~ file_name)
           stats.add(calculate_directory_statistics(path, pattern))
+        elsif file_name =~ pattern
+          stats.add_by_file_path(path)
         end
-
-        next unless file_name =~ pattern
-
-        stats.add_by_file_path(path)
       end
 
       stats

railties/test/code_statistics_test.rb

@@ -0,0 +1,20 @@
+require 'abstract_unit'
+require 'rails/code_statistics'
+
+class CodeStatisticsTest < ActiveSupport::TestCase
+  def setup
+    @tmp_path = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'tmp'))
+    @dir_js   = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'tmp', 'lib.js'))
+    FileUtils.mkdir_p(@dir_js)
+  end
+
+  def teardown
+    FileUtils.rm_rf(@tmp_path)
+  end
+
+  test 'ignores directories that happen to have source files extensions' do
+    assert_nothing_raised do
+      @code_statistics = CodeStatistics.new(['tmp dir', @tmp_path])
+    end
+  end
+end