Use mocha to avoid the sleep calls in the compiled_template tests. [tarmo] Closes #9372

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7370 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/lib/action_controller/routing.rb

@@ -1238,7 +1238,7 @@ def load_routes!
         else
           add_route ":controller/:action/:id"
         end
-      end     
+      end
   
       def add_route(path, options = {})
         route = builder.build(path, options)

actionpack/test/template/compiled_templates_test.rb

@@ -68,9 +68,10 @@ def test_mtime
     assert (t1..Time.now).include?(ct.mtime('doubling method', [:a]))
   end
 
+  uses_mocha 'test_compile_time' do
   def test_compile_time
     t = Time.now
-    sleep 1
+
     File.open(@a, "w"){|f| f.puts @a}
     File.open(@b, "w"){|f| f.puts @b}
     # windows doesn't support symlinks (even under cygwin)
@@ -81,19 +82,24 @@ def test_compile_time
     v.base_path = '.'
     v.cache_template_loading = false
 
+    # All templates were created at t+1
+    File::Stat.any_instance.expects(:mtime).times(windows ? 2 : 3).returns(t + 1.second)
+
     # 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
 
-    sleep 1
+    # All templates are rendered at t+2
+    Time.expects(:now).times(windows ? 2 : 3).returns(t + 2.seconds)
     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
     a_n = v.method_names[@a]
     b_n = v.method_names[@b]
     s_n = v.method_names[@s] unless windows
@@ -102,10 +108,9 @@ def test_compile_time
     assert v.compile_time[b_n] > t
     assert v.compile_time[s_n] > t unless windows
 
-    sleep 1
-    t = Time.now
     # 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
@@ -116,32 +121,44 @@ def test_compile_time
     v.compile_and_render_template(:rhtml, '', @b)
     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  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
     # 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.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 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 + 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
     # 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
@@ -149,16 +166,16 @@ def test_compile_time
     assert v.send(:compile_template?, nil, @b, {})
     assert v.send(:compile_template?, nil, @s, {}) unless windows
 
-    t = Time.now
-    sleep 1
+    Time.expects(:now).times(windows ? 1 : 2).returns(t + 5.seconds)
     v.compile_and_render_template(:rhtml, '', @a)
     v.compile_and_render_template(:rhtml, '', @b)
     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  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