diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2011-05-14 01:54:16 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2011-05-14 01:54:16 -0700 |
| commit | db886c817c3620ceaa68a988947e49e5219532fd (patch) | |
| tree | c3c6614b45bfafd7cb97417eaa37e72f4b9f8029 | |
| parent | 1fac9c74ab0ebedb60fd57cadf0042b040938da8 (diff) | |
| parent | 546db693fbe41b1bb8e2335ac05a74485b75580f (diff) | |
| download | rails-db886c817c3620ceaa68a988947e49e5219532fd.tar.gz rails-db886c817c3620ceaa68a988947e49e5219532fd.tar.bz2 rails-db886c817c3620ceaa68a988947e49e5219532fd.zip | |
Merge pull request #553 from arunagw/namespaced_generators
Fixed failing tests for namespaced_generators_test. in 1.9.2
| -rw-r--r-- | railties/test/generators/namespaced_generators_test.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb index eb56e8d1a4..38f024f061 100644 --- a/railties/test/generators/namespaced_generators_test.rb +++ b/railties/test/generators/namespaced_generators_test.rb @@ -163,7 +163,11 @@ class NamespacedMailerGeneratorTest < NamespacedGeneratorTestCase assert_file "app/mailers/test_app/notifier.rb" do |mailer| assert_match /module TestApp/, mailer assert_match /class Notifier < ActionMailer::Base/, mailer - assert_match /default :from => "from@example.com"/, mailer + if RUBY_VERSION < "1.9" + assert_match /default :from => "from@example.com"/, mailer + else + assert_match /default from: "from@example.com"/, mailer + end end end |