Revert "Update email message (#25)"

This reverts commit 2cd3564.
opensavannah · Sep 9, 2019 · 9447360 · 9447360
1 parent 895ee91
commit 9447360
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 51 deletions.
diff --git a/app/views/thing_mailer/first_adoption_confirmation.html.erb b/app/views/thing_mailer/first_adoption_confirmation.html.erb
@@ -56,7 +56,8 @@
   <li>
       If your drain is too dirty or hard to clear, you can't find your drain
       (sometimes the maps are incorrect) or there's some other problem with your
-      drain, contact <a href="https://www.savannahga.gov/FormCenter/311-5/311-Service-Request-Form-36">Savannah 311 City Service Request Form</a>.
+      drain, contact <a href="http://www.sf311.org/index.aspx?page=298">311</a>.
+    # update SF 311 Info website to Savannah
   </li>
 </ul>
 

diff --git a/config/initializers/backport_pg_10_support_to_rails_4.rb b/config/initializers/backport_pg_10_support_to_rails_4.rb
diff --git a/test/controllers/main_controller_test.rb b/test/controllers/main_controller_test.rb
@@ -12,7 +12,7 @@ class MainControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_select 'title', 'Adopt-a-Drain Savannah'
-    assert_select 'p#tagline', 'Prevent storm drain pollution by clearing leaves, dirt, litter, and other debris around city storm drains. Click to learn what this means.'
+    assert_select 'p#tagline', 'Help the city avoid flooding by clearing drains of debris. Click to learn what this means.'
   end
 
   test 'should show search form when signed in' do

diff --git a/test/mailers/devise_mailer_test.rb b/test/mailers/devise_mailer_test.rb
@@ -7,7 +7,7 @@ class DeviseMailerTest < ActionMailer::TestCase
     email = DeviseMailer.reset_password_instructions(@user, '1234').deliver_now
 
     assert_not ActionMailer::Base.deliveries.empty?
-    assert_equal ['Info@adopt-a-drain-savannah.org'], email.from
+    assert_equal ['no-reply@sfwater.org'], email.from
     assert_equal ['erik@example.com'], email.to
     assert_equal 'Adopt-a-drain Savannah reset password instructions', email.subject
   end

diff --git a/test/mailers/thing_mailer_test.rb b/test/mailers/thing_mailer_test.rb
@@ -9,7 +9,7 @@ class ThingMailerTest < ActionMailer::TestCase
     email = ThingMailer.first_adoption_confirmation(@thing).deliver_now
 
     assert_not ActionMailer::Base.deliveries.empty?
-    assert_equal ['Info@adopt-a-drain-savannah.org'], email.from
+    assert_equal ['adoptadraindurham@gmail.com'], email.from
     assert_equal ['erik@example.com'], email.to
     assert_equal 'Thanks for adopting a drain, Erik! Here’s important info', email.subject
   end
@@ -22,7 +22,7 @@ class ThingMailerTest < ActionMailer::TestCase
     email = ThingMailer.second_adoption_confirmation(@thing).deliver_now
 
     assert_not ActionMailer::Base.deliveries.empty?
-    assert_equal ['Info@adopt-a-drain-savannah.org'], email.from
+    assert_equal ['adoptadraindurham@gmail.com'], email.from
     assert_equal ['erik@example.com'], email.to
     assert_equal 'Thanks for adopting another drain, Erik!', email.subject
   end
@@ -35,7 +35,7 @@ class ThingMailerTest < ActionMailer::TestCase
     email = ThingMailer.third_adoption_confirmation(@thing).deliver_now
 
     assert_not ActionMailer::Base.deliveries.empty?
-    assert_equal ['Info@adopt-a-drain-savannah.org'], email.from
+    assert_equal ['adoptadraindurham@gmail.com'], email.from
     assert_equal ['erik@example.com'], email.to
     assert_equal 'We really do love you, Erik!', email.subject
   end