Adapt code coming from master to the new order api with update_order!

spec/models/spree/payment_spec.rb

@@ -531,7 +531,6 @@ describe Spree::Payment do
     end
 
     context "#save" do
-<<<<<<< HEAD
       context "completed payments" do
         it "updates order payment total" do
           payment = create(:payment, amount: 100, order: order, state: "completed")
@@ -572,19 +571,8 @@ describe Spree::Payment do
           expect(order_updater).to receive(:update_shipment_state)
           create(:payment, amount: 100, order: order)
         end
-=======
-      it "should call order#update_order!" do
-        gateway.name = 'Gateway'
-        gateway.distributors << create(:distributor_enterprise)
-        gateway.save!
-
-        order = create(:order)
-        payment = Spree::Payment.create(amount: 100, order: order, payment_method: gateway)
-        expect(order).to receive(:update_order!)
-        payment.save
->>>>>>> 95ea3f27b... Rename order.update! to order.update_order! and adjustment.update! to adjustment.update_adjustment!
       end
-
+      
       context "when profiles are supported" do
         before do
           gateway.stub payment_profiles_supported?: true