solidus_core 2.2.2 → 2.3.0.beta1

data/spec/models/spree/payment_method/credit_card_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Spree::PaymentMethod::CreditCard, type: :model do
+  context "fetching payment sources" do
+    let(:store) { create :store }
+    let(:user) { create :user }
+    let(:order) { Spree::Order.create(user: user, completed_at: completed_at, store: store) }
+
+    let(:payment_method) { create(:credit_card_payment_method) }
+
+    let(:cc) do
+      create(:credit_card,
+             payment_method: payment_method,
+             gateway_customer_profile_id: "EFWE",
+             user: cc_user)
+    end
+
+    let(:payment) do
+      create(:payment, order: order, source: cc, payment_method: payment_method)
+    end
+
+    context 'order is not complete and credit card user is nil' do
+      let(:cc_user) { nil }
+      let(:completed_at) { nil }
+
+      it "finds no credit cards associated to the order" do
+        expect(payment_method.reusable_sources(payment.order)).to be_empty
+      end
+    end
+
+    context 'order is complete but credit card user is nil' do
+      let(:cc_user) { nil }
+      let(:completed_at) { Date.yesterday }
+
+      it "finds credit cards associated on a order completed" do
+        expect(payment_method.reusable_sources(payment.order)).to eq [cc]
+      end
+    end
+
+    context 'order is not complete but credit card has user' do
+      let(:cc_user) { user }
+      let(:completed_at) { nil }
+      before do
+        cc_user.wallet.add(cc)
+      end
+      it "finds credit cards associated to the user" do
+        expect(payment_method.reusable_sources(payment.order)).to eq [cc]
+      end
+    end
+  end
+
+  context 'using preference_source' do
+    let(:klass){ Spree::PaymentMethod::BogusCreditCard }
+    before do
+      Spree::Config.static_model_preferences.add(klass, 'test_preference_source', server: 'bar')
+    end
+    after do
+      Spree::Config.static_model_preferences.for_class(klass).clear
+    end
+    let(:payment_method){ create(:credit_card_payment_method, preference_source: 'test_preference_source') }
+
+    it "reads static preferences" do
+      expect(payment_method.options).to eq({ server: "bar" })
+    end
+  end
+end

data/spec/models/spree/payment_method/simple_bogus_credit_card_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Spree::PaymentMethod::SimpleBogusCreditCard, type: :model do
+  subject { Spree::PaymentMethod::SimpleBogusCreditCard.new }
+
+  # regression test for https://github.com/spree/spree/issues/3824
+  describe "#capture" do
+    it "returns success with the right response code" do
+      response = subject.capture(123, '12345', {})
+      expect(response.message).to include("success")
+    end
+
+    it "returns failure with the wrong response code" do
+      response = subject.capture(123, 'wrong', {})
+      expect(response.message).to include("failure")
+    end
+  end
+end

data/spec/models/spree/payment_method_spec.rb

@@ -180,8 +180,8 @@ describe Spree::PaymentMethod, type: :model do
   end
 
   describe '#auto_capture?' do
-    class TestGateway < Spree::Gateway
-      def provider_class
+    class TestGateway < Spree::PaymentMethod::CreditCard
+      def gateway_class
         Provider
       end
     end
@@ -309,4 +309,49 @@ describe Spree::PaymentMethod, type: :model do
       end
     end
   end
+
+  describe 'ActiveMerchant methods' do
+    class PaymentGateway
+      def initialize(options)
+      end
+
+      def authorize; 'authorize'; end
+
+      def purchase; 'purchase'; end
+
+      def capture; 'capture'; end
+
+      def void; 'void'; end
+
+      def credit; 'credit'; end
+    end
+
+    class TestPaymentMethod < Spree::PaymentMethod
+      def gateway_class
+        PaymentGateway
+      end
+    end
+
+    let(:payment_method) { TestPaymentMethod.new }
+
+    it "passes through authorize" do
+      expect(payment_method.authorize).to eq 'authorize'
+    end
+
+    it "passes through purchase" do
+      expect(payment_method.purchase).to eq 'purchase'
+    end
+
+    it "passes through capture" do
+      expect(payment_method.capture).to eq 'capture'
+    end
+
+    it "passes through void" do
+      expect(payment_method.void).to eq 'void'
+    end
+
+    it "passes through credit" do
+      expect(payment_method.credit).to eq 'credit'
+    end
+  end
 end

data/spec/models/spree/payment_spec.rb

@@ -6,7 +6,7 @@ describe Spree::Payment, type: :model do
   let(:refund_reason) { create(:refund_reason) }
 
   let(:gateway) do
-    gateway = Spree::Gateway::Bogus.new(active: true, name: 'Bogus gateway')
+    gateway = Spree::PaymentMethod::BogusCreditCard.new(active: true, name: 'Bogus gateway')
     allow(gateway).to receive_messages source_required: true
     gateway
   end
@@ -209,7 +209,7 @@ describe Spree::Payment, type: :model do
       # Regression test for https://github.com/spree/spree/issues/4598
       it "should allow payments with a gateway_customer_profile_id" do
         payment.source.update!(gateway_customer_profile_id: "customer_1", brand: 'visa')
-        expect(payment.payment_method.provider_class).to receive(:supports?).with('visa').and_return(false)
+        expect(payment.payment_method.gateway_class).to receive(:supports?).with('visa').and_return(false)
         expect(payment).to receive(:started_processing!)
         payment.process!
       end
@@ -217,7 +217,7 @@ describe Spree::Payment, type: :model do
       # Another regression test for https://github.com/spree/spree/issues/4598
       it "should allow payments with a gateway_payment_profile_id" do
         payment.source.update!(gateway_payment_profile_id: "customer_1", brand: 'visa')
-        expect(payment.payment_method.provider_class).to receive(:supports?).with('visa').and_return(false)
+        expect(payment.payment_method.gateway_class).to receive(:supports?).with('visa').and_return(false)
         expect(payment).to receive(:started_processing!)
         payment.process!
       end
@@ -653,13 +653,12 @@ describe Spree::Payment, type: :model do
     end
 
     context "completed orders" do
-      let(:payment_method) { create(:check_payment_method) }
       before { allow(order).to receive_messages completed?: true }
 
       it "updates payment_state and shipments" do
         expect(order.updater).to receive(:update_payment_state)
         expect(order.updater).to receive(:update_shipment_state)
-        Spree::Payment.create!(amount: 100, order: order, payment_method: payment_method)
+        Spree::Payment.create(amount: 100, order: order)
       end
     end
 
@@ -743,13 +742,12 @@ describe Spree::Payment, type: :model do
     end
 
     describe "invalidating payments updates in memory objects" do
-      let(:payment_method) { create(:check_payment_method) }
       before do
-        Spree::PaymentCreate.new(order, amount: 1, payment_method_id: payment_method.id).build.save!
+        Spree::PaymentCreate.new(order, amount: 1).build.save!
         expect(order.payments.map(&:state)).to contain_exactly(
           'checkout'
         )
-        Spree::PaymentCreate.new(order, amount: 2, payment_method_id: payment_method.id).build.save!
+        Spree::PaymentCreate.new(order, amount: 2).build.save!
       end
 
       it 'should not have stale payments' do

data/spec/models/spree/preference_spec.rb

@@ -15,7 +15,7 @@ describe Spree::Preference, type: :model do
       p.key = key
       p.save
 
-      Spree::Preference.find_by_key(key)
+      Spree::Preference.find_by(key: key)
     end
 
     it ":boolean" do

data/spec/models/spree/price_spec.rb

@@ -133,7 +133,7 @@ describe Spree::Price, type: :model do
   describe 'net_amount' do
     let(:country) { create(:country, iso: "DE") }
     let(:zone) { create(:zone, countries: [country]) }
-    let!(:tax_rate) { create(:tax_rate, included_in_price: true, zone: zone, tax_category: variant.tax_category) }
+    let!(:tax_rate) { create(:tax_rate, included_in_price: true, zone: zone, tax_categories: [variant.tax_category]) }
 
     let(:variant) { create(:product).master }
 

data/spec/models/spree/product/scopes_spec.rb

@@ -113,4 +113,50 @@ describe "Product scopes", type: :model do
       end
     end
   end
+
+  describe '.available' do
+    context "a product with past available_on" do
+      let!(:product) { create(:product, available_on: 1.day.ago) }
+
+      it "includes the product" do
+        expect(Spree::Product.available).to match_array([product])
+      end
+
+      context "with no master price" do
+        before { product.master.prices.delete_all }
+
+        it "doesn't include the product" do
+          expect(Spree::Product.available).to match_array([])
+        end
+      end
+
+      context "with soft-deleted master price" do
+        before { product.master.prices.destroy_all }
+
+        it "doesn't include the product" do
+          expect(Spree::Product.available).to match_array([])
+        end
+      end
+
+      context "with multiple prices" do
+        let!(:second_price) { create(:price, variant: product.master) }
+
+        it "includes the product only once" do
+          expect(Spree::Product.available).to match_array([product])
+        end
+
+        it "has a count of 1" do
+          expect(Spree::Product.available.count).to eq(1)
+        end
+      end
+    end
+
+    context "a product with future available_on" do
+      let!(:product) { create(:product, available_on: 1.day.from_now) }
+
+      it "doesn't include the product" do
+        expect(Spree::Product.available).to match_array([])
+      end
+    end
+  end
 end

data/spec/models/spree/promotion_action_spec.rb

@@ -22,6 +22,10 @@ describe Spree::PromotionAction, type: :model do
       @action_adjustment = order.adjustments.where(source: action).first!
     end
 
+    it "generates its own partial path" do
+      expect(action.to_partial_path).to eq 'spree/admin/promotions/actions/my_promotion_action'
+    end
+
     it 'removes the action adjustment' do
       expect(order.adjustments).to match_array([other_adjustment, @action_adjustment])
 

data/spec/models/spree/promotion_code/batch_builder_spec.rb

@@ -12,7 +12,7 @@ describe Spree::PromotionCode::BatchBuilder do
     )
   end
 
-  subject { described_class.new promotion_code_batch }
+  subject { described_class.new(promotion_code_batch) }
 
   describe "#build_promotion_codes" do
     context "with a failed build" do
@@ -27,6 +27,7 @@ describe Spree::PromotionCode::BatchBuilder do
         expect(promotion_code_batch.reload.state).to eq("failed")
       end
     end
+
     context "with a successful build" do
       before do
         allow(Spree::PromotionCodeBatchMailer)
@@ -48,13 +49,34 @@ describe Spree::PromotionCode::BatchBuilder do
         expect(subject.promotion.codes.map(&:value).uniq.size).to eq(10)
       end
 
+      it "updates the promotion code batch state to completed" do
+        expect(promotion_code_batch.state).to eq("completed")
+      end
+    end
+  end
+
+  describe "#join_character" do
+    context "with the default join charachter _" do
       it "builds codes with the same base prefix" do
+        subject.build_promotion_codes
+
         values = subject.promotion.codes.map(&:value)
         expect(values.all? { |val| val.starts_with?("#{base_code}_") }).to be true
       end
+    end
 
-      it "updates the promotion code batch state to completed" do
-        expect(promotion_code_batch.state).to eq("completed")
+    context "with a custom join separator" do
+      around do |example|
+        Spree::PromotionCode::BatchBuilder.join_characters = "x"
+        example.run
+        Spree::PromotionCode::BatchBuilder.join_characters = "_"
+      end
+
+      it "builds codes with the same base prefix" do
+        subject.build_promotion_codes
+
+        values = subject.promotion.codes.map(&:value)
+        expect(values.all? { |val| val.starts_with?("#{base_code}x") }).to be true
       end
     end
   end

data/spec/models/spree/promotion_code_batch_spec.rb

@@ -1,8 +1,6 @@
 require "spec_helper"
 
 describe Spree::PromotionCodeBatch, type: :model do
-  include ActiveJob::TestHelper
-
   subject do
     described_class.create!(
       promotion_id: create(:promotion).id,
@@ -16,12 +14,8 @@ describe Spree::PromotionCodeBatch, type: :model do
   describe "#process" do
     context "with a pending code batch" do
       it "should call the worker" do
-        ActiveJob::Base.queue_adapter = :test
-
         expect { subject.process }
           .to have_enqueued_job(Spree::PromotionCodeBatchJob)
-
-        clear_enqueued_jobs
       end
 
       it "should update the state to processing" do

data/spec/models/spree/promotion_handler/coupon_spec.rb

@@ -255,7 +255,7 @@ module Spree
           let(:order) { create(:order, store: store) }
           let(:tax_category) { create(:tax_category, name: "Taxable Foo") }
           let(:zone) { create(:zone, :with_country) }
-          let!(:tax_rate) { create(:tax_rate, amount: 0.1, tax_category: tax_category, zone: zone )}
+          let!(:tax_rate) { create(:tax_rate, amount: 0.1, tax_categories: [tax_category], zone: zone ) }
 
           before(:each) do
             expect(order).to receive(:tax_address).at_least(:once).and_return(Spree::Tax::TaxLocation.new(country: zone.countries.first))

data/spec/models/spree/promotion_rule_spec.rb

@@ -23,5 +23,10 @@ module Spree
       p2.promotion_id = 1
       expect(p2).not_to be_valid
     end
+
+    it "generates its own partial path" do
+      rule = TestRule.new
+      expect(rule.to_partial_path).to eq 'spree/admin/promotions/rules/test_rule'
+    end
   end
 end

data/spec/models/spree/reimbursement_type/original_payment_spec.rb

@@ -54,7 +54,7 @@ module Spree
       context "multiple payment methods" do
         let(:simulate) { true }
         let!(:check_payment) { create(:check_payment, order: reimbursement.order, amount: 5.0, state: "completed") }
-        let(:payment) { reimbursement.order.payments.detect { |p| p.payment_method.is_a? Spree::Gateway::Bogus } }
+        let(:payment) { reimbursement.order.payments.detect { |p| p.payment_method.is_a? Spree::PaymentMethod::BogusCreditCard } }
         let(:refund_amount) { 10.0 }
 
         let(:refund_payment_methods) { subject.map { |refund| refund.payment.payment_method } }

data/spec/models/spree/shipment_spec.rb

@@ -130,7 +130,7 @@ describe Spree::Shipment, type: :model do
 
     let!(:ship_address) { create(:address) }
     let!(:tax_zone) { create(:global_zone) } # will include the above address
-    let!(:tax_rate) { create(:tax_rate, amount: 0.1, zone: tax_zone, tax_category: tax_category) }
+    let!(:tax_rate) { create(:tax_rate, amount: 0.1, zone: tax_zone, tax_categories: [tax_category]) }
     let(:tax_category) { create(:tax_category) }
     let(:variant) { create(:variant, tax_category: tax_category) }
 
@@ -548,7 +548,7 @@ describe Spree::Shipment, type: :model do
   context "changes shipping rate via general update" do
     let!(:ship_address) { create(:address) }
     let!(:tax_zone) { create(:global_zone) } # will include the above address
-    let!(:tax_rate) { create(:tax_rate, amount: 0.10, zone: tax_zone, tax_category: tax_category) }
+    let!(:tax_rate) { create(:tax_rate, amount: 0.10, zone: tax_zone, tax_categories: [tax_category]) }
     let(:tax_category) { create(:tax_category) }
 
     let(:order) do
@@ -797,7 +797,7 @@ describe Spree::Shipment, type: :model do
 
   describe '#selected_shipping_rate_id=' do
     let!(:air_shipping_method) { create(:shipping_method, name: "Air") }
-    let(:new_rate) { shipment.add_shipping_method(air_shipping_method) }
+    let(:new_rate) { shipment.shipping_rates.create!(shipping_method: air_shipping_method) }
 
     context 'when the id exists' do
       it 'sets the new shipping rate as selected' do
@@ -821,4 +821,25 @@ describe Spree::Shipment, type: :model do
       end
     end
   end
+
+  describe "#shipping_method" do
+    let(:shipment) { create(:shipment) }
+
+    subject { shipment.shipping_method }
+
+    context "when no shipping rate is selected" do
+      before do
+        shipment.shipping_rates.update_all(selected: false)
+        shipment.reload
+      end
+
+      it { is_expected.to be_nil }
+    end
+
+    context "when a shipping rate is selected" do
+      it "is expected to be the shipping rate's shipping method" do
+        expect(shipment.shipping_method).to eq(shipment.selected_shipping_rate.shipping_method)
+      end
+    end
+  end
 end

data/spec/models/spree/shipping_rate_spec.rb

@@ -33,7 +33,7 @@ describe Spree::ShippingRate, type: :model do
         included_in_price: true,
         name: "VAT",
         zone: default_zone,
-        tax_category: tax_category
+        tax_categories: [tax_category]
       end
 
       let(:order_address) { address }
@@ -64,7 +64,7 @@ describe Spree::ShippingRate, type: :model do
         included_in_price: true,
         name: "VAT",
         zone: default_zone,
-        tax_category: tax_category
+        tax_categories: [tax_category]
       end
 
       let(:order_address) { foreign_address }
@@ -96,7 +96,7 @@ describe Spree::ShippingRate, type: :model do
         included_in_price: false,
         name: "Sales Tax",
         zone: default_zone,
-        tax_category: tax_category
+        tax_categories: [tax_category]
       end
 
       let(:order_address) { address }
@@ -126,7 +126,7 @@ describe Spree::ShippingRate, type: :model do
         included_in_price: false,
         name: "Sales Tax",
         zone: default_zone,
-        tax_category: tax_category
+        tax_categories: [tax_category]
       end
 
       let!(:other_tax_rate) do
@@ -134,7 +134,7 @@ describe Spree::ShippingRate, type: :model do
         included_in_price: false,
         name: "Other Sales Tax",
         zone: default_zone,
-        tax_category: tax_category,
+        tax_categories: [tax_category],
         amount: 0.05
       end
 

data/spec/models/spree/state_spec.rb

@@ -1,10 +1,37 @@
 require 'spec_helper'
 
 describe Spree::State, type: :model do
-  it "can find a state by name or abbr" do
-    state = create(:state, name: "California", abbr: "CA")
-    expect(Spree::State.find_all_by_name_or_abbr("California")).to include(state)
-    expect(Spree::State.find_all_by_name_or_abbr("CA")).to include(state)
+  describe '.with_name_or_abbr' do
+    subject do
+      Spree::State.with_name_or_abbr(search_term)
+    end
+
+    let!(:state) { create(:state, name: "California", abbr: "CA") }
+
+    context 'by invalid term' do
+      let(:search_term) { 'NonExistent' }
+      it { is_expected.to be_empty }
+    end
+
+    context 'by name' do
+      let(:search_term) { 'California' }
+      it { is_expected.to include(state) }
+    end
+
+    context 'by abbr' do
+      let(:search_term) { 'CA' }
+      it { is_expected.to include(state) }
+    end
+
+    context 'by case-insensitive abbr' do
+      let(:search_term) { 'CaLiFoRnIa' }
+      it { is_expected.to include(state) }
+    end
+
+    context 'by case-insensitive abbr' do
+      let(:search_term) { 'cA' }
+      it { is_expected.to include(state) }
+    end
   end
 
   it "can find all states group by country id" do

data/spec/models/spree/stock/coordinator_spec.rb

@@ -194,6 +194,30 @@ module Spree
             let(:location_2_inventory) { 5 }
             it_behaves_like "a fulfillable package"
           end
+
+          context "with a location configured package" do
+            before do
+              order.order_stock_locations.create(
+                stock_location: stock_location_2,
+                quantity: 3,
+                variant: variant
+              )
+            end
+            let(:location_quantity) { 3 }
+
+            context "and sufficient inventory" do
+              let(:location_1_inventory) { 5 }
+              let(:location_2_inventory) { 5 }
+              it_behaves_like "a fulfillable package"
+            end
+
+            context "and insufficient inventory" do
+              let(:location_1_inventory) { 0 }
+              let(:location_2_inventory) { 3 }
+              before { pending "This is broken. The coordinator packages this incorrectly" }
+              it_behaves_like "an unfulfillable package"
+            end
+          end
         end
       end
 

data/spec/models/spree/stock/estimator_spec.rb

@@ -145,7 +145,7 @@ module Spree
           let!(:tax_rate) { create(:tax_rate, zone: zone) }
 
           before do
-            shipping_method.update!(tax_category: tax_rate.tax_category)
+            shipping_method.update!(tax_category: tax_rate.tax_categories.first)
           end
 
           it "links the shipping rate and the tax rate" do

data/spec/models/spree/store_selector/by_server_name_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Spree::StoreSelector::ByServerName do
+  describe "#store" do
+    subject { described_class.new(request).store }
+
+    context "with a default" do
+      let(:request) { double(headers: {}, env: {}) }
+      let!(:store_1) { create :store, default: true }
+
+      it "returns the default store" do
+        expect(subject).to eq(store_1)
+      end
+
+      context "with a domain match" do
+        let(:request) { double(headers: {}, env: { "SERVER_NAME" => url } ) }
+        let(:url) { "server-name.org" }
+        let!(:store_2) { create :store, default: false, url: url }
+
+        it "returns the store with the matching domain" do
+          expect(subject).to eq(store_2)
+        end
+      end
+    end
+  end
+end

data/spec/models/spree/store_selector/legacy_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Spree::StoreSelector::Legacy do
+  describe "#store" do
+    subject { described_class.new(request).store }
+
+    context "with a default" do
+      let(:request) { double(headers: {}, env: {}) }
+      let!(:store_1) { create :store, default: true }
+
+      it "returns the default store" do
+        expect(subject).to eq(store_1)
+      end
+
+      context "with a domain match" do
+        let(:request) { double(headers: {}, env: { "SERVER_NAME" => url } ) }
+        let(:url) { "server-name.org" }
+        let!(:store_2) { create :store, default: false, url: url }
+
+        it "returns the store with the matching domain" do
+          expect(subject).to eq(store_2)
+        end
+
+        context 'the store has multiple URLs' do
+          let!(:store_2) { create :store, default: false, url: "foo\n#{url}\nbar" }
+
+          it "returns the store with the matching domain" do
+            expect(subject).to eq(store_2)
+          end
+        end
+
+        context "with headers" do
+          let(:request) { double(headers: { "HTTP_SPREE_STORE" => headers_code }, env: {}) }
+          let(:headers_code) { "HEADERS" }
+          let!(:store_3) { create :store, code: headers_code, default: false }
+
+          it "returns the store with the matching code" do
+            expect(subject).to eq(store_3)
+          end
+        end
+      end
+    end
+  end
+end