[pull] main from solidusio:main

core/spec/lib/spree/money_spec.rb

@@ -148,13 +148,13 @@
     it "formats as HTML if asked (nicely) to" do
       money = Spree::Money.new(10, format: '%n %u')
       # The HTML'ified version of "10.00 €"
-      expect(money.to_html).to eq("<span class=\"money-whole\">10</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span> <span class=\"money-currency-symbol\">&#x20AC;</span>")
+      expect(money.to_html).to eq("<span class=\"money-whole\">10</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span> <span class=\"money-currency-symbol\">€</span>")
     end
 
     it "formats as HTML with currency" do
       money = Spree::Money.new(10, format: '%n %u', with_currency: true)
       # The HTML'ified version of "10.00 €"
-      expect(money.to_html).to eq("<span class=\"money-whole\">10</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span> <span class=\"money-currency-symbol\">&#x20AC;</span> <span class=\"money-currency\">EUR</span>")
+      expect(money.to_html).to eq("<span class=\"money-whole\">10</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span> <span class=\"money-currency-symbol\">€</span> <span class=\"money-currency\">EUR</span>")
     end
   end
 

core/spec/models/spree/adjustment_spec.rb

@@ -229,4 +229,107 @@
       end
     end
   end
+
+  describe "#calculate_eligibility" do
+    subject { adjustment.calculate_eligibility }
+
+    around do |example|
+      Spree.deprecator.silence do
+        example.run
+      end
+    end
+
+    context "when the adjustment is not a promotion adjustment" do
+      let(:adjustment) { build(:adjustment, eligible: true, source: nil) }
+
+      it { is_expected.to eq true }
+    end
+  end
+
+  describe "#finalize" do
+    let(:adjustable) { create(:order) }
+    let(:adjustment) { build(:adjustment, finalized: false, adjustable: adjustable) }
+
+    subject { adjustment.finalize }
+
+    it "sets the adjustment as finalized" do
+      expect { subject }.to change { adjustment.finalized }.from(false).to(true)
+    end
+
+    it "persists the adjustment" do
+      expect { subject }.to change { adjustment.persisted? }.from(false).to(true)
+    end
+
+    context "for an invalid adjustment" do
+      let(:adjustment) { build(:adjustment, finalized: false, amount: nil, adjustable: adjustable) }
+
+      it "raises no error, returns false, does not persist the adjustment" do
+        expect { subject }.not_to change { adjustment.persisted? }.from(false)
+        expect(subject).to eq false
+      end
+    end
+  end
+
+  describe "#unfinalize" do
+    let(:adjustable) { create(:order) }
+    let(:adjustment) { build(:adjustment, finalized: true, adjustable: adjustable) }
+
+    subject { adjustment.unfinalize }
+
+    it "sets the adjustment as finalized" do
+      expect { subject }.to change { adjustment.finalized }.from(true).to(false)
+    end
+
+    it "persists the adjustment" do
+      expect { subject }.to change { adjustment.persisted? }.from(false).to(true)
+    end
+
+    context "for an invalid adjustment" do
+      let(:adjustment) { build(:adjustment, finalized: false, amount: nil, adjustable: adjustable) }
+
+      it "raises no error, returns false, does not persist the adjustment" do
+        expect { subject }.not_to change { adjustment.persisted? }.from(false)
+        expect(subject).to eq false
+      end
+    end
+  end
+
+  describe "#unfinalize!" do
+    let(:adjustable) { create(:order) }
+    let(:adjustment) { build(:adjustment, finalized: true, adjustable: adjustable) }
+
+    subject { adjustment.unfinalize! }
+
+    it "sets the adjustment as finalized" do
+      expect { subject }.to change { adjustment.finalized }.from(true).to(false)
+    end
+
+    it "persists the adjustment" do
+      expect { subject }.to change { adjustment.persisted? }.from(false).to(true)
+    end
+
+    context "for an invalid adjustment" do
+      let(:adjustment) { build(:adjustment, finalized: false, amount: nil, adjustable: adjustable) }
+
+      it "raises an error" do
+        expect { subject }.to raise_exception(ActiveRecord::RecordInvalid)
+      end
+    end
+  end
+
+  describe "#cancellation?" do
+    subject { adjustment.cancellation? }
+
+    context "when the adjustment is a cancellation" do
+      let(:adjustment) { build(:adjustment, source_type: "Spree::UnitCancel") }
+
+      it { is_expected.to eq true }
+    end
+
+    context "when the adjustment is not a cancellation" do
+      let(:adjustment) { build(:adjustment) }
+
+      it { is_expected.to eq false }
+    end
+  end
 end

core/spec/models/spree/order/checkout_spec.rb

@@ -519,6 +519,18 @@ def assert_state_changed(order, from, to)
       end
     end
 
+    context "no payment present" do
+      let(:order) { create :order_ready_to_complete }
+      before do
+        order.payments.destroy_all
+      end
+
+      it "does not allow the order to complete" do
+        expect { order.complete! }.to raise_exception(StateMachines::InvalidTransition)
+        expect(order.errors[:base]).to include("No payment found")
+      end
+    end
+
     context "exchange order completion" do
       before do
         order.email = 'solidus@example.org'
@@ -611,6 +623,20 @@ def assert_state_changed(order, from, to)
     end
   end
 
+  context "resuming a canceled order" do
+    let(:order) { create(:completed_order_with_totals) }
+
+    before do
+      order.cancel!
+    end
+
+    it "also resumes the shipments" do
+      expect(order.shipments.map(&:state)).to eq %w(canceled)
+      order.resume!
+      expect(order.shipments.map(&:state)).to eq %w(pending)
+    end
+  end
+
   context "re-define checkout flow" do
     before do
       @old_checkout_flow = Spree::Order.checkout_flow