diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-24 19:52:24 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-05-24 19:52:24 -0700 |
| commit | c29ce8add01ed54a1d87c1420672aea70eab9297 (patch) | |
| tree | cd62e85c67d340a6220559340e6695ff4141efdb | |
| parent | 52e01fc59dfcadaa0fd7773fb4d9a04dff297ce8 (diff) | |
| parent | c302670c8421cdf899274eb00294648f7de8ed78 (diff) | |
| download | rails-c29ce8add01ed54a1d87c1420672aea70eab9297.tar.gz rails-c29ce8add01ed54a1d87c1420672aea70eab9297.tar.bz2 rails-c29ce8add01ed54a1d87c1420672aea70eab9297.zip | |
Merge pull request #1286 from arunagw/fixed_failing_generators_test
Fixed failing tests for generators_test
| -rw-r--r-- | actionmailer/test/log_subscriber_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/application/generators_test.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionmailer/test/log_subscriber_test.rb b/actionmailer/test/log_subscriber_test.rb index 7d2e674a8c..5f52a1bd69 100644 --- a/actionmailer/test/log_subscriber_test.rb +++ b/actionmailer/test/log_subscriber_test.rb @@ -1,4 +1,5 @@ require "abstract_unit" +require 'mailers/base_mailer' require "active_support/log_subscriber/test_helper" require "action_mailer/log_subscriber" diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb index 8b840fffd0..daacea4720 100644 --- a/railties/test/application/generators_test.rb +++ b/railties/test/application/generators_test.rb @@ -69,7 +69,7 @@ module ApplicationTests # Initialize the application require "#{app_path}/config/environment" require "rails/generators" - Rails::Generators.configure! + Rails::Generators.configure!(Rails.application.config.generators) assert_equal :rspec, Rails::Generators.options[:rails][:test_framework] assert_equal "-w", Rails::Generators.aliases[:rails][:test_framework] @@ -85,7 +85,7 @@ module ApplicationTests # Initialize the application require "#{app_path}/config/environment" require "rails/generators" - Rails::Generators.configure! + Rails::Generators.configure!(Rails.application.config.generators) assert_equal Thor::Base.shell, Thor::Shell::Basic end |