Skip to content

Commit 9df157a

Browse files
committed
Merge pull request rails#24486 from y-yagi/do_not_create_unnecessary_directory
do not create unnecessary directory
2 parents 35b19cd + ab18d37 commit 9df157a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

railties/lib/rails/tasks/tmp.rake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ namespace :tmp do
55
tmp_dirs = [ 'tmp/cache',
66
'tmp/sockets',
77
'tmp/pids',
8-
'tmp/cache/assets/development',
9-
'tmp/cache/assets/test',
10-
'tmp/cache/assets/production' ]
8+
'tmp/cache/assets' ]
119

1210
tmp_dirs.each { |d| directory d }
1311

railties/test/application/assets_test.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,7 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
344344

345345
clean_assets!
346346

347-
files = Dir["#{app_path}/public/assets/**/*", "#{app_path}/tmp/cache/assets/development/*",
348-
"#{app_path}/tmp/cache/assets/test/*", "#{app_path}/tmp/cache/assets/production/*"]
347+
files = Dir["#{app_path}/public/assets/**/*"]
349348
assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}"
350349
end
351350

0 commit comments

Comments
 (0)