lib/rails/generators/mailer/mailer_generator.rb in actionmailer-5.0.0.beta3 vs lib/rails/generators/mailer/mailer_generator.rb in actionmailer-5.0.0.beta4

@@ -7,16 +7,31 @@
 
       check_class_collision suffix: "Mailer"
 
       def create_mailer_file
         template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}_mailer.rb")
+
+        in_root do
+          if self.behavior == :invoke && !File.exist?(application_mailer_file_name)
+            template 'application_mailer.rb', application_mailer_file_name
+          end
+        end
       end
 
       hook_for :template_engine, :test_framework
 
       protected
         def file_name
-          @_file_name ||= super.gsub(/\_mailer/i, '')
+          @_file_name ||= super.gsub(/_mailer/i, '')
+        end
+
+      private
+        def application_mailer_file_name
+          @_application_mailer_file_name ||= if mountable_engine?
+                                             "app/mailers/#{namespaced_path}/application_mailer.rb"
+                                           else
+                                             "app/mailers/application_mailer.rb"
+                                           end
         end
     end
   end
 end