solidus_core_devise_token_auth 2.8.0.alpha.1 → 2.8.0.alpha.3

data/lib/spree/core/version.rb

@@ -2,7 +2,7 @@
 
 module Spree
   def self.solidus_version
-    "2.8.0.alpha.1"
+    "2.8.0.alpha.3"
   end
 
   def self.solidus_gem_version

data/lib/spree/i18n.rb

@@ -26,6 +26,10 @@ module Spree
     # extra functionality. e.g return reasonable strings for missing translations
 
     def translate(key, options = {})
+      Spree::Deprecation.warn <<-WARN.squish
+        Spree.t & Spree.translate have been deprecated.
+        Instead use I18n.t('spree.your_translation_key')
+      WARN
       options[:scope] = [:spree, *options[:scope]]
       TranslationHelperWrapper.new.translate(key, options)
     end

data/lib/spree/money.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'money'
-require 'monetize'
-require 'active_support/core_ext/string/output_safety'
-
 module Spree
   # Spree::Money is a relatively thin wrapper around Monetize which handles
   # formatting via Spree::Config.
@@ -77,16 +73,22 @@ module Spree
       @money.format(@options.merge(options))
     end
 
-    # @note If you pass in options, ensure you pass in the html: true as well.
+    # @note If you pass in options, ensure you pass in the { html_wrap: true } as well.
     # @param options [Hash] additional formatting options
     # @return [String] the value of this money object formatted according to
-    #   its options and any additional options, by default as html.
-    def to_html(options = { html: true })
+    #   its options and any additional options, by default with html_wrap.
+    def to_html(options = { html_wrap: true })
       output = format(options)
-      if options[:html]
-        # 1) prevent blank, breaking spaces
-        # 2) prevent escaping of HTML character entities
-        output = output.sub(" ", " ").html_safe
+      # Maintain compatibility by checking html option renamed to html_wrap.
+      if options[:html] || options[:html] == false
+        Spree::Deprecation.warn <<-WARN.squish, caller
+          Spree::Money#to_html called with Spree::Money#to_html(html: #{options[:html]}),
+          which will not be supported in the future.
+          Instead use :html_wrap e.g. Spree::Money#to_html(html_wrap: #{options[:html]})
+        WARN
+      end
+      if options[:html_wrap] || options[:html]
+        output = output.html_safe
       end
       output
     end

data/lib/spree/testing_support/authorization_helpers.rb

@@ -29,7 +29,15 @@ module Spree
       module Request
         include CustomAbility
 
-        def stub_authorization!
+        def stub_api_authentication!
+          before do
+            allow_any_instance_of(Spree::Api::BaseController)
+              .to receive("current_api_#{Spree.user_class.to_s.underscore.gsub('/', '_')}")
+              .and_return(create(:user))
+          end
+        end
+
+        def stub_ability_authorization!
           ability = build_ability
 
           after(:all) do
@@ -39,13 +47,11 @@ module Spree
           before(:all) do
             Spree::Ability.register_ability(ability)
           end
+        end
 
-          before do
-            allow(Spree.user_class).to receive(:find_by).
-                                         and_return(create(:user))
-            allow_any_instance_of(Spree.user_class).to receive(:valid_token?).
-                                         and_return(true)
-          end
+        def stub_authorization!
+          stub_ability_authorization!
+          stub_api_authentication!
         end
 
         def custom_authorization!(&block)

data/lib/spree_core.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 require 'spree/core'
+require 'devise_token_auth'

data/spec/helpers/products_helper_spec.rb

@@ -31,7 +31,7 @@ module Spree
         context "when variant is more than master" do
           let(:variant_price) { 15 }
 
-          it { is_expected.to eq("(Add: $5.00)") }
+          it { is_expected.to eq("(Add: <span class=\"money-currency-symbol\">$</span><span class=\"money-whole\">5</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span>)") }
           # Regression test for https://github.com/spree/spree/issues/2737
           it { is_expected.to be_html_safe }
         end
@@ -39,7 +39,7 @@ module Spree
         context "when variant is less than master" do
           let(:product_price) { 15 }
 
-          it { is_expected.to eq("(Subtract: $5.00)") }
+          it { is_expected.to eq("(Subtract: <span class=\"money-currency-symbol\">$</span><span class=\"money-whole\">5</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span>)") }
         end
       end
 
@@ -56,13 +56,13 @@ module Spree
         context "when variant is more than master" do
           let(:variant_price) { 150 }
 
-          it { is_expected.to eq("(Add: &#x00A5;50)") }
+          it { is_expected.to eq("(Add: <span class=\"money-currency-symbol\">&#x00A5;</span><span class=\"money-whole\">50</span>)") }
         end
 
         context "when variant is less than master" do
           let(:product_price) { 150 }
 
-          it { is_expected.to eq("(Subtract: &#x00A5;50)") }
+          it { is_expected.to eq("(Subtract: <span class=\"money-currency-symbol\">&#x00A5;</span><span class=\"money-whole\">50</span>)") }
         end
       end
     end
@@ -79,8 +79,8 @@ module Spree
 
       context "when currency is default" do
         it "should return the variant price if the price is different than master" do
-          expect(helper.variant_price(variant)).to eq("$15.00")
-          expect(helper.variant_price(variant_2)).to eq("$20.00")
+          expect(helper.variant_price(variant)).to eq("<span class=\"money-currency-symbol\">$</span><span class=\"money-whole\">15</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span>")
+          expect(helper.variant_price(variant_2)).to eq("<span class=\"money-currency-symbol\">$</span><span class=\"money-whole\">20</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span>")
         end
       end
 
@@ -95,7 +95,7 @@ module Spree
         end
 
         it "should return the variant price if the price is different than master" do
-          expect(helper.variant_price(variant)).to eq("&#x00A5;150")
+          expect(helper.variant_price(variant)).to eq("<span class=\"money-currency-symbol\">&#x00A5;</span><span class=\"money-whole\">150</span>")
         end
       end
 

data/spec/lib/i18n_spec.rb

@@ -30,23 +30,28 @@ RSpec.describe "i18n" do
   end
 
   it "translates within the spree scope" do
+    expect(Spree::Deprecation).to receive(:warn).twice
     expect(Spree.t(:foo)).to eql("bar")
     expect(Spree.translate(:foo)).to eql("bar")
   end
 
   it "prepends a string scope" do
+    expect(Spree::Deprecation).to receive(:warn)
     expect(Spree.t(:foo, scope: "bar")).to eql("bar within bar scope")
   end
 
   it "prepends to an array scope" do
+    expect(Spree::Deprecation).to receive(:warn)
     expect(Spree.t(:foo, scope: ["bar"])).to eql("bar within bar scope")
   end
 
   it "returns two translations" do
+    expect(Spree::Deprecation).to receive(:warn)
     expect(Spree.t([:foo, 'bar.foo'])).to eql(["bar", "bar within bar scope"])
   end
 
   it "returns reasonable string for missing translations" do
+    expect(Spree::Deprecation).to receive(:warn)
     expect(Spree.t(:missing_entry)).to include("<span")
   end
 

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

@@ -78,7 +78,8 @@ RSpec.describe Spree::Core::ControllerHelpers::Order, type: :controller do
 
   describe '#associate_user' do
     before { allow(controller).to receive_messages(current_order: order) }
-    context "user's email is blank" do
+    # we can't create user without an email when we use devise
+    xcontext "user's email is blank" do
       let(:user) { create(:user, email: '') }
       it 'calls Spree::Order#associate_user! method' do
         expect_any_instance_of(Spree::Order).to receive(:associate_user!)

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

@@ -11,14 +11,32 @@ RSpec.describe 'user factory' do
 
     it_behaves_like 'a working factory'
   end
+
   describe 'admin user' do
-    let(:factory) { :admin_user }
+    it "builds successfully" do
+      expect(build(:user, :admin)).to be_a(factory_class)
+    end
 
-    it_behaves_like 'a working factory'
+    it "creates successfully" do
+      expect(build(:user, :admin)).to be_a(factory_class)
+    end
+
+    it "is creates a valid record" do
+      expect(build(:user, :admin)).to be_valid
+    end
   end
+
   describe 'user with addresses' do
-    let(:factory) { :user_with_addresses }
+    it "builds successfully" do
+      expect(build(:user, :with_addresses)).to be_a(factory_class)
+    end
 
-    it_behaves_like 'a working factory'
+    it "creates successfully" do
+      expect(build(:user, :with_addresses)).to be_a(factory_class)
+    end
+
+    it "is creates a valid record" do
+      expect(build(:user, :with_addresses)).to be_valid
+    end
   end
 end

data/spec/lib/spree/money_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'spree/money'
+require 'rails_helper'
 
 RSpec.describe Spree::Money do
   before do
@@ -97,7 +96,7 @@ RSpec.describe Spree::Money do
 
   context "with currency" do
     it "passed in option" do
-      money = Spree::Money.new(10, with_currency: true, html: false)
+      money = Spree::Money.new(10, with_currency: true, html_wrap: false)
       expect(money.to_s).to eq("$10.00 USD")
     end
   end
@@ -117,14 +116,14 @@ RSpec.describe Spree::Money do
   context "currency parameter" do
     context "when currency is specified in Canadian Dollars" do
       it "uses the currency param over the global configuration" do
-        money = Spree::Money.new(10, currency: 'CAD', with_currency: true, html: false)
+        money = Spree::Money.new(10, currency: 'CAD', with_currency: true, html_wrap: false)
         expect(money.to_s).to eq("$10.00 CAD")
       end
     end
 
     context "when currency is specified in Japanese Yen" do
       it "uses the currency param over the global configuration" do
-        money = Spree::Money.new(100, currency: 'JPY', html: false)
+        money = Spree::Money.new(100, currency: 'JPY', html_wrap: false)
         expect(money.to_s).to eq("¥100")
       end
     end
@@ -132,12 +131,12 @@ RSpec.describe Spree::Money do
 
   context "symbol positioning" do
     it "passed in option" do
-      money = Spree::Money.new(10, symbol_position: :after, html: false)
+      money = Spree::Money.new(10, format: '%n %u', html_wrap: false)
       expect(money.to_s).to eq("10.00 $")
     end
 
     it "config option" do
-      money = Spree::Money.new(10, symbol_position: :after, html: false)
+      money = Spree::Money.new(10, format: '%n %u', html_wrap: false)
       expect(money.to_s).to eq("10.00 $")
     end
   end
@@ -162,7 +161,7 @@ RSpec.describe Spree::Money do
     end
 
     it "formats correctly" do
-      money = Spree::Money.new(1000, html: false)
+      money = Spree::Money.new(1000, html_wrap: false)
       expect(money.to_s).to eq("¥1,000")
     end
   end
@@ -176,20 +175,20 @@ RSpec.describe Spree::Money do
 
     # Regression test for https://github.com/spree/spree/issues/2634
     it "formats as plain by default" do
-      money = Spree::Money.new(10, symbol_position: :after)
+      money = Spree::Money.new(10, format: '%n %u')
       expect(money.to_s).to eq("10.00 €")
     end
 
     it "formats as HTML if asked (nicely) to" do
-      money = Spree::Money.new(10, symbol_position: :after)
+      money = Spree::Money.new(10, format: '%n %u')
       # The HTML'ified version of "10.00 €"
-      expect(money.to_html).to eq("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>")
     end
 
     it "formats as HTML with currency" do
-      money = Spree::Money.new(10, symbol_position: :after, with_currency: true)
+      money = Spree::Money.new(10, format: '%n %u', with_currency: true)
       # The HTML'ified version of "10.00 €"
-      expect(money.to_html).to eq("10.00&nbsp;&#x20AC; <span class=\"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\">&#x20AC;</span> <span class=\"money-currency\">EUR</span>")
     end
   end
 

data/spec/models/spree/ability_spec.rb

@@ -24,9 +24,9 @@ class FooAbility
 end
 
 RSpec.describe Spree::Ability, type: :model do
-  let(:user) { build(:user) }
+  let(:user)    { create(:user) }
   let(:ability) { Spree::Ability.new(user) }
-  let(:token) { nil }
+  let(:token)   { nil }
 
   after(:each) {
     Spree::Ability.abilities = Set.new
@@ -59,7 +59,7 @@ RSpec.describe Spree::Ability, type: :model do
     let(:resource) { Object.new }
 
     context 'with admin user' do
-      let(:user) { build :admin_user }
+      let(:user) { create(:user, :admin) }
       it_should_behave_like 'access granted'
       it_should_behave_like 'index allowed'
     end

data/spec/models/spree/order_spec.rb

@@ -90,8 +90,8 @@ RSpec.describe Spree::Order, type: :model do
   end
 
   context "#canceled_by" do
-    let(:admin_user) { create :admin_user }
-    let(:order) { create :order }
+    let(:admin_user) { create :user, :admin }
+    let(:order)      { create :order }
 
     before do
       allow(order).to receive(:cancel!)

data/spec/models/spree/promotion/rules/user_spec.rb

@@ -31,8 +31,8 @@ RSpec.describe Spree::Promotion::Rules::User, type: :model do
 
     # Regression test for https://github.com/spree/spree/issues/3885
     it "can assign to user_ids" do
-      user1 = Spree::LegacyUser.create!(email: "test1@example.com")
-      user2 = Spree::LegacyUser.create!(email: "test2@example.com")
+      user1 = Spree::LegacyUser.create!(email: "test1@example.com", password: 'lubieplacki')
+      user2 = Spree::LegacyUser.create!(email: "test2@example.com", password: 'lubieplacki')
       rule.user_ids = "#{user1.id}, #{user2.id}"
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core_devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 2.8.0.alpha.1
+  version: 2.8.0.alpha.3
 platform: ruby
 authors:
 - Michał Siwek (skycocker)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -662,6 +662,7 @@ files:
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
+- config/initializers/money.rb
 - config/locales/en.yml
 - db/default/spree/countries.rb
 - db/default/spree/refund_reasons.rb