Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 39 insertions, 0 deletions

diff --git a/actionpack/test/controller/render_js_test.rb b/actionpack/test/controller/render_js_test.rb
new file mode 100644
index 0000000000..d02fd3fd4c
--- /dev/null
+++ b/actionpack/test/controller/render_js_test.rb
@@ -0,0 +1,39 @@
+require 'abstract_unit'
+require 'controller/fake_models'
+require 'pathname'
+
+class TestController < ActionController::Base
+  protect_from_forgery
+
+  def render_vanilla_js_hello
+    render :js => "alert('hello')"
+  end
+  
+  def greeting
+    # let's just rely on the template
+  end
+  
+  def partial
+    render :partial => 'partial'
+  end  
+end
+
+class RenderTest < ActionController::TestCase
+  tests TestController
+
+  def test_render_vanilla_js
+    get :render_vanilla_js_hello
+    assert_equal "alert('hello')", @response.body
+    assert_equal "text/javascript", @response.content_type
+  end
+  
+  def test_render_with_default_from_accept_header
+    xhr :get, :greeting
+    assert_equal "$(\"body\").visualEffect(\"highlight\");", @response.body
+  end
+  
+  def test_should_render_js_partial
+    xhr :get, :partial, :format => 'js'
+    assert_equal 'partial js', @response.body
+  end  
+end
\ No newline at end of file