diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-29 10:04:42 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-29 10:04:42 +0200 |
| commit | 0bbf9029e8089356aed0e3be2f859d56951a89cf (patch) | |
| tree | 38e41ef8b63140a91c828bec03e06e83f38899b6 /actionpack/test/fixtures | |
| parent | 006cef7107b648882cfc09f56904c601454cfc77 (diff) | |
| parent | 17599abc9c06f30ff23d7ad47a3f029e32c26c88 (diff) | |
| download | rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.gz rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.bz2 rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.zip | |
Merge remote branch 'miloops/warnings'
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/alternate_helpers/foo_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/test/hello_world_from_rxml.builder | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/test/fixtures/alternate_helpers/foo_helper.rb b/actionpack/test/fixtures/alternate_helpers/foo_helper.rb index a956fce6fa..2528584473 100644 --- a/actionpack/test/fixtures/alternate_helpers/foo_helper.rb +++ b/actionpack/test/fixtures/alternate_helpers/foo_helper.rb @@ -1,3 +1,3 @@ module FooHelper - def baz() end + redefine_method(:baz) {} end diff --git a/actionpack/test/fixtures/test/hello_world_from_rxml.builder b/actionpack/test/fixtures/test/hello_world_from_rxml.builder index 8455b11edc..619a97ba96 100644 --- a/actionpack/test/fixtures/test/hello_world_from_rxml.builder +++ b/actionpack/test/fixtures/test/hello_world_from_rxml.builder @@ -1,4 +1,3 @@ xml.html do xml.p "Hello" end -"String return value" |