Annotated metaprogramming code across ActiveSupport

2 files changed, 14 insertions, 16 deletions

diff --git a/actionpack/lib/action_controller/mime_responds.rb b/actionpack/lib/action_controller/mime_responds.rb
index c41bd3ac4b..b2b73bbd57 100644
--- a/actionpack/lib/action_controller/mime_responds.rb
+++ b/actionpack/lib/action_controller/mime_responds.rb
@@ -144,13 +144,9 @@ module ActionController #:nodoc:
       def self.generate_method_for_mime(mime)
         sym = mime.is_a?(Symbol) ? mime : mime.to_sym
         const = sym.to_s.upcase
-        class_eval <<-RUBY
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{sym}(&block)                          # def html(&block)
-            if Mime::SET.include?(Mime::#{const})     #   if Mime::Set.include?(Mime::HTML)
-              custom(Mime::#{const}, &block)          #     custom(Mime::HTML, &block)
-            else                                      #   else
-              super                                   #     super
-            end                                       #   end
+            custom(Mime::#{const}, &block)            #   custom(Mime::HTML, &block)
           end                                         # end
         RUBY
       end
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 18c01f755c..c2efe9d00b 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -165,15 +165,17 @@ class LayoutStatusIsRenderedTest < ActionController::TestCase
   end
 end
 
-class LayoutSymlinkedTest < LayoutTest
-  layout "symlinked/symlinked_layout"
-end
-
-class LayoutSymlinkedIsRenderedTest < ActionController::TestCase
-  def test_symlinked_layout_is_rendered
-    @controller = LayoutSymlinkedTest.new
-    get :hello
-    assert_response 200
-    assert_equal "layouts/symlinked/symlinked_layout", @response.layout
+unless RUBY_PLATFORM =~ /(:?mswin|mingw|bccwin)/
+  class LayoutSymlinkedTest < LayoutTest
+    layout "symlinked/symlinked_layout"
+  end
+
+  class LayoutSymlinkedIsRenderedTest < ActionController::TestCase
+    def test_symlinked_layout_is_rendered
+      @controller = LayoutSymlinkedTest.new
+      get :hello
+      assert_response 200
+      assert_equal "layouts/symlinked/symlinked_layout", @response.layout
+    end
   end
 end