mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Ensure compiled template tests pass on windows where there are no symlinks. [skaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6866 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
2a253d488e
commit
62455f56b4
1 changed files with 28 additions and 22 deletions
|
@ -13,7 +13,7 @@ class CompiledTemplateTests < Test::Unit::TestCase
|
|||
end
|
||||
def teardown
|
||||
[@a, @b, @s].each do |f|
|
||||
`rm #{f}` if File.exist?(f) || File.symlink?(f)
|
||||
FileUtils.rm(f) if File.exist?(f) || File.symlink?(f)
|
||||
end
|
||||
end
|
||||
attr_reader :ct, :v
|
||||
|
@ -22,7 +22,7 @@ class CompiledTemplateTests < Test::Unit::TestCase
|
|||
hi_world = ct.method_names['hi world']
|
||||
hi_sexy = ct.method_names['hi sexy']
|
||||
wish_upon_a_star = ct.method_names['I love seeing decent error messages']
|
||||
|
||||
|
||||
assert_equal hi_world, ct.method_names['hi world']
|
||||
assert_equal hi_sexy, ct.method_names['hi sexy']
|
||||
assert_equal wish_upon_a_star, ct.method_names['I love seeing decent error messages']
|
||||
|
@ -71,20 +71,24 @@ class CompiledTemplateTests < Test::Unit::TestCase
|
|||
def test_compile_time
|
||||
t = Time.now
|
||||
sleep 1
|
||||
`echo '#{@a}' > #{@a}; echo '#{@b}' > #{@b}; ln -s #{@a} #{@s}`
|
||||
File.open(@a, "w"){|f| f.puts @a}
|
||||
File.open(@b, "w"){|f| f.puts @b}
|
||||
# windows doesn't support symlinks (even under cygwin)
|
||||
windows = (RUBY_PLATFORM =~ /win32/)
|
||||
`ln -s #{@a} #{@s}` unless windows
|
||||
|
||||
v = ActionView::Base.new
|
||||
v.base_path = '.'
|
||||
v.cache_template_loading = false;
|
||||
v.cache_template_loading = false
|
||||
|
||||
# private methods template_changed_since? and compile_template?
|
||||
# should report true for all since they have not been compiled
|
||||
assert v.send(:template_changed_since?, @a, t)
|
||||
assert v.send(:template_changed_since?, @b, t)
|
||||
assert v.send(:template_changed_since?, @s, t)
|
||||
assert v.send(:template_changed_since?, @s, t) unless windows
|
||||
assert v.send(:compile_template?, nil, @a, {})
|
||||
assert v.send(:compile_template?, nil, @b, {})
|
||||
assert v.send(:compile_template?, nil, @s, {})
|
||||
assert v.send(:compile_template?, nil, @s, {}) unless windows
|
||||
|
||||
sleep 1
|
||||
v.compile_and_render_template(:rhtml, '', @a)
|
||||
|
@ -92,11 +96,11 @@ class CompiledTemplateTests < Test::Unit::TestCase
|
|||
v.compile_and_render_template(:rhtml, '', @s)
|
||||
a_n = v.method_names[@a]
|
||||
b_n = v.method_names[@b]
|
||||
s_n = v.method_names[@s]
|
||||
s_n = v.method_names[@s] unless windows
|
||||
# all of the files have changed since last compile
|
||||
assert v.compile_time[a_n] > t
|
||||
assert v.compile_time[b_n] > t
|
||||
assert v.compile_time[s_n] > t
|
||||
assert v.compile_time[s_n] > t unless windows
|
||||
|
||||
sleep 1
|
||||
t = Time.now
|
||||
|
@ -104,55 +108,57 @@ class CompiledTemplateTests < Test::Unit::TestCase
|
|||
# should report false for all since none have changed since compile
|
||||
assert !v.send(:template_changed_since?, @a, v.compile_time[a_n])
|
||||
assert !v.send(:template_changed_since?, @b, v.compile_time[b_n])
|
||||
assert !v.send(:template_changed_since?, @s, v.compile_time[s_n])
|
||||
assert !v.send(:template_changed_since?, @s, v.compile_time[s_n]) unless windows
|
||||
assert !v.send(:compile_template?, nil, @a, {})
|
||||
assert !v.send(:compile_template?, nil, @b, {})
|
||||
assert !v.send(:compile_template?, nil, @s, {})
|
||||
assert !v.send(:compile_template?, nil, @s, {}) unless windows
|
||||
v.compile_and_render_template(:rhtml, '', @a)
|
||||
v.compile_and_render_template(:rhtml, '', @b)
|
||||
v.compile_and_render_template(:rhtml, '', @s)
|
||||
v.compile_and_render_template(:rhtml, '', @s) unless windows
|
||||
# none of the files have changed since last compile
|
||||
assert v.compile_time[a_n] < t
|
||||
assert v.compile_time[b_n] < t
|
||||
assert v.compile_time[s_n] < t
|
||||
assert v.compile_time[s_n] < t unless windows
|
||||
|
||||
`rm #{@s}; ln -s #{@b} #{@s}`
|
||||
`rm #{@s}; ln -s #{@b} #{@s}` unless windows
|
||||
# private methods template_changed_since? and compile_template?
|
||||
# should report true for symlink since it has changed since compile
|
||||
assert !v.send(:template_changed_since?, @a, v.compile_time[a_n])
|
||||
assert !v.send(:template_changed_since?, @b, v.compile_time[b_n])
|
||||
assert v.send(:template_changed_since?, @s, v.compile_time[s_n])
|
||||
assert v.send(:template_changed_since?, @s, v.compile_time[s_n]) unless windows
|
||||
assert !v.send(:compile_template?, nil, @a, {})
|
||||
assert !v.send(:compile_template?, nil, @b, {})
|
||||
assert v.send(:compile_template?, nil, @s, {})
|
||||
assert v.send(:compile_template?, nil, @s, {}) unless windows
|
||||
v.compile_and_render_template(:rhtml, '', @a)
|
||||
v.compile_and_render_template(:rhtml, '', @b)
|
||||
v.compile_and_render_template(:rhtml, '', @s)
|
||||
v.compile_and_render_template(:rhtml, '', @s) unless windows
|
||||
# the symlink has changed since last compile
|
||||
assert v.compile_time[a_n] < t
|
||||
assert v.compile_time[b_n] < t
|
||||
assert v.compile_time[s_n] > t
|
||||
assert v.compile_time[s_n] > t unless windows
|
||||
|
||||
sleep 1
|
||||
`touch #{@b}`
|
||||
FileUtils.touch @b
|
||||
# private methods template_changed_since? and compile_template?
|
||||
# should report true for symlink and file at end of symlink
|
||||
# since it has changed since last compile
|
||||
assert !v.send(:template_changed_since?, @a, v.compile_time[a_n])
|
||||
assert v.send(:template_changed_since?, @b, v.compile_time[b_n])
|
||||
assert v.send(:template_changed_since?, @s, v.compile_time[s_n])
|
||||
assert v.send(:template_changed_since?, @s, v.compile_time[s_n]) unless windows
|
||||
assert !v.send(:compile_template?, nil, @a, {})
|
||||
assert v.send(:compile_template?, nil, @b, {})
|
||||
assert v.send(:compile_template?, nil, @s, {})
|
||||
assert v.send(:compile_template?, nil, @s, {}) unless windows
|
||||
|
||||
t = Time.now
|
||||
sleep 1
|
||||
v.compile_and_render_template(:rhtml, '', @a)
|
||||
v.compile_and_render_template(:rhtml, '', @b)
|
||||
v.compile_and_render_template(:rhtml, '', @s)
|
||||
v.compile_and_render_template(:rhtml, '', @s) unless windows
|
||||
# the file at the end of the symlink has changed since last compile
|
||||
# both the symlink and the file at the end of it should be recompiled
|
||||
assert v.compile_time[a_n] < t
|
||||
assert v.compile_time[b_n] > t
|
||||
assert v.compile_time[s_n] > t
|
||||
assert v.compile_time[s_n] > t unless windows
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue