Merge pull request #2588 from luisramos0/spree2_mail_method_specs

Spree 2 Upgrade - MailMethod - Fix "undefined mail method" error in specs

spec/controllers/admin/subscriptions_controller_spec.rb

@@ -626,10 +626,7 @@ describe Admin::SubscriptionsController, type: :controller do
 
             context "when at least one associate orders is 'canceled'" do
               before do
-                Spree::MailMethod.create!(
-                  environment: Rails.env,
-                  preferred_mails_from: 'spree@example.com'
-                )
+                Spree::Config[:mails_from] = "spree@example.com"
                 proxy_order.cancel
               end
 

spec/controllers/spree/admin/orders_controller_spec.rb

@@ -180,10 +180,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         context "when the distributor's ABN has been set" do
           before { distributor.update_attribute(:abn, "123") }
           before do
-            Spree::MailMethod.create!(
-              environment: Rails.env,
-              preferred_mails_from: 'spree@example.com'
-            )
+            Spree::Config[:mails_from] = "spree@example.com"
           end
           it "should allow me to send order invoices" do
             expect do

spec/controllers/spree/orders_controller_spec.rb

@@ -300,10 +300,7 @@ describe Spree::OrdersController, type: :controller do
         let(:order) { create(:completed_order_with_totals, user: user) }
 
         before do
-          Spree::MailMethod.create!(
-            environment: Rails.env,
-            preferred_mails_from: 'spree@example.com'
-          )
+          Spree::Config[:mails_from] = "spree@example.com"
         end
 
         it "responds with success" do

spec/controllers/user_passwords_controller_spec.rb

@@ -32,7 +32,6 @@ describe UserPasswordsController, type: :controller do
   end
 
   it "renders Darkswarm" do
-    Spree::MailMethod.create!(environment: 'test')
     clear_jobs
 
     user.send_reset_password_instructions

spec/features/consumer/shopping/orders_spec.rb

@@ -37,10 +37,7 @@ feature "Order Management", js: true do
 
     context "when the distributor allows changes to be made to orders" do
       before do
-        Spree::MailMethod.create!(
-          environment: Rails.env,
-          preferred_mails_from: 'spree@example.com'
-        )
+        Spree::Config[:mails_from] = "spree@example.com"
       end
       before do
         order.distributor.update_attributes(allow_order_changes: true)

spec/mailers/enterprise_mailer_spec.rb

@@ -6,7 +6,6 @@ describe EnterpriseMailer do
 
   before do
     ActionMailer::Base.deliveries = []
-    Spree::MailMethod.create!(environment: 'test')
   end
 
   describe "#welcome" do

spec/mailers/producer_mailer_spec.rb

@@ -3,10 +3,7 @@ require 'yaml'
 
 describe ProducerMailer do
   before do
-    Spree::MailMethod.create!(
-      environment: Rails.env,
-      preferred_mails_from: 'spree@example.com'
-    )
+    Spree::Config[:mails_from] = "spree@example.com"
   end
   let!(:zone) { create(:zone_with_member) }
   let!(:tax_rate) { create(:tax_rate, included_in_price: true, calculator: Spree::Calculator::DefaultTax.new, zone: zone, amount: 0.1) }

spec/mailers/user_mailer_spec.rb

@@ -11,8 +11,6 @@ describe Spree::UserMailer do
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
-
-    Spree::MailMethod.create!(environment: 'test')
   end
 
   it "sends an email when given a user" do

spec/models/order_cycle_spec.rb

@@ -525,16 +525,13 @@ describe OrderCycle do
     let!(:order5) { create(:completed_order_with_totals, distributor: shop, user: user, order_cycle: oc)  }
 
     before do
-      Spree::MailMethod.create!(
-        environment: Rails.env,
-        preferred_mails_from: 'spree@example.com'
-      )
+      Spree::Config[:mails_from] = "spree@example.com"
     end
     before { order5.cancel }
 
     it "only returns items from non-cancelled orders in the OC, placed by the user at the shop" do
       items = oc.items_bought_by_user(user, shop)
-      expect(items).to eq order1.reload.line_items
+      expect(items).to match_array order1.reload.line_items
     end
   end
 end

spec/models/spree/order_spec.rb

@@ -495,10 +495,7 @@ describe Spree::Order do
   describe "scopes" do
     describe "not_state" do
       before do
-        Spree::MailMethod.create!(
-          environment: Rails.env,
-          preferred_mails_from: 'spree@example.com'
-        )
+        Spree::Config[:mails_from] = "spree@example.com"
       end
 
       it "finds only orders not in specified state" do