solidus_core 2.5.2 → 2.6.0.rc1

data/lib/tasks/email.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :email do
   desc 'Sends test email to specified address - Example: EMAIL=spree@example.com bundle exec rake email:test'
   task test: :environment do

data/lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace 'spree:migrations:copy_order_bill_address_to_credit_card' do
   # This copies the billing address from the order associated with a
   # credit card's most recent payment to the credit card.

data/lib/tasks/migrations/migrate_shipping_rate_taxes.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :solidus do
   namespace :migrations do
     namespace :migrate_shipping_rate_taxes do

data/lib/tasks/migrations/migrate_user_addresses.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace 'spree:migrations:migrate_user_addresses' do
   # This creates an entry in the user_addresses table for a user's currently
   # associated shipping and billing addresses.

data/lib/tasks/migrations/rename_gateways.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'solidus/migrations/rename_gateways'
 
 namespace 'solidus:migrations:rename_gateways' do

data/lib/tasks/order_capturing.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :order_capturing do
   desc "Looks for orders with inventory that is fully shipped/short-shipped, and captures money for it"
   task capture_payments: :environment do
@@ -9,7 +11,7 @@ namespace :order_capturing do
         if Spree::OrderCapturing.failure_handler
           begin
             Spree::OrderCapturing.new(order).capture_payments
-          rescue Exception => e
+          rescue StandardError => e
             failures << { message: "Order #{order.number} unable to capture. #{e.class}: #{e.message}" }
           end
         else

data/script/rails

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree/core/engine', __FILE__)
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/core/engine', __dir__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/solidus_core.gemspec

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require_relative '../core/lib/spree/core/version.rb'
 
 Gem::Specification.new do |s|
@@ -23,14 +24,15 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, '~> 5.1.0'
+    s.add_dependency rails_dep, ['>= 5.1', '< 5.3.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
   s.add_dependency 'acts_as_list', '~> 0.3'
   s.add_dependency 'awesome_nested_set', '~> 3.0', '>= 3.0.1'
+  s.add_dependency 'cancancan', '~> 2.2'
   s.add_dependency 'carmen', '~> 1.1.0'
-  s.add_dependency 'cancancan', '~> 1.10'
+  s.add_dependency 'discard', '~> 1.0'
   s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'monetize', '~> 1.1'
@@ -38,5 +40,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'paranoia', '~> 2.4'
   s.add_dependency 'ransack', '~> 1.8'
   s.add_dependency 'state_machines-activerecord', '~> 0.4'
-  s.add_dependency 'discard', '~> 1.0'
 end

data/spec/helpers/base_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::BaseHelper, type: :helper do
@@ -37,6 +39,10 @@ RSpec.describe Spree::BaseHelper, type: :helper do
         it "return only the countries defined by the checkout zone" do
           expect(available_countries).to eq([country])
         end
+
+        it "returns only the countries defined by the checkout zone passed as parameter" do
+          expect(available_countries(restrict_to_zone: @country_zone.name)).to eq([country])
+        end
       end
 
       context "checkout zone is of type state" do

data/spec/helpers/products_helper_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'rails_helper'
 

data/spec/helpers/taxons_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::TaxonsHelper, type: :helper do

data/spec/jobs/promotion_code_batch_job_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 RSpec.describe Spree::PromotionCodeBatchJob, type: :job do
   let(:email) { "test@email.com" }
@@ -9,13 +11,42 @@ RSpec.describe Spree::PromotionCodeBatchJob, type: :job do
       email: email
     )
   end
-
   context "with a successful build" do
     before do
       allow(Spree::PromotionCodeBatchMailer)
         .to receive(:promotion_code_batch_finished)
         .and_call_original
     end
+
+    def codes
+      Spree::PromotionCode.pluck(:value)
+    end
+
+    context 'with the default join character' do
+      it 'uses the default join characters', :aggregate_failures do
+        subject.perform(promotion_code_batch)
+        codes.each do |code|
+          expect(code).to match(/^test_/)
+        end
+      end
+    end
+    context 'with a custom join character' do
+      let(:promotion_code_batch) do
+        Spree::PromotionCodeBatch.create!(
+          promotion_id: create(:promotion).id,
+          base_code: "test",
+          number_of_codes: 10,
+          email: email,
+          join_characters: '-'
+        )
+      end
+      it 'uses the custom join characters', :aggregate_failures do
+        subject.perform(promotion_code_batch)
+        codes.each do |code|
+          expect(code).to match(/^test-/)
+        end
+      end
+    end
     context "with an email address" do
       it "sends an email" do
         subject.perform(promotion_code_batch)

data/spec/lib/calculated_adjustments_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::CalculatedAdjustments do
@@ -58,7 +60,7 @@ RSpec.describe Spree::CalculatedAdjustments do
     end
 
     context 'with calculator_type and calculator_attributes' do
-      subject { Calculable.new(calculator_type: calculator_class.to_s, calculator_attributes: {preferred_amount: 123}) }
+      subject { Calculable.new(calculator_type: calculator_class.to_s, calculator_attributes: { preferred_amount: 123 }) }
 
       it 'can be initialized' do
         expect(subject.calculator).to be_a(calculator_class)

data/spec/lib/i18n_spec.rb

@@ -1,11 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'spree/i18n'
 
 RSpec.describe "i18n" do
   before do
+    # This reload avoids an issue with I18n.available_locales being cached
+    I18n.reload!
+
     I18n.backend.store_translations(:en,
     {
       spree: {
+        i18n: {
+          this_file_language: "English"
+        },
         foo: "bar",
         bar: {
           foo: "bar within bar scope",
@@ -17,6 +25,9 @@ RSpec.describe "i18n" do
       }
     })
   end
+  after do
+    I18n.reload!
+  end
 
   it "translates within the spree scope" do
     expect(Spree.t(:foo)).to eql("bar")
@@ -42,4 +53,40 @@ RSpec.describe "i18n" do
   it "should have a Spree::I18N_GENERIC_PLURAL constant" do
     expect(Spree::I18N_GENERIC_PLURAL).to eq 2.1
   end
+
+  describe "i18n_available_locales" do
+    it "should only return :en" do
+      expect(Spree.i18n_available_locales).to eq([:en])
+    end
+
+    context 'with unprefixed translations in another locale' do
+      before do
+        I18n.backend.store_translations(:fr, { cheese: "fromage" })
+      end
+
+      it "should only return :en" do
+        expect(Spree.i18n_available_locales).to eq([:en])
+      end
+    end
+
+    context 'with spree-prefixed translations in another locale' do
+      before do
+        I18n.backend.store_translations(:fr, spree: { cheese: "fromage" })
+      end
+
+      it "should return :en and :fr" do
+        expect(Spree.i18n_available_locales).to eq([:en])
+      end
+    end
+
+    context 'with specific desired key' do
+      before do
+        I18n.backend.store_translations(:fr, spree: { i18n: { this_file_language: "Français" } })
+      end
+
+      it "should return :en and :fr" do
+        expect(Spree.i18n_available_locales).to eq([:en, :fr])
+      end
+    end
+  end
 end

data/spec/lib/search/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'spree/core/product_filters'
 

data/spec/lib/search/variant_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'spree/core/class_constantizer'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 class FakesController < ApplicationController
@@ -38,6 +40,7 @@ RSpec.describe Spree::Core::ControllerHelpers::Auth, type: :controller do
     end
     it 'sends cookie header' do
       get :index
+      expect(response.headers["Set-Cookie"]).to match(/guest_token.*HttpOnly/)
       expect(response.cookies['guest_token']).not_to be_nil
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 class FakesController < ApplicationController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::Core::ControllerHelpers::PaymentParameters, type: :controller do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 class FakesController < ApplicationController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 class FakesController < ApplicationController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 class FakesController < ApplicationController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 class FakesController < ApplicationController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::Core::CurrentStore do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'spree/core/environment_extension'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree
@@ -128,8 +130,11 @@ module Spree
       end
 
       it 'can build an order from API with variant sku' do
-        params = { line_items_attributes: {
-                     "0" => { sku: sku, quantity: 5 } } }
+        params = {
+          line_items_attributes: {
+            "0" => { sku: sku, quantity: 5 }
+          }
+        }
 
         order = Importer::Order.import(user, params)
 
@@ -275,14 +280,17 @@ module Spree
 
       context "shipments" do
         let(:params) do
-          { shipments_attributes: [
-              { tracking: '123456789',
+          {
+            shipments_attributes: [
+              {
+                tracking: '123456789',
                 cost: '14.99',
                 shipping_method: shipping_method.name,
                 stock_location: stock_location.name,
                 inventory_units: [{ sku: sku }]
               }
-          ] }
+            ]
+          }
         end
 
         it 'ensures variant exists and is not deleted' do
@@ -323,7 +331,8 @@ module Spree
             {
               completed_at: 2.days.ago,
               shipments_attributes: [
-                { tracking: '123456789',
+                {
+                  tracking: '123456789',
                   cost: '4.99',
                   shipped_at: 1.day.ago,
                   shipping_method: shipping_method.name,
@@ -354,9 +363,12 @@ module Spree
       end
 
       it 'adds adjustments' do
-        params = { adjustments_attributes: [
+        params = {
+          adjustments_attributes: [
             { label: 'Shipping Discount', amount: -4.99 },
-            { label: 'Promotion Discount', amount: -3.00 }] }
+            { label: 'Promotion Discount', amount: -3.00 }
+          ]
+        }
 
         order = Importer::Order.import(user, params)
         expect(order.adjustments.all?(&:finalized?)).to be true

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::RoleConfiguration do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::Core::StockConfiguration do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'spree/testing_support/factories/address_factory'