Upgrade to Rails 2.0.2
Upgraded to Rails 2.0.2, except that we maintain vendor/rails/actionpack/lib/action_controller/routing.rb from Rail 1.2.6 (at least for now), so that Routes don't change. We still get to enjoy Rails's many new features. Also fixed a bug in Chunk-handling: disable WikiWord processing in tags (for real this time).
This commit is contained in:
Jacques Distler
parent
0f6889e09f
commit
6873fc8026
1083 changed files with 52810 additions and 41058 deletions
|
|
@ -1,10 +1,8 @@
|
|||
require 'test/unit'
|
||||
require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper'
|
||||
require File.dirname(__FILE__) + '/../../lib/action_view/compiled_templates'
|
||||
require File.dirname(__FILE__) + "/../abstract_unit"
|
||||
require "#{File.dirname(__FILE__)}/../abstract_unit"
|
||||
require 'action_view/helpers/date_helper'
|
||||
require 'action_view/compiled_templates'
|
||||
|
||||
class CompiledTemplateTests < Test::Unit::TestCase
|
||||
|
||||
def setup
|
||||
@ct = ActionView::CompiledTemplates.new
|
||||
@v = Class.new
|
||||
|
|
@ -15,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
|
||||
|
|
@ -24,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']
|
||||
|
|
@ -70,68 +68,116 @@ class CompiledTemplateTests < Test::Unit::TestCase
|
|||
assert (t1..Time.now).include?(ct.mtime('doubling method', [:a]))
|
||||
end
|
||||
|
||||
uses_mocha 'test_compile_time' do
|
||||
def test_compile_time
|
||||
t = Time.now
|
||||
|
||||
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
|
||||
|
||||
sleep 1
|
||||
t = Time.now
|
||||
sleep 1
|
||||
# All templates were created at t+1
|
||||
File::Stat.any_instance.expects(:mtime).times(windows ? 2 : 3).returns(t + 1.second)
|
||||
|
||||
v.compile_and_render_template(:rhtml, '', @a)
|
||||
v.compile_and_render_template(:rhtml, '', @b)
|
||||
v.compile_and_render_template(:rhtml, '', @s) unless windows
|
||||
# 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) unless windows
|
||||
|
||||
assert v.send(:compile_template?, nil, @a, {})
|
||||
assert v.send(:compile_template?, nil, @b, {})
|
||||
assert v.send(:compile_template?, nil, @s, {}) unless windows
|
||||
|
||||
@handler = ActionView::Base.handler_for_extension(:rhtml)
|
||||
|
||||
# All templates are rendered at t+2
|
||||
Time.expects(:now).times(windows ? 2 : 3).returns(t + 2.seconds)
|
||||
v.send(:compile_and_render_template, @handler, '', @a)
|
||||
v.send(:compile_and_render_template, @handler, '', @b)
|
||||
v.send(:compile_and_render_template, @handler, '', @s) unless windows
|
||||
a_n = v.method_names[@a]
|
||||
b_n = v.method_names[@b]
|
||||
s_n = v.method_names[@s] unless windows
|
||||
ct_a = v.compile_time[a_n]
|
||||
ct_b = v.compile_time[b_n]
|
||||
ct_s = v.compile_time[s_n] unless windows
|
||||
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 unless windows
|
||||
|
||||
sleep 1
|
||||
v.compile_and_render_template(:rhtml, '', @a)
|
||||
v.compile_and_render_template(:rhtml, '', @b)
|
||||
v.compile_and_render_template(:rhtml, '', @s) unless windows
|
||||
# private methods template_changed_since? and compile_template?
|
||||
# should report false for all since none have changed since compile
|
||||
File::Stat.any_instance.expects(:mtime).times(windows ? 6 : 12).returns(t + 1.second)
|
||||
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]) unless windows
|
||||
assert !v.send(:compile_template?, nil, @a, {})
|
||||
assert !v.send(:compile_template?, nil, @b, {})
|
||||
assert !v.send(:compile_template?, nil, @s, {}) unless windows
|
||||
v.send(:compile_and_render_template, @handler, '', @a)
|
||||
v.send(:compile_and_render_template, @handler, '', @b)
|
||||
v.send(:compile_and_render_template, @handler, '', @s) unless windows
|
||||
# none of the files have changed since last compile
|
||||
# so they should not have been recmpiled
|
||||
assert_equal ct_a, v.compile_time[a_n]
|
||||
assert_equal ct_b, v.compile_time[b_n]
|
||||
assert_equal ct_s, v.compile_time[s_n] unless windows
|
||||
assert v.compile_time[a_n] < t + 3.seconds
|
||||
assert v.compile_time[b_n] < t + 3.seconds
|
||||
assert v.compile_time[s_n] < t + 3.seconds unless windows
|
||||
|
||||
`rm #{@s}; ln -s #{@b} #{@s}` unless windows
|
||||
v.compile_and_render_template(:rhtml, '', @a)
|
||||
v.compile_and_render_template(:rhtml, '', @b)
|
||||
v.compile_and_render_template(:rhtml, '', @s) unless windows
|
||||
# the symlink has changed since last compile
|
||||
assert_equal ct_a, v.compile_time[a_n]
|
||||
assert_equal ct_b, v.compile_time[b_n]
|
||||
assert v.compile_time[s_n] > t unless windows
|
||||
# private methods template_changed_since? and compile_template?
|
||||
# should report true for symlink since it has changed since compile
|
||||
|
||||
# t + 3.seconds is for the symlink
|
||||
File::Stat.any_instance.expects(:mtime).times(windows ? 6 : 9).returns(
|
||||
*(windows ? [ t + 1.second, t + 1.second ] :
|
||||
[ t + 1.second, t + 1.second, t + 3.second ]) * 3)
|
||||
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]) unless windows
|
||||
assert !v.send(:compile_template?, nil, @a, {})
|
||||
assert !v.send(:compile_template?, nil, @b, {})
|
||||
assert v.send(:compile_template?, nil, @s, {}) unless windows
|
||||
|
||||
# Only the symlink template gets rendered at t+3
|
||||
Time.stubs(:now).returns(t + 3.seconds) unless windows
|
||||
v.send(:compile_and_render_template, @handler, '', @a)
|
||||
v.send(:compile_and_render_template, @handler, '', @b)
|
||||
v.send(:compile_and_render_template, @handler, '', @s) unless windows
|
||||
# the symlink has changed since last compile
|
||||
assert v.compile_time[a_n] < t + 3.seconds
|
||||
assert v.compile_time[b_n] < t + 3.seconds
|
||||
assert_equal v.compile_time[s_n], t + 3.seconds unless windows
|
||||
|
||||
sleep 1
|
||||
FileUtils.touch @b
|
||||
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) unless windows
|
||||
# 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
|
||||
#
|
||||
# t+4 is for @b and also for the file that @s points to, which is @b
|
||||
File::Stat.any_instance.expects(:mtime).times(windows ? 6 : 12).returns(
|
||||
*(windows ? [ t + 1.second, t + 4.seconds ] :
|
||||
[ t + 1.second, t + 4.seconds, t + 3.second, t + 4.seconds ]) * 3)
|
||||
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]) unless windows
|
||||
assert !v.send(:compile_template?, nil, @a, {})
|
||||
assert v.send(:compile_template?, nil, @b, {})
|
||||
assert v.send(:compile_template?, nil, @s, {}) unless windows
|
||||
|
||||
Time.expects(:now).times(windows ? 1 : 2).returns(t + 5.seconds)
|
||||
v.send(:compile_and_render_template, @handler, '', @a)
|
||||
v.send(:compile_and_render_template, @handler, '', @b)
|
||||
v.send(:compile_and_render_template, @handler, '', @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 unless windows
|
||||
assert v.compile_time[a_n] < t + 5.seconds
|
||||
assert_equal v.compile_time[b_n], t + 5.seconds
|
||||
assert_equal v.compile_time[s_n], t + 5.seconds unless windows
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue