Finish making pending tests pass

6927f111 · Yehuda Katz + Carl Lerche · 48731251 · 6927f111 · 6927f111
2 changed file
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -301,6 +301,9 @@ def accessing_local_assigns_in_inline_template
  def render_implicit_html_template_from_xhr_request
  end

+  def render_implicit_js_template_without_layout
+  end
+
  def formatted_html_erb
  end

@@ -928,16 +931,13 @@ def test_accessing_local_assigns_in_inline_template
  end

  def test_should_implicitly_render_html_template_from_xhr_request
-    pending
-    # xhr :get, :render_implicit_html_template_from_xhr_request
-    # assert_equal "XHR!\nHello HTML!", @response.body
+    xhr :get, :render_implicit_html_template_from_xhr_request
+    assert_equal "XHR!\nHello HTML!", @response.body
  end

  def test_should_implicitly_render_js_template_without_layout
-    pending do
-      get :render_implicit_js_template_without_layout, :format => :js
-      assert_no_match %r{<html>}, @response.body
-    end
+    get :render_implicit_js_template_without_layout, :format => :js
+    assert_no_match %r{<html>}, @response.body
  end

  def test_should_render_formatted_template

--- a/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
+++ b/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
+alert('hello');
\ No newline at end of file