solidus_core 1.2.3 → 1.3.0.beta1

data/spec/helpers/products_helper_spec.rb

@@ -3,40 +3,30 @@
 require 'spec_helper'
 
 module Spree
-  describe ProductsHelper, :type => :helper do
+  describe ProductsHelper, type: :helper do
     include ProductsHelper
 
-    let(:product) { create(:product) }
+    let(:product) { create(:product, price: product_price) }
+    let(:product_price) { 10 }
+    let(:variant) { create(:variant, product: product, price: variant_price) }
     let(:currency) { 'USD' }
+    let(:pricing_options) do
+      Spree::Config.pricing_options_class.new(currency: currency)
+    end
 
     before do
-      allow(helper).to receive(:current_currency) { currency }
+      allow(helper).to receive(:current_pricing_options) { pricing_options }
     end
 
     context "#variant_price_diff" do
-      let(:product_price) { 10 }
       let(:variant_price) { 10 }
 
-      before do
-        @variant = create(:variant, :product => product)
-        product.price = 15
-        @variant.price = 10
-        allow(product).to receive(:amount_in) { product_price }
-        allow(@variant).to receive(:amount_in) { variant_price }
-      end
-
-      subject { helper.variant_price(@variant) }
+      subject { helper.variant_price(variant) }
 
       context "when variant is same as master" do
         it { is_expected.to be_nil }
       end
 
-      context "when the master has no price" do
-        let(:product_price) { nil }
-
-        it { is_expected.to be_nil }
-      end
-
       context "when currency is default" do
         context "when variant is more than master" do
           let(:variant_price) { 15 }
@@ -58,6 +48,11 @@ module Spree
         let(:product_price) { 100 }
         let(:currency) { 'JPY' }
 
+        before do
+          variant
+          product.prices.update_all(currency: currency)
+        end
+
         context "when variant is more than master" do
           let(:variant_price) { 150 }
 
@@ -73,55 +68,53 @@ module Spree
     end
 
     context "#variant_price_full" do
+      let!(:variant_2) { create(:variant, product: product, price: variant_2_price) }
+      let(:variant_2_price) { 20 }
+      let(:variant_price) { 15 }
+
       before do
         Spree::Config[:show_variant_full_price] = true
-        @variant1 = create(:variant, :product => product)
-        @variant2 = create(:variant, :product => product)
+        variant
       end
 
       context "when currency is default" do
         it "should return the variant price if the price is different than master" do
-          product.price = 10
-          @variant1.price = 15
-          @variant2.price = 20
-          expect(helper.variant_price(@variant1)).to eq("$15.00")
-          expect(helper.variant_price(@variant2)).to eq("$20.00")
+          expect(helper.variant_price(variant)).to eq("$15.00")
+          expect(helper.variant_price(variant_2)).to eq("$20.00")
         end
       end
 
       context "when currency is JPY" do
         let(:currency) { 'JPY' }
+        let(:product_price) { 100 }
+        let(:variant_price) { 150 }
 
         before do
-          product.variants.active.each do |variant|
-            variant.prices.each do |price|
-              price.currency = currency
-              price.save!
-            end
-          end
+          variant
+          product.prices.update_all(currency: currency)
         end
 
         it "should return the variant price if the price is different than master" do
-          product.price = 100
-          @variant1.price = 150
-          expect(helper.variant_price(@variant1)).to eq("¥150")
+          expect(helper.variant_price(variant)).to eq("¥150")
         end
       end
 
-      it "should be nil when all variant prices are equal" do
-        product.price = 10
-        @variant1.default_price.update_column(:amount, 10)
-        @variant2.default_price.update_column(:amount, 10)
-        expect(helper.variant_price(@variant1)).to be_nil
-        expect(helper.variant_price(@variant2)).to be_nil
+      context "when all variant prices are equal" do
+        let(:product_price) { 10 }
+        let(:variant_price) { 10 }
+        let(:variant_2_price) { 10 }
+
+        it "should be nil" do
+          expect(helper.variant_price(variant)).to be_nil
+          expect(helper.variant_price(variant_2)).to be_nil
+        end
       end
     end
 
-
     context "#product_description" do
       # Regression test for https://github.com/spree/spree/issues/1607
       it "renders a product description without excessive paragraph breaks" do
-        product.description = %Q{
+        product.description = %{
 <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus a ligula leo. Proin eu arcu at ipsum dapibus ullamcorper. Pellentesque egestas orci nec magna condimentum luctus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Ut ac ante et mauris bibendum ultricies non sed massa. Fusce facilisis dui eget lacus scelerisque eget aliquam urna ultricies. Duis et rhoncus quam. Praesent tellus nisi, ultrices sed iaculis quis, euismod interdum ipsum.</p>
 <ul>
 <li>Lorem ipsum dolor sit amet</li>
@@ -133,17 +126,17 @@ module Spree
       end
 
       it "renders a product description with automatic paragraph breaks" do
-        product.description = %Q{
+        product.description = %{
 THIS IS THE BEST PRODUCT EVER!
 
 "IT CHANGED MY LIFE" - Sue, MD}
 
         description = product_description(product)
-        expect(description.strip).to eq(%Q{<p>\nTHIS IS THE BEST PRODUCT EVER!</p>"IT CHANGED MY LIFE" - Sue, MD})
+        expect(description.strip).to eq(%{<p>\nTHIS IS THE BEST PRODUCT EVER!</p>"IT CHANGED MY LIFE" - Sue, MD})
       end
 
       it "renders a product description without any formatting based on configuration" do
-        initialDescription = %Q{
+        description = %{
             <p>hello world</p>
 
             <p>tihs is completely awesome and it works</p>
@@ -151,13 +144,12 @@ THIS IS THE BEST PRODUCT EVER!
             <p>why so many spaces in the code. and why some more formatting afterwards?</p>
         }
 
-        product.description = initialDescription
+        product.description = description
 
         Spree::Config[:show_raw_product_description] = true
         description = product_description(product)
-        expect(description).to eq(initialDescription)
+        expect(description).to eq(description)
       end
-
     end
 
     context '#line_item_description_text' do
@@ -180,7 +172,7 @@ THIS IS THE BEST PRODUCT EVER!
       subject { helper.cache_key_for_products }
       before(:each) do
         @products = double('products collection')
-        allow(helper).to receive(:params) { {:page => 10} }
+        allow(helper).to receive(:params) { { page: 10 } }
       end
 
       context 'when there is a maximum updated date' do
@@ -196,7 +188,7 @@ THIS IS THE BEST PRODUCT EVER!
       context 'when there is no considered maximum updated date' do
         let(:today) { Date.new(2013, 12, 11) }
         before :each do
-          allow(@products).to receive(:count) { 1234567 }
+          allow(@products).to receive(:count) { 1_234_567 }
           allow(@products).to receive(:maximum).with(:updated_at) { nil }
           allow(Date).to receive(:today) { today }
         end

data/spec/helpers/taxons_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::TaxonsHelper, :type => :helper do
+describe Spree::TaxonsHelper, type: :helper do
   # Regression test for https://github.com/spree/spree/issues/4382
   it "#taxon_preview" do
     taxon = create(:taxon)

data/spec/lib/i18n_spec.rb

@@ -6,15 +6,15 @@ describe "i18n" do
   before do
     I18n.backend.store_translations(:en,
     {
-      :spree => {
-        :foo => "bar",
-        :bar => {
-          :foo => "bar within bar scope",
-          :invalid => nil,
-          :legacy_translation => "back in the day..."
+      spree: {
+        foo: "bar",
+        bar: {
+          foo: "bar within bar scope",
+          invalid: nil,
+          legacy_translation: "back in the day..."
         },
-        :invalid => nil,
-        :legacy_translation => "back in the day..."
+        invalid: nil,
+        legacy_translation: "back in the day..."
       }
     })
   end
@@ -25,11 +25,11 @@ describe "i18n" do
   end
 
   it "prepends a string scope" do
-    expect(Spree.normal_t(:foo, :scope => "bar")).to eql("bar within bar scope")
+    expect(Spree.normal_t(:foo, scope: "bar")).to eql("bar within bar scope")
   end
 
   it "prepends to an array scope" do
-    expect(Spree.normal_t(:foo, :scope => ["bar"])).to eql("bar within bar scope")
+    expect(Spree.normal_t(:foo, scope: ["bar"])).to eql("bar within bar scope")
   end
 
   it "returns two translations" do
@@ -57,7 +57,7 @@ describe "i18n" do
       end
 
       it "logs missing translations" do
-        Spree.t(:missing, :scope => [:else, :where])
+        Spree.t(:missing, scope: [:else, :where])
         Spree.check_missing_translations
         assert_missing_translation("else")
         assert_missing_translation("else.where")

data/spec/lib/search/base_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Spree::Core::Search::Base do
-
   before do
     include Spree::Core::ProductFilters
     @taxon = create(:taxon, name: "Ruby on Rails")
@@ -12,7 +11,7 @@ describe Spree::Core::Search::Base do
   end
 
   it "returns all products by default" do
-    params = { :per_page => "" }
+    params = { per_page: "" }
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.retrieve_products.count).to eq(2)
   end
@@ -34,28 +33,28 @@ describe Spree::Core::Search::Base do
   end
 
   it "switches to next page according to the page parameter" do
-    @product3 = create(:product, :name => "RoR Pants", :price => 14.00)
+    @product3 = create(:product, name: "RoR Pants", price: 14.00)
 
-    params = { :per_page => "2" }
+    params = { per_page: "2" }
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.retrieve_products.count).to eq(2)
 
-    params.merge! :page => "2"
+    params[:page] = "2"
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.retrieve_products.count).to eq(1)
   end
 
   it "maps search params to named scopes" do
-    params = { :per_page => "",
-               :search => { "price_range_any" => ["Under $10.00"] }}
+    params = { per_page: "",
+               search: { "price_range_any" => ["Under $10.00"] } }
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.send(:get_base_scope).to_sql).to match /<= 10/
     expect(searcher.retrieve_products.count).to eq(1)
   end
 
   it "maps multiple price_range_any filters" do
-    params = { :per_page => "",
-               :search => { "price_range_any" => ["Under $10.00", "$10.00 - $15.00"] }}
+    params = { per_page: "",
+               search: { "price_range_any" => ["Under $10.00", "$10.00 - $15.00"] } }
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.send(:get_base_scope).to_sql).to match /<= 10/
     expect(searcher.send(:get_base_scope).to_sql).to match /between 10 and 15/i
@@ -63,8 +62,8 @@ describe Spree::Core::Search::Base do
   end
 
   it "uses ransack if scope not found" do
-    params = { :per_page => "",
-               :search => { "name_not_cont" => "Shirt" }}
+    params = { per_page: "",
+               search: { "name_not_cont" => "Shirt" } }
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.retrieve_products.count).to eq(1)
   end
@@ -77,10 +76,9 @@ describe Spree::Core::Search::Base do
   end
 
   it "finds products in alternate currencies" do
-    price = create(:price, :currency => 'EUR', :variant => @product1.master)
+    create(:price, currency: 'EUR', variant: @product1.master)
     searcher = Spree::Core::Search::Base.new({})
-    searcher.current_currency = 'EUR'
+    searcher.pricing_options = Spree::Config.pricing_options_class.new(currency: 'EUR')
     expect(searcher.retrieve_products).to eq([@product1])
   end
-
 end

data/spec/lib/search/variant_spec.rb

@@ -93,6 +93,7 @@ module Spree
       # Only search by SKU if the search word is a number
       class NumericSkuSearcher < Core::Search::Variant
         protected
+
         def search_terms(word)
           if word =~ /\A\d+\z/
             super

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

@@ -13,6 +13,7 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
 
   before do
     allow(controller).to receive_messages(current_store: store)
+    allow(controller).to receive_messages(current_pricing_options: Spree::Config.pricing_options_class.new(currency: Spree::Config.currency))
     allow(controller).to receive_messages(try_spree_current_user: user)
   end
 
@@ -77,13 +78,6 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
     end
   end
 
-  describe '#current_currency' do
-    it 'returns current currency' do
-      Spree::Config[:currency] = 'USD'
-      expect(controller.current_currency).to eq 'USD'
-    end
-  end
-
   describe '#ip_address' do
     it 'returns remote ip' do
       expect(controller.ip_address).to eq request.remote_ip

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

@@ -5,8 +5,7 @@ class FakeController < ApplicationController
 end
 
 describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
-
-  controller(FakeController) { }
+  controller(FakeController) {}
 
   describe '#move_payment_source_into_payments_attributes' do
     subject do
@@ -17,17 +16,17 @@ describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
       ActionController::Parameters.new(
         payment_source: {
           payment_method_1.id.to_s => credit_card_1_params,
-          payment_method_2.id.to_s => credit_card_2_params,
+          payment_method_2.id.to_s => credit_card_2_params
         },
         order: {
           payments_attributes: [
             {
-              payment_method_id: payment_method_1.id.to_s,
-            },
+              payment_method_id: payment_method_1.id.to_s
+            }
           ],
-          other_order_param: 1,
+          other_order_param: 1
         },
-        other_param: 2,
+        other_param: 2
       )
     end
 
@@ -43,12 +42,12 @@ describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
             payments_attributes: [
               {
                 payment_method_id: payment_method_1.id.to_s,
-                source_attributes: credit_card_1_params,
-              },
+                source_attributes: credit_card_1_params
+              }
             ],
-            other_order_param: 1,
+            other_order_param: 1
           },
-          other_param: 2,
+          other_param: 2
         )
       )
     end
@@ -88,10 +87,10 @@ describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
       ActionController::Parameters.new(
         order: {
           existing_card: '123',
-          other_order_param: 1,
+          other_order_param: 1
         },
         cvc_confirm: '456',
-        other_param: 2,
+        other_param: 2
       )
     end
 
@@ -104,12 +103,12 @@ describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
                 source_attributes: {
                   existing_card_id: '123',
                   verification_value: '456'
-                },
-              },
+                }
+              }
             ],
-            other_order_param: 1,
+            other_order_param: 1
           },
-          other_param: 2,
+          other_param: 2
         )
       )
     end
@@ -125,13 +124,13 @@ describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
                 {
                   source_attributes: {
                     existing_card_id: '123',
-                    verification_value: nil,
-                  },
-                },
+                    verification_value: nil
+                  }
+                }
               ],
-              other_order_param: 1,
+              other_order_param: 1
             },
-            other_param: 2,
+            other_param: 2
           )
         )
       end
@@ -146,7 +145,6 @@ describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
       before { params[:order].delete(:existing_card) }
       it('returns the original hash') { expect(subject).to eq(params) }
     end
-
   end
 
   describe '#set_payment_parameters_amount' do
@@ -158,9 +156,9 @@ describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
       ActionController::Parameters.new(
         order: {
           payments_attributes: [{}],
-          other_order_param: 1,
+          other_order_param: 1
         },
-        other_param: 2,
+        other_param: 2
       )
     end
     let(:order) { create(:order_with_line_items, line_items_price: 101.00, line_items_count: 1, shipment_cost: 0) }
@@ -169,10 +167,10 @@ describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do
       expect(subject).to eq(
         ActionController::Parameters.new(
           order: {
-            payments_attributes: [{amount: 101}],
-            other_order_param: 1,
+            payments_attributes: [{ amount: 101 }],
+            other_order_param: 1
           },
-          other_param: 2,
+          other_param: 2
         )
       )
     end

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

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+class FakesController < ApplicationController
+  include Spree::Core::ControllerHelpers::Pricing
+end
+
+describe Spree::Core::ControllerHelpers::Pricing, type: :controller do
+  controller(FakesController) {}
+
+  before do
+    allow(controller).to receive(:current_store).and_return(store)
+  end
+
+  describe '#current_currency' do
+    subject { controller.current_currency }
+
+    context "when store default_currency is nil" do
+      let(:store) { nil }
+      it { Spree::Deprecation.silence { is_expected.to eq('USD') } }
+    end
+
+    context "when the current store default_currency empty" do
+      let(:store) { FactoryGirl.create :store, default_currency: '' }
+
+      it { Spree::Deprecation.silence { is_expected.to eq('USD') } }
+    end
+
+    context "when the current store default_currency is a currency" do
+      let(:store) { FactoryGirl.create :store, default_currency: 'EUR' }
+
+      it { Spree::Deprecation.silence { is_expected.to eq('EUR') } }
+    end
+  end
+
+  describe '#current_pricing_options' do
+    subject { controller.current_pricing_options }
+
+    let(:store) { FactoryGirl.create(:store, default_currency: nil) }
+
+    it { is_expected.to be_a(Spree::Config.pricing_options_class) }
+
+    context "currency" do
+      subject { controller.current_pricing_options.currency }
+
+      context "when store default_currency is nil" do
+        let(:store) { nil }
+        it { is_expected.to eq('USD') }
+      end
+
+      context "when the current store default_currency empty" do
+        let(:store) { FactoryGirl.create :store, default_currency: '' }
+
+        it { is_expected.to eq('USD') }
+      end
+
+      context "when the current store default_currency is a currency" do
+        let(:store) { FactoryGirl.create :store, default_currency: 'EUR' }
+
+        it { is_expected.to eq('EUR') }
+      end
+    end
+  end
+end

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

@@ -9,8 +9,10 @@ describe Spree::Core::ControllerHelpers::Search, type: :controller do
 
   describe '#build_searcher' do
     it 'returns Spree::Core::Search::Base instance' do
-      allow(controller).to receive_messages(try_spree_current_user: create(:user),
-                      current_currency: 'USD')
+      allow(controller).to receive_messages(
+        try_spree_current_user: create(:user),
+        current_pricing_options: Spree::Config.pricing_options_class.new(currency: 'USD')
+      )
       expect(controller.build_searcher({}).class).to eq Spree::Core::Search::Base
     end
   end

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

@@ -20,5 +20,5 @@ module Spree
         subject.name
       end
     end
-  end 
+  end
 end