aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-04-13 14:07:46 -0700
committerwycats <wycats@gmail.com>2010-04-13 14:07:46 -0700
commit8e9df34fa3fd22719d939ba72f19b3ae9ffcc018 (patch)
treefb7d56ee45fcf33ac78f6591e1fcd8d8de3a54c4 /actionpack/test
parentdc251389d1ab4303b80a22642f4241940b73cbe7 (diff)
parentb4fd5e6f1a00b7c2b482de3d3b99a27adeba5920 (diff)
downloadrails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.gz
rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.bz2
rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/layout_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 4d687c1ec6..e1c1128753 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -209,7 +209,7 @@ class LayoutStatusIsRenderedTest < ActionController::TestCase
end
end
-unless RUBY_PLATFORM =~ /(:?mswin|mingw|bccwin)/
+unless RUBY_PLATFORM =~ /mswin|mingw/
class LayoutSymlinkedTest < LayoutTest
layout "symlinked/symlinked_layout"
end