Merge branch 'release/0.20'0.20.0.0

Conflicts:
  config/general.yml-example

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/controllers/admin_spam_addresses_controller_spec.rb b/spec/controllers/admin_spam_addresses_controller_spec.rb
index da1e9bb5a..a1e434159 100644
--- a/spec/controllers/admin_spam_addresses_controller_spec.rb
+++ b/spec/controllers/admin_spam_addresses_controller_spec.rb
@@ -37,7 +37,7 @@ describe AdminSpamAddressesController do
         it 'redirects to the index action if successful' do
             SpamAddress.any_instance.stub(:save).and_return(true)
             post :create, :spam_address => spam_params
-            expect(response).to redirect_to(spam_addresses_path)
+            expect(response).to redirect_to(admin_spam_addresses_path)
         end
 
         it 'notifies the admin the spam address has been created' do
@@ -83,7 +83,7 @@ describe AdminSpamAddressesController do
         end
 
         it 'redirects to the index action' do
-            expect(response).to redirect_to(spam_addresses_path)
+            expect(response).to redirect_to(admin_spam_addresses_path)
         end
 
     end