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).

vendor/rails/actionpack/test/controller/capture_test.rb

@@ -8,6 +8,14 @@ class CaptureController < ActionController::Base
     render :layout => "talk_from_action"
   end
 
+  def content_for_with_parameter
+    render :layout => "talk_from_action"
+  end
+  
+  def content_for_concatenated
+    render :layout => "talk_from_action"
+  end
+
   def erb_content_for
     render :layout => "talk_from_action"
   end
@@ -23,7 +31,7 @@ class CaptureController < ActionController::Base
   def rescue_action(e) raise end
 end
 
-CaptureController.template_root = File.dirname(__FILE__) + "/../fixtures/"
+CaptureController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
 
 class CaptureTest < Test::Unit::TestCase
   def setup
@@ -49,8 +57,18 @@ class CaptureTest < Test::Unit::TestCase
     assert_equal expected_content_for_output, @response.body
   end
 
+  def test_should_concatentate_content_for
+    get :content_for_concatenated
+    assert_equal expected_content_for_output, @response.body
+  end
+
   def test_erb_content_for
-    get :content_for
+    get :erb_content_for
+    assert_equal expected_content_for_output, @response.body
+  end
+
+  def test_should_set_content_for_with_parameter
+    get :content_for_with_parameter
     assert_equal expected_content_for_output, @response.body
   end
 
@@ -64,19 +82,8 @@ class CaptureTest < Test::Unit::TestCase
     assert_equal expected_content_for_output, @response.body
   end
 
-  def test_update_element_with_capture
-    assert_deprecated 'update_element_function' do
-      get :update_element_with_capture
-    end
-    assert_equal(
-      "<script type=\"text/javascript\">\n//<![CDATA[\n$('products').innerHTML = '\\n  <p>Product 1</p>\\n  <p>Product 2</p>\\n';\n\n//]]>\n</script>" +
-        "\n\n$('status').innerHTML = '\\n  <b>You bought something!</b>\\n';",
-      @response.body.strip
-    )
-  end
-
   private
-  def expected_content_for_output
-    "<title>Putting stuff in the title!</title>\n\nGreat stuff!"
-  end
+    def expected_content_for_output
+      "<title>Putting stuff in the title!</title>\n\nGreat stuff!"
+    end
 end