Merge pull request #1940 from isaacfreeman/fix/order_resend_error

Fix order resend

backend/app/controllers/spree/admin/orders_controller.rb

@@ -145,7 +145,7 @@ def approve
       end
 
       def resend
-        OrderMailer.confirm_email(@order.id, true).deliver_later
+        OrderMailer.confirm_email(@order, true).deliver_later
         flash[:success] = Spree.t(:order_email_resent)
 
         redirect_to(spree.edit_admin_order_path(@order))

backend/spec/controllers/spree/admin/orders_controller_spec.rb

@@ -58,6 +58,17 @@
       end
     end
 
+    context "#resend" do
+      let(:order) { create(:completed_order_with_totals) }
+      it "resends order email" do
+        mail_message = double "Mail::Message"
+        expect(Spree::OrderMailer).to receive(:confirm_email).with(order, true).and_return mail_message
+        expect(mail_message).to receive :deliver_later
+        post :resend, params: { id: order.number }
+        expect(flash[:success]).to eq Spree.t(:order_email_resent)
+      end
+    end
+
     context "pagination" do
       it "can page through the orders" do
         get :index, params: { page: 2, per_page: 10 }