aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaroslav Markin <yaroslav@markin.net>2008-12-27 20:28:28 +0300
committerPratik Naik <pratiknaik@gmail.com>2008-12-27 17:33:13 +0000
commitfdaa9ed0336634c33b5a529dfe4f5ed506a1fc5e (patch)
treece268a359eacb91ba9b1ae46a7045817e983e945
parent28347d889bb4304e681bf885fea734067fdd8ff6 (diff)
downloadrails-fdaa9ed0336634c33b5a529dfe4f5ed506a1fc5e.tar.gz
rails-fdaa9ed0336634c33b5a529dfe4f5ed506a1fc5e.tar.bz2
rails-fdaa9ed0336634c33b5a529dfe4f5ed506a1fc5e.zip
Fix ActionPack build on Windows: we really should not test anything regarding symlinks on Windows.
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
-rw-r--r--actionpack/test/controller/layout_test.rb22
1 files changed, 12 insertions, 10 deletions
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