Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix ActionPack build on Windows: we really should not test anything r…

…egarding symlinks on Windows.

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
commit fdaa9ed0336634c33b5a529dfe4f5ed506a1fc5e 1 parent 28347d8
@yaroslav yaroslav authored lifo committed
Showing with 12 additions and 10 deletions.
  1. +12 −10 actionpack/test/controller/layout_test.rb
View
22 actionpack/test/controller/layout_test.rb
@@ -165,15 +165,17 @@ def test_layout_status_is_rendered
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
Please sign in to comment.
Something went wrong with that request. Please try again.