diff options
| author | wycats <wycats@gmail.com> | 2010-04-26 23:32:30 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-26 23:32:30 -0700 |
| commit | 91963e9e33eb5a28297323f1346aeb8b643e9d65 (patch) | |
| tree | 0452dbaf63110fb5a19c958da50d4677dee11333 /actionpack/test/controller/layout_test.rb | |
| parent | d5d717161d853d8d7240da59b41a879bdac6e982 (diff) | |
| parent | c1d73270717f30498f8f4d55d6695509107c2834 (diff) | |
| download | rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.tar.gz rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.tar.bz2 rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/layout_test.rb')
| -rw-r--r-- | actionpack/test/controller/layout_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index e1c1128753..48be7571ea 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -1,4 +1,5 @@ require 'abstract_unit' +require 'rbconfig' # The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited # method has access to the view_paths array when looking for a layout to automatically assign. @@ -209,7 +210,7 @@ class LayoutStatusIsRenderedTest < ActionController::TestCase end end -unless RUBY_PLATFORM =~ /mswin|mingw/ +unless Config::CONFIG['host_os'] =~ /mswin|mingw/ class LayoutSymlinkedTest < LayoutTest layout "symlinked/symlinked_layout" end |