aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/render_js_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-19 13:04:12 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-19 13:04:12 -0500
commit0540781539508e09e5db176edfc72031773b0dc7 (patch)
tree80c756e093c6883f7d58bbdae53226ea07902359 /actionpack/test/controller/render_js_test.rb
parentdb0af8075d84ceb086ebad2e0b6f839fe588ddc2 (diff)
downloadrails-0540781539508e09e5db176edfc72031773b0dc7.tar.gz
rails-0540781539508e09e5db176edfc72031773b0dc7.tar.bz2
rails-0540781539508e09e5db176edfc72031773b0dc7.zip
Namespace TestControllers inside their test case class
Diffstat (limited to 'actionpack/test/controller/render_js_test.rb')
-rw-r--r--actionpack/test/controller/render_js_test.rb38
1 files changed, 21 insertions, 17 deletions
diff --git a/actionpack/test/controller/render_js_test.rb b/actionpack/test/controller/render_js_test.rb
index bc850de733..491c98a0fd 100644
--- a/actionpack/test/controller/render_js_test.rb
+++ b/actionpack/test/controller/render_js_test.rb
@@ -2,23 +2,27 @@ require 'abstract_unit'
require 'controller/fake_models'
require 'pathname'
-class TestController < ActionController::Base
- protect_from_forgery
+class RenderJSTest < ActionController::TestCase
+ 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
+ def self.controller_path
+ 'test'
+ end
+
+ def render_vanilla_js_hello
+ render :js => "alert('hello')"
+ end
+
+ def greeting
+ # let's just rely on the template
+ end
+
+ def show_partial
+ render :partial => 'partial'
+ end
end
-
- def show_partial
- render :partial => 'partial'
- end
-end
-class RenderTest < ActionController::TestCase
tests TestController
def test_render_vanilla_js
@@ -26,14 +30,14 @@ class RenderTest < ActionController::TestCase
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, :show_partial, :format => 'js'
assert_equal 'partial js', @response.body
end
-end \ No newline at end of file
+end