diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-28 20:00:29 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-28 20:00:29 +0000 |
| commit | d6c2285e31cbc7150cf99ff3a537eddbdb50fb29 (patch) | |
| tree | 785f0c7ad566a09b9bc558854b4a5d43ae86ed46 /actionpack/test/controller/layout_test.rb | |
| parent | aaea12c497ca86a86fbda8409c226630ade22f89 (diff) | |
| parent | a2270ef2594b97891994848138614657363f2806 (diff) | |
| download | rails-d6c2285e31cbc7150cf99ff3a537eddbdb50fb29.tar.gz rails-d6c2285e31cbc7150cf99ff3a537eddbdb50fb29.tar.bz2 rails-d6c2285e31cbc7150cf99ff3a537eddbdb50fb29.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/test/controller/layout_test.rb')
| -rw-r--r-- | actionpack/test/controller/layout_test.rb | 22 |
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 |