Merge pull request #1286 from arunagw/fixed_failing_generators_test

Fixed failing tests for generators_test

actionmailer/test/log_subscriber_test.rb

 require "abstract_unit"
+require 'mailers/base_mailer'
 require "active_support/log_subscriber/test_helper"
 require "action_mailer/log_subscriber"
 

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