Merge branch 'master' into 2-0-stable-nov-8th

spec/controllers/admin/manager_invitations_controller_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 module Admin
   describe ManagerInvitationsController, type: :controller do
+    include OpenFoodNetwork::EmailHelper
+
     let!(:enterprise_owner) { create(:user) }
     let!(:other_enterprise_user) { create(:user) }
     let!(:existing_user) { create(:user) }
@@ -25,7 +27,7 @@ module Admin
 
       context "signing up a new user" do
         before do
-          create(:mail_method)
+          setup_email
           controller.stub spree_current_user: admin
         end
 
@@ -46,7 +48,7 @@ module Admin
     describe "with enterprise permissions" do
       context "as user with proper enterprise permissions" do
         before do
-          create(:mail_method)
+          setup_email
           controller.stub spree_current_user: enterprise_owner
         end
 

spec/controllers/admin/subscriptions_controller_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Admin::SubscriptionsController, type: :controller do
   include AuthenticationWorkflow
+  include OpenFoodNetwork::EmailHelper
 
   describe 'index' do
     let!(:user) { create(:user, enterprise_limit: 10) }
@@ -626,7 +627,7 @@ describe Admin::SubscriptionsController, type: :controller do
 
             context "when at least one associate orders is 'canceled'" do
               before do
-                Spree::Config[:mails_from] = "spree@example.com"
+                setup_email
                 proxy_order.cancel
               end