Permalink
Browse files

Merge pull request #1286 from arunagw/fixed_failing_generators_test

Fixed failing tests for generators_test
  • Loading branch information...
2 parents 52e01fc + c302670 commit c29ce8add01ed54a1d87c1420672aea70eab9297 @tenderlove tenderlove committed May 25, 2011
Showing with 3 additions and 2 deletions.
  1. +1 −0 actionmailer/test/log_subscriber_test.rb
  2. +2 −2 railties/test/application/generators_test.rb
View
1 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"
View
4 railties/test/application/generators_test.rb
@@ -69,7 +69,7 @@ def with_bare_config
# 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 @@ def with_bare_config
# 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

0 comments on commit c29ce8a

Please sign in to comment.