Fix file path on mailer generator

Author: syguer

lib/generators/haml/mailer/mailer_generator.rb

@@ -7,13 +7,13 @@ class MailerGenerator < ControllerGenerator
 
       def copy_view_files
         if ::Rails.version.to_s >= "4.2.0"
-          view_base_path = File.join("app/views", class_path, file_name)
+          view_base_path = File.join("app/views", class_path, file_name + "_mailer")
           empty_directory view_base_path
 
-          if self.behavior == :invoke
+          if behavior == :invoke
             formats.each do |format|
-              layout_path = File.join("app/views/layouts", filename_with_extensions("mailer", format))
-              template filename_with_extensions(:layout, format), layout_path
+              layout_path = File.join("app/views/layouts", class_path, filename_with_extensions("mailer", format))
+              template filename_with_extensions(:layout, format), layout_path unless File.exist?(layout_path)
             end
           end
 

test/lib/generators/haml/mailer_generator_test.rb

@@ -13,7 +13,6 @@ class Haml::Generators::MailerGeneratorTest < Rails::Generators::TestCase
     run_generator
 
     if ::Rails.version.to_s >= '4.2'
-
       assert_file "app/views/layouts/mailer.text.haml" do |view|
         assert_match /\= yield/, view
       end
@@ -22,25 +21,47 @@ class Haml::Generators::MailerGeneratorTest < Rails::Generators::TestCase
         assert_match /\= yield/, view
       end
 
-      assert_file "app/views/notifier/foo.html.haml" do |view|
-        assert_match %r(app/views/notifier/foo\.html\.haml), view
+      assert_file "app/views/notifier_mailer/foo.html.haml" do |view|
+        assert_match %r(app/views/notifier_mailer/foo\.html\.haml), view
         assert_match /\= @greeting/, view
       end
 
-      assert_file "app/views/notifier/bar.html.haml" do |view|
-        assert_match %r(app/views/notifier/bar\.html\.haml), view
+      assert_file "app/views/notifier_mailer/bar.html.haml" do |view|
+        assert_match %r(app/views/notifier_mailer/bar\.html\.haml), view
         assert_match /\= @greeting/, view
       end
-    end
 
-    assert_file "app/views/notifier/foo.text.haml" do |view|
-      assert_match %r(app/views/notifier/foo\.text\.haml), view
-      assert_match /\= @greeting/, view
-    end
+      assert_file "app/views/notifier_mailer/foo.text.haml" do |view|
+        assert_match %r(app/views/notifier_mailer/foo\.text\.haml), view
+        assert_match /\= @greeting/, view
+      end
+
+      assert_file "app/views/notifier_mailer/bar.text.haml" do |view|
+        assert_match %r(app/views/notifier_mailer/bar\.text\.haml), view
+        assert_match /\= @greeting/, view
+      end
+    else
+      if ::Rails.version.to_s >= '4.1'
+        assert_file "app/views/notifier/foo.html.haml" do |view|
+          assert_match %r(app/views/notifier/foo\.html\.haml), view
+          assert_match /\= @greeting/, view
+        end
 
-    assert_file "app/views/notifier/bar.text.haml" do |view|
-      assert_match %r(app/views/notifier/bar\.text\.haml), view
-      assert_match /\= @greeting/, view
+        assert_file "app/views/notifier/bar.html.haml" do |view|
+          assert_match %r(app/views/notifier/bar\.html\.haml), view
+          assert_match /\= @greeting/, view
+        end
+      end
+
+      assert_file "app/views/notifier/foo.text.haml" do |view|
+        assert_match %r(app/views/notifier/foo\.text\.haml), view
+        assert_match /\= @greeting/, view
+      end
+
+      assert_file "app/views/notifier/bar.text.haml" do |view|
+        assert_match %r(app/views/notifier/bar\.text\.haml), view
+        assert_match /\= @greeting/, view
+      end
     end
   end
 end