Add course-specific email signatory to facilitator application emails

dashboard/app/mailers/pd/application/facilitator1819_application_mailer.rb

@@ -1,13 +1,14 @@
 module Pd::Application
   class Facilitator1819ApplicationMailer < ActionMailer::Base
     default from: 'Code.org <facilitators@code.org>'
+    helper_method :signed_by, :from
 
     def confirmation(facilitator_application)
       @application = facilitator_application
-      @signed = facilitator_application.csf? ? 'Jenna Garcia' : 'Sarah Fairweather'
 
       mail(
         to: @application.user.email,
+        from: from(@application),
         subject: "We've received your facilitator application!"
       )
     end
@@ -17,6 +18,7 @@ def declined(facilitator_application)
 
       mail(
         to: @application.user.email,
+        from: from(@application),
         subject: "Your Code.org facilitator application status"
       )
     end
@@ -26,8 +28,19 @@ def waitlisted(facilitator_application)
 
       mail(
         to: @application.user.email,
+        from: from(@application),
         subject: "Your Code.org facilitator application status"
       )
     end
+
+    private
+
+    def from(facilitator_application)
+      "#{signed_by(facilitator_application)} <facilitators@code.org>"
+    end
+
+    def signed_by(facilitator_application)
+      facilitator_application.csf? ? 'Jenna Garcia' : 'Sarah Fairweather'
+    end
   end
 end

dashboard/app/views/pd/application/facilitator1819_application_mailer/confirmation.html.haml

@@ -27,6 +27,6 @@
 %p
   Thank you,
   %br
-  = @signed
+  = signed_by(@application)
   %br
   Education Program Manager, Code.org

dashboard/app/views/pd/application/facilitator1819_application_mailer/declined.html.haml

@@ -14,7 +14,7 @@
   materials for educators at code.org/educate. We wish you the best this year!
 
 %p
-  Sarah Fairweather
+  = signed_by(@application)
   %br
   Education Team Program Manager
   %br

dashboard/app/views/pd/application/facilitator1819_application_mailer/waitlisted.html.haml

@@ -18,7 +18,7 @@
 %p
   Thank you,
 %p
-  Sarah Fairweather
+  = signed_by(@application)
   %br
   Education Team Program Manager
   %br

dashboard/test/mailers/previews/pd_facilitator1819_application_mailer_preview.rb

@@ -0,0 +1,36 @@
+# This can be viewed on non-production environments at /rails/mailers/pd/teacher_application_mailer
+class Pd::Facilitator1819ApplicationMailerPreview < ActionMailer::Preview
+  include FactoryGirl::Syntax::Methods
+
+  def confirmation
+    Pd::Application::Facilitator1819ApplicationMailer.confirmation build_application
+  end
+
+  def confirmation_csf
+    Pd::Application::Facilitator1819ApplicationMailer.confirmation build_application(course: 'csf')
+  end
+
+  def declined
+    Pd::Application::Facilitator1819ApplicationMailer.declined build_application
+  end
+
+  def declined_csf
+    Pd::Application::Facilitator1819ApplicationMailer.declined build_application(course: 'csf')
+  end
+
+  def waitlisted
+    Pd::Application::Facilitator1819ApplicationMailer.waitlisted build_application
+  end
+
+  def waitlisted_csf
+    Pd::Application::Facilitator1819ApplicationMailer.waitlisted build_application(course: 'csf')
+  end
+
+  private
+
+  def build_application(course: 'csp')
+    # Build user explicitly (instead of create) so it's not saved
+    user = build :teacher, email: 'rubeus@hogwarts.co.uk'
+    build :pd_facilitator1819_application, user: user, course: course
+  end
+end