diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-20 17:51:26 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-20 17:59:26 +0100 |
commit | 9cf38be008aff555b3aecc53a6f18800cea30a71 (patch) | |
tree | 971681e6a49b1d55c674ffc39bd49559ab010333 /railties/test/generators/mailer_generator_test.rb | |
parent | 500ca98fef7a8cc20f1f8f5835091e1f119e0d8a (diff) | |
download | rails-9cf38be008aff555b3aecc53a6f18800cea30a71.tar.gz rails-9cf38be008aff555b3aecc53a6f18800cea30a71.tar.bz2 rails-9cf38be008aff555b3aecc53a6f18800cea30a71.zip |
Get rid of --old-style-hash
Diffstat (limited to 'railties/test/generators/mailer_generator_test.rb')
-rw-r--r-- | railties/test/generators/mailer_generator_test.rb | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index 139d6b1421..63a97404ee 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -77,33 +77,14 @@ class MailerGeneratorTest < Rails::Generators::TestCase assert_file "app/mailers/notifier.rb" do |mailer| assert_instance_method :foo, mailer do |foo| - if RUBY_VERSION < "1.9" - assert_match(/mail :to => "to@example.org"/, foo) - else - assert_match(/mail to: "to@example.org"/, foo) - end + assert_match(/mail to: "to@example.org"/, foo) assert_match(/@greeting = "Hi"/, foo) end assert_instance_method :bar, mailer do |bar| - if RUBY_VERSION < "1.9" - assert_match(/mail :to => "to@example.org"/, bar) - else - assert_match(/mail to: "to@example.org"/, bar) - end + assert_match(/mail to: "to@example.org"/, bar) assert_match(/@greeting = "Hi"/, bar) end end end - - def test_force_old_style_hash - run_generator ["notifier", "foo", "--old-style-hash"] - assert_file "app/mailers/notifier.rb" do |mailer| - assert_match(/default :from => "from@example.com"/, mailer) - - assert_instance_method :foo, mailer do |foo| - assert_match(/mail :to => "to@example.org"/, foo) - end - end - end end |