solidus_core 2.2.2 → 2.3.0.beta1

data/lib/spree/testing_support/factories/payment_method_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :payment_method, aliases: [:credit_card_payment_method], class: Spree::Gateway::Bogus do
+  factory :payment_method, aliases: [:credit_card_payment_method], class: Spree::PaymentMethod::BogusCreditCard do
     name 'Credit Card'
     available_to_admin true
     available_to_users true
@@ -13,7 +13,7 @@ FactoryGirl.define do
 
   # authorize.net was moved to spree_gateway.
   # Leaving this factory in place with bogus in case anyone is using it.
-  factory :simple_credit_card_payment_method, class: Spree::Gateway::BogusSimple do
+  factory :simple_credit_card_payment_method, class: Spree::PaymentMethod::SimpleBogusCreditCard do
     name 'Credit Card'
     available_to_admin true
     available_to_users true
@@ -25,6 +25,6 @@ FactoryGirl.define do
     active        true
     available_to_admin false
     available_to_users false
-    auto_capture  true
+    auto_capture true
   end
 end

data/lib/spree/testing_support/factories/shipment_factory.rb

@@ -14,9 +14,13 @@ FactoryGirl.define do
       shipping_method nil
     end
 
-    after(:create) do |shipment, evalulator|
-      shipping_method = evalulator.shipping_method || create(:shipping_method, cost: evalulator.cost)
-      shipment.add_shipping_method(shipping_method, true)
+    after(:create) do |shipment, evaluator|
+      shipping_method = evaluator.shipping_method || create(:shipping_method, cost: evaluator.cost)
+      shipment.shipping_rates.create!(
+        shipping_method: shipping_method,
+        cost: evaluator.cost,
+        selected: true
+      )
 
       shipment.order.line_items.each do |line_item|
         line_item.quantity.times do

data/lib/spree/testing_support/factories/tax_rate_factory.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
   factory :tax_rate, class: Spree::TaxRate do
     zone
     amount 0.1
-    tax_category
     association(:calculator, factory: :default_tax_calculator)
+    tax_categories { [build(:tax_category)] }
   end
 end

data/lib/spree/testing_support/factories/variant_factory.rb

@@ -14,7 +14,6 @@ FactoryGirl.define do
     track_inventory true
 
     product { |p| p.association(:base_product) }
-    option_values { [create(:option_value)] }
 
     # ensure stock item will be created for this variant
     before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 }
@@ -22,10 +21,13 @@ FactoryGirl.define do
     factory :variant do
       # on_hand 5
       product { |p| p.association(:product) }
+      option_values { [create(:option_value)] }
     end
 
     factory :master_variant do
       is_master 1
+      before(:create){ |variant| variant.product.master = variant }
+      product { build(:base_product) }
     end
 
     factory :on_demand_variant do

data/lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake

@@ -11,8 +11,6 @@ namespace 'spree:migrations:copy_order_bill_address_to_credit_card' do
   # This task should be safe to run multiple times.
 
   task up: :environment do
-    puts "Copying order bill addresses to credit cards"
-
     if Spree::CreditCard.connection.adapter_name =~ /postgres/i
       postgres_copy
     else
@@ -52,8 +50,6 @@ namespace 'spree:migrations:copy_order_bill_address_to_credit_card' do
   def postgres_copy
     batch_size = 10_000
 
-    puts "last id: #{last_credit_card_id}"
-
     current_start_id = 1
 
     while current_start_id <= last_credit_card_id

data/lib/tasks/migrations/migrate_user_addresses.rake

@@ -9,8 +9,8 @@ namespace 'spree:migrations:migrate_user_addresses' do
 
   task up: :environment do
     Spree.user_class.find_each(batch_size: 500) do |user|
-      ship_address = Spree::Address.find_by_id(user.ship_address_id)
-      bill_address = Spree::Address.find_by_id(user.bill_address_id)
+      ship_address = Spree::Address.find_by(id: user.ship_address_id)
+      bill_address = Spree::Address.find_by(id: user.bill_address_id)
 
       current_addresses = [bill_address, ship_address].compact.uniq
 

data/lib/tasks/migrations/rename_gateways.rake

@@ -0,0 +1,19 @@
+require 'solidus/migrations/rename_gateways'
+
+namespace 'solidus:migrations:rename_gateways' do
+  task up: :environment do
+    count = Solidus::Migrations::RenameGateways.new.up
+
+    unless ENV['VERBOSE'] == 'false' || !verbose
+      puts "Renamed #{count} gateways into payment methods."
+    end
+  end
+
+  task down: :environment do
+    count = Solidus::Migrations::RenameGateways.new.down
+
+    unless ENV['VERBOSE'] == 'false' || !verbose
+      puts "Renamed #{count} payment methods into gateways."
+    end
+  end
+end

data/solidus_core.gemspec

@@ -31,9 +31,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'kaminari', '>= 0.17', '< 2.0'
   s.add_dependency 'monetize', '~> 1.1'
   s.add_dependency 'paperclip', ['>= 4.2', '< 6']
-  s.add_dependency 'paranoia', '~> 2.2.0.pre'
-  s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '~> 5.0.0'
+  s.add_dependency 'paranoia', '~> 2.3'
+  s.add_dependency 'rails', '~> 5.1.0'
   s.add_dependency 'ransack', '~> 1.8'
   s.add_dependency 'responders'
   s.add_dependency 'state_machines-activerecord', '~> 0.4'

data/spec/lib/spree/core/controller_helpers/order_spec.rb

@@ -19,11 +19,26 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
 
   describe '#simple_current_order' do
     it "returns an empty order" do
-      expect(controller.simple_current_order.item_count).to eq 0
+      Spree::Deprecation.silence do
+        expect(controller.simple_current_order.item_count).to eq 0
+      end
     end
     it 'returns Spree::Order instance' do
-      allow(controller).to receive_messages(cookies: double(signed: { guest_token: order.guest_token }))
-      expect(controller.simple_current_order).to eq order
+      Spree::Deprecation.silence do
+        allow(controller).to receive_messages(cookies: double(signed: { guest_token: order.guest_token }))
+        expect(controller.simple_current_order).to eq order
+      end
+    end
+    it 'assigns the current_store id' do
+      Spree::Deprecation.silence do
+        expect(controller.simple_current_order.store_id).to eq store.id
+      end
+    end
+    it 'is deprecated' do
+      Spree::Deprecation.silence do
+        expect(Spree::Deprecation).to(receive(:warn))
+        controller.simple_current_order
+      end
     end
   end
 
@@ -34,17 +49,28 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
         expect(controller.current_order).to eq order
       end
     end
+
     context 'create_order_if_necessary option is true' do
+      subject { controller.current_order(create_order_if_necessary: true) }
+
       it 'creates new order' do
         expect {
-          controller.current_order(create_order_if_necessary: true)
-        }.to change(Spree::Order, :count).to(1)
+          subject
+        }.to change(Spree::Order, :count).from(0).to(1)
       end
 
       it 'assigns the current_store id' do
-        controller.current_order(create_order_if_necessary: true)
+        subject
         expect(Spree::Order.last.store_id).to eq store.id
       end
+
+      it 'records last_ip_address' do
+        expect {
+          subject
+        }.to change {
+          Spree::Order.last.try!(:last_ip_address)
+        }.from(nil).to("0.0.0.0")
+      end
     end
   end
 

data/spec/lib/spree/core/controller_helpers/payment_parameters_spec.rb

@@ -11,7 +11,6 @@ describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
     it "is unpermitted ActionController::Parameters" do
       expect(subject).to be_a(ActionController::Parameters)
       expect(subject).not_to be_permitted
-      expect(subject.to_h).to eq({})
     end
   end
 

data/spec/lib/spree/core/current_store_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Spree::Core::CurrentStore do
   describe "#store" do
-    subject { Spree::Core::CurrentStore.new(request).store }
+    subject { Spree::Deprecation.silence { Spree::Core::CurrentStore.new(request).store } }
 
     context "with a default" do
       let(:request) { double(headers: {}, env: {}) }
@@ -20,17 +20,12 @@ describe Spree::Core::CurrentStore do
         it "returns the store with the matching domain" do
           expect(subject).to eq(store_2)
         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
+
+    it 'is deprecated' do
+      expect(Spree::Deprecation).to(receive(:warn))
+      Spree::Core::CurrentStore.new(double)
+    end
   end
 end

data/spec/lib/spree/core/price_migrator_spec.rb

@@ -55,7 +55,7 @@ describe Spree::PriceMigrator do
         name: "German reduced VAT",
         included_in_price: true,
         amount: 0.07,
-        tax_category: books_category,
+        tax_categories: [books_category],
         zone: eu_zone
       )
     end
@@ -65,7 +65,7 @@ describe Spree::PriceMigrator do
         name: "German VAT",
         included_in_price: true,
         amount: 0.19,
-        tax_category: normal_category,
+        tax_categories: [normal_category],
         zone: eu_zone
       )
     end
@@ -75,7 +75,7 @@ describe Spree::PriceMigrator do
         name: "German VAT",
         included_in_price: true,
         amount: 0.19,
-        tax_category: digital_category,
+        tax_categories: [digital_category],
         zone: germany_zone
       )
     end
@@ -85,7 +85,7 @@ describe Spree::PriceMigrator do
         name: "Romanian VAT",
         included_in_price: true,
         amount: 0.24,
-        tax_category: digital_category,
+        tax_categories: [digital_category],
         zone: romania_zone
       )
     end

data/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb

@@ -1,6 +1,126 @@
 require 'spec_helper'
 require 'spree/testing_support/factories/order_factory'
 
+shared_examples "shipping methods are assigned" do
+  context "given a shipping method" do
+    let(:shipping_method) { create(:shipping_method) }
+
+    it "assigns the shipping method when created" do
+      expect(
+        create(
+          factory,
+          shipping_method: shipping_method
+        ).shipments.map(&:shipping_method)
+      ).to all(eq(shipping_method))
+    end
+
+    it "assigns the shipping method when built" do
+      expect(
+        build(
+          factory,
+          shipping_method: shipping_method
+        ).shipments.map(&:shipping_method)
+      ).to all(eq(shipping_method))
+    end
+  end
+end
+
+RSpec.shared_examples "an order with line items factory" do |expected_order_state, expected_inventory_unit_state|
+  # This factory cannot be built correctly because Shipment#set_up_inventory
+  # requires records to be saved.
+  context "when created" do
+    let(:stock_location) { create(:stock_location) }
+    let(:first_variant) { create(:variant) }
+    let(:second_variant) { create(:variant) }
+    let(:shipping_method) { create(:shipping_method) }
+    let(:order) do
+      create(
+        factory,
+        stock_location: stock_location,
+        line_items_attributes: [
+          { variant: first_variant, quantity: 1, price: 1 },
+          { variant: second_variant, quantity: 2, price: 2 }
+        ],
+        shipment_cost: 3,
+        shipping_method: shipping_method
+      )
+    end
+
+    it "has the expected attributes" do
+      aggregate_failures "for line items" do
+        expect(order.line_items.count).to eq 2
+        expect(order.line_items[0]).to have_attributes(
+          quantity: 1,
+          price: 1.0
+        )
+        expect(order.line_items[1]).to have_attributes(
+          price: 2.0,
+          quantity: 2
+        )
+      end
+
+      aggregate_failures "for shipments" do
+        expect(order.shipments.count).to eq 1
+        expect(order.shipments[0]).to have_attributes(
+          amount: 3.0,
+          stock_location: stock_location
+        )
+
+        expect(order.shipments[0].shipping_method).to eq(shipping_method)
+
+        # Explicitly order by line item id, because otherwise these can be in
+        # an arbitrary order.
+        inventory_units = order.shipments[0].inventory_units.sort_by(&:line_item_id)
+
+        expect(inventory_units.count).to eq(3)
+        expect(inventory_units[0]).to have_attributes(
+          order: order,
+          shipment: order.shipments[0],
+          line_item: order.line_items[0],
+          variant: order.line_items[0].variant,
+          state: expected_inventory_unit_state
+        )
+        expect(inventory_units[1]).to have_attributes(
+          order: order,
+          shipment: order.shipments[0],
+          line_item: order.line_items[1],
+          variant: order.line_items[1].variant,
+          state: expected_inventory_unit_state
+        )
+        expect(inventory_units[2]).to have_attributes(
+          order: order,
+          shipment: order.shipments[0],
+          line_item: order.line_items[1],
+          variant: order.line_items[1].variant,
+          state: expected_inventory_unit_state
+        )
+      end
+
+      expect(order).to have_attributes(
+        item_total: 5.0,
+        ship_total: 3.0,
+        total: 8.0,
+        state: expected_order_state
+      )
+    end
+  end
+
+  context 'when shipments should be taxed' 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_categories: [tax_category]) }
+
+    let(:tax_category) { create(:tax_category) }
+    let(:shipping_method) { create(:shipping_method, tax_category: tax_category, zones: [tax_zone]) }
+
+    it 'shipments get a tax adjustment' do
+      order = create(factory, ship_address: ship_address, shipping_method: shipping_method)
+      shipment = order.shipments[0]
+
+      expect(shipment.additional_tax_total).to be > 0
+    end
+  end
+end
 RSpec.describe 'order factory' do
   let(:factory_class) { Spree::Order }
 
@@ -9,19 +129,30 @@ RSpec.describe 'order factory' do
 
     it_behaves_like 'a working factory'
 
-    it "has the expected attributes" do
-      order = create(factory)
-      aggregate_failures do
-        expect(order.bill_address).to be_present
-        expect(order.ship_address).to be_present
-        expect(order.user).to be_present
-        expect(order.email).to be_present
-        expect(order.email).to eq(order.user.email)
-        expect(order.state).to eq "cart"
-        expect(order.store).to be_present
-        expect(order).not_to be_completed
+    shared_examples "it has the expected attributes" do
+      it do
+        aggregate_failures do
+          expect(order.bill_address).to be_present
+          expect(order.ship_address).to be_present
+          expect(order.user).to be_present
+          expect(order.email).to be_present
+          expect(order.email).to eq(order.user.email)
+          expect(order.state).to eq "cart"
+          expect(order.store).to be_present
+          expect(order).not_to be_completed
+        end
       end
     end
+
+    context "when built" do
+      let(:order) { build(factory) }
+      it_behaves_like "it has the expected attributes"
+    end
+
+    context "when created" do
+      let(:order) { create(factory) }
+      it_behaves_like "it has the expected attributes"
+    end
   end
 
   describe 'order with totals' do
@@ -29,66 +160,70 @@ RSpec.describe 'order factory' do
 
     it_behaves_like 'a working factory'
 
-    it "has the expected attributes" do
-      order = create(factory)
-      aggregate_failures do
-        # This factory is terrbily named
-        expect(order.total).to eq 0
-        expect(order.line_items.count).to eq 1
+    shared_examples "it has the expected attributes" do
+      it do
+        aggregate_failures do
+          expect(order.total).to eq 0
+          expect(order.line_items.length).to eq 1
+          expect(order.line_items.first.price).to eq 77
+        end
       end
     end
+
+    context "when built" do
+      let(:order) { build(factory, line_items_price: 77) }
+      it_behaves_like "it has the expected attributes"
+    end
+
+    context "when created" do
+      let(:order) { create(factory, line_items_price: 77) }
+      it_behaves_like "it has the expected attributes"
+    end
   end
 
   describe 'order with line items' do
     let(:factory) { :order_with_line_items }
 
     it_behaves_like 'a working factory'
+    it_behaves_like 'an order with line items factory', "cart", "on_hand"
+    it_behaves_like 'shipping methods are assigned'
+  end
+
+  describe 'completed order with promotion' do
+    let(:factory) { :completed_order_with_promotion }
+
+    it_behaves_like 'a working factory'
+    it_behaves_like 'an order with line items factory', "complete", "on_hand"
+    it_behaves_like 'shipping methods are assigned'
 
     it "has the expected attributes" do
       order = create(factory)
       aggregate_failures do
-        expect(order.line_items.count).to eq 1
-        expect(order.line_items[0]).to have_attributes(
-          quantity: 1,
-          price: 10
-        )
-
-        expect(order.shipments.count).to eq 1
-        expect(order.shipments[0]).to have_attributes(
-          amount: 100
-        )
-
-        expect(order.shipments[0].inventory_units.count).to eq(1)
-        expect(order.shipments[0].inventory_units[0]).to have_attributes(
-          order: order,
-          shipment: order.shipments[0],
-          line_item: order.line_items[0],
-          variant: order.line_items[0].variant,
-          state: 'on_hand'
-        )
+        expect(order).to be_completed
+        expect(order).to be_complete
 
-        expect(order).to have_attributes(
-          item_total: 10,
-          ship_total: 100,
-          total: 110,
-          state: 'cart' # this isn't realistic
-        )
+        expect(order.order_promotions.count).to eq(1)
+        order_promotion = order.order_promotions[0]
+        expect(order_promotion.promotion_code.promotion).to eq order_promotion.promotion
       end
     end
 
-    context 'when shipments should be taxed' 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_category) { create(:tax_category) }
-      let(:shipping_method) { create(:shipping_method, tax_category: tax_category, zones: [tax_zone]) }
-
-      it 'shipments get a tax adjustment' do
-        order = create(factory, ship_address: ship_address, shipping_method: shipping_method)
-        shipment = order.shipments[0]
+    context 'with a promotion with an action' do
+      let(:promotion) { create(:promotion, :with_line_item_adjustment) }
+      it "has the expected attributes" do
+        order = create(factory, promotion: promotion)
+        aggregate_failures do
+          expect(order).to be_completed
+          expect(order).to be_complete
 
-        expect(shipment.additional_tax_total).to be > 0
+          expect(order.line_items[0].adjustments.count).to eq 1
+          adjustment = order.line_items[0].adjustments[0]
+          expect(adjustment).to have_attributes(
+            amount: -10,
+            eligible: true,
+            order_id: order.id
+          )
+        end
       end
     end
   end
@@ -97,6 +232,8 @@ RSpec.describe 'order factory' do
     let(:factory) { :order_ready_to_complete }
 
     it_behaves_like 'a working factory'
+    it_behaves_like 'an order with line items factory', "confirm", "on_hand"
+    it_behaves_like 'shipping methods are assigned'
 
     it "is completable" do
       order = create(factory)
@@ -111,6 +248,8 @@ RSpec.describe 'order factory' do
     let(:factory) { :completed_order_with_totals }
 
     it_behaves_like 'a working factory'
+    it_behaves_like 'an order with line items factory', "complete", "on_hand"
+    it_behaves_like 'shipping methods are assigned'
 
     it "has the expected attributes" do
       order = create(factory)
@@ -132,6 +271,8 @@ RSpec.describe 'order factory' do
     let(:factory) { :completed_order_with_pending_payment }
 
     it_behaves_like 'a working factory'
+    it_behaves_like 'an order with line items factory', "complete", "on_hand"
+    it_behaves_like 'shipping methods are assigned'
 
     it "has the expected attributes" do
       order = create(factory)
@@ -156,6 +297,8 @@ RSpec.describe 'order factory' do
     let(:factory) { :order_ready_to_ship }
 
     it_behaves_like 'a working factory'
+    it_behaves_like 'an order with line items factory', "complete", "on_hand"
+    it_behaves_like 'shipping methods are assigned'
 
     it "has the expected attributes" do
       order = create(factory)
@@ -195,6 +338,8 @@ RSpec.describe 'order factory' do
     let(:factory) { :shipped_order }
 
     it_behaves_like 'a working factory'
+    it_behaves_like 'an order with line items factory', "complete", "shipped"
+    it_behaves_like 'shipping methods are assigned'
 
     it "has the expected attributes" do
       order = create(factory)
@@ -222,41 +367,4 @@ RSpec.describe 'order factory' do
       end
     end
   end
-
-  describe 'completed order with promotion' do
-    let(:factory) { :completed_order_with_promotion }
-
-    it_behaves_like 'a working factory'
-
-    it "has the expected attributes" do
-      order = create(factory)
-      aggregate_failures do
-        expect(order).to be_completed
-        expect(order).to be_complete
-
-        expect(order.order_promotions.count).to eq(1)
-        order_promotion = order.order_promotions[0]
-        expect(order_promotion.promotion_code.promotion).to eq order_promotion.promotion
-      end
-    end
-
-    context 'with a promotion with an action' do
-      let(:promotion) { create(:promotion, :with_line_item_adjustment) }
-      it "has the expected attributes" do
-        order = create(factory, promotion: promotion)
-        aggregate_failures do
-          expect(order).to be_completed
-          expect(order).to be_complete
-
-          expect(order.line_items[0].adjustments.count).to eq 1
-          adjustment = order.line_items[0].adjustments[0]
-          expect(adjustment).to have_attributes(
-            amount: -10,
-            eligible: true,
-            order_id: order.id
-          )
-        end
-      end
-    end
-  end
 end

data/spec/lib/spree/core/testing_support/factories/variant_factory_spec.rb

@@ -20,6 +20,24 @@ RSpec.describe 'variant factory' do
     let(:factory) { :master_variant }
 
     it_behaves_like 'a working factory'
+
+    it "builds a master variant properly" do
+      variant = create(factory)
+      expect(variant).to be_is_master
+      expect(variant.option_values).to be_empty
+
+      product = variant.product
+      expect(product.master).to be(variant)
+      expect(product.variants).to be_empty
+      expect(product.variants_including_master).to eq [variant]
+      expect(product.option_types).to be_empty
+    end
+
+    it "creates only one variant" do
+      expect {
+        create(factory)
+      }.to change { Spree::Variant.count }.from(0).to(1)
+    end
   end
 
   describe 'on demand variant' do

data/spec/lib/spree/localized_number_spec.rb

@@ -13,6 +13,12 @@ describe Spree::LocalizedNumber do
       I18n.enforce_available_locales = true
     end
 
+    context "with an empty string" do
+      it "parses to 0" do
+        expect(subject.class.parse("")).to eq 0.0
+      end
+    end
+
     context "with decimal point" do
       it "captures the proper amount for a formatted price" do
         expect(subject.class.parse('1,599.99')).to eql 1599.99