solidus_core 1.2.3 → 1.3.0.beta1

data/lib/spree/testing_support/i18n.rb

@@ -50,7 +50,7 @@ module Spree
     self.used_translations ||= []
     self.unused_translation_messages = []
     self.unused_translations = []
-    self.load_translations(translations)
+    load_translations(translations)
     translation_diff = unused_translations - used_translations
     translation_diff.each do |translation|
       Spree.unused_translation_messages << "#{translation} (#{I18n.locale})"
@@ -59,13 +59,13 @@ module Spree
 
   private
 
-  def self.load_translations(hash, root=[])
-    hash.each do |k,v|
+  def self.load_translations(hash, root = [])
+    hash.each do |k, v|
       if v.is_a?(Hash)
         load_translations(v, root.dup << k)
       else
         key = (root + [k]).join('.')
-        self.unused_translations << key
+        unused_translations << key
       end
     end
   end
@@ -95,4 +95,3 @@ RSpec.configure do |config|
     end
   end
 end
-

data/lib/spree/testing_support/order_walkthrough.rb

@@ -7,9 +7,9 @@ class OrderWalkthrough
     # Need to create a valid zone too...
     @zone = FactoryGirl.create(:zone)
     @country = FactoryGirl.create(:country)
-    @state = FactoryGirl.create(:state, :country => @country)
+    @state = FactoryGirl.create(:state, country: @country)
 
-    @zone.members << Spree::ZoneMember.create(:zoneable => @country)
+    @zone.members << Spree::ZoneMember.create(zoneable: @country)
 
     # A shipping method must exist for rates to be displayed on checkout page
     FactoryGirl.create(:shipping_method, zones: [@zone]).tap do |sm|
@@ -32,8 +32,8 @@ class OrderWalkthrough
                           states[0..end_state_position]
                         end
 
-    states_to_process.each do |state|
-      send(state, order)
+    states_to_process.each do |state_to_process|
+      send(state_to_process, order)
     end
 
     order
@@ -47,8 +47,8 @@ class OrderWalkthrough
   end
 
   def address(order)
-    order.bill_address = FactoryGirl.create(:address, :country => @country, state: @state)
-    order.ship_address = FactoryGirl.create(:address, :country => @country, state: @state)
+    order.bill_address = FactoryGirl.create(:address, country: @country, state: @state)
+    order.ship_address = FactoryGirl.create(:address, country: @country, state: @state)
     order.next!
   end
 
@@ -58,7 +58,7 @@ class OrderWalkthrough
 
   def payment(order)
     credit_card = FactoryGirl.create(:credit_card)
-    order.payments.create!(:payment_method => credit_card.payment_method, :amount => order.total, source: credit_card)
+    order.payments.create!(payment_method: credit_card.payment_method, amount: order.total, source: credit_card)
     # TODO: maybe look at some way of making this payment_state change automatic
     order.payment_state = 'paid'
     order.next!
@@ -69,11 +69,10 @@ class OrderWalkthrough
   end
 
   def complete(order)
-    #noop?
+    # noop?
   end
 
   def states
     [:address, :delivery, :payment, :confirm]
   end
-
 end

data/lib/spree/testing_support/preferences.rb

@@ -9,6 +9,7 @@ module Spree
       # end
       #
       def reset_spree_preferences(&config_block)
+        Spree::Config.instance_variables.each { |iv| Spree::Config.remove_instance_variable(iv) }
         Spree::Config.preference_store = Spree::Config.default_preferences
 
         configure_spree_preferences(&config_block) if block_given?
@@ -26,4 +27,3 @@ module Spree
     end
   end
 end
-

data/lib/spree/testing_support/sequences.rb

@@ -1,9 +1,10 @@
 require 'factory_girl'
+require 'ffaker'
 
 FactoryGirl.define do
-  sequence(:random_code)        { Faker::Lorem.characters(10) }
-  sequence(:random_description) { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
-  sequence(:random_email)       { Faker::Internet.email }
-  sequence(:random_string)      { Faker::Lorem.sentence }
+  sequence(:random_code)        { FFaker::Lorem.characters(10) }
+  sequence(:random_description) { FFaker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
+  sequence(:random_email)       { FFaker::Internet.email }
+  sequence(:random_string)      { FFaker::Lorem.sentence }
   sequence(:sku) { |n| "SKU-#{n}" }
 end

data/lib/tasks/core.rake

@@ -1,10 +1,10 @@
 require 'active_record'
 
 namespace :db do
-  desc %q{Loads a specified fixture file:
-use rake db:load_file[/absolute/path/to/sample/filename.rb]}
+  desc 'Loads a specified fixture file:
+use rake db:load_file[/absolute/path/to/sample/filename.rb]'
 
-  task :load_file , [:file, :dir] => :environment do |t, args|
+  task :load_file, [:file, :dir] => :environment do |_t, args|
     file = Pathname.new(args.file)
 
     puts "loading ruby #{file}"
@@ -12,18 +12,17 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
   end
 
   desc "Loads fixtures from the the dir you specify using rake db:load_dir[loadfrom]"
-  task :load_dir , [:dir] => :environment do |t, args|
+  task :load_dir, [:dir] => :environment do |_t, args|
     dir = args.dir
     dir = File.join(Rails.root, "db", dir) if Pathname.new(dir).relative?
 
     ruby_files = {}
-    Dir.glob(File.join(dir , '**/*.{rb}')).each do |fixture_file|
-      ext = File.extname fixture_file
+    Dir.glob(File.join(dir, '**/*.{rb}')).each do |fixture_file|
       ruby_files[File.basename(fixture_file, '.*')] = fixture_file
     end
-    ruby_files.sort.each do |fixture , ruby_file|
+    ruby_files.sort.each do |fixture, ruby_file|
       # If file is exists within application it takes precendence.
-      if File.exists?(File.join(Rails.root, "db/default/spree", "#{fixture}.rb"))
+      if File.exist?(File.join(Rails.root, "db/default/spree", "#{fixture}.rb"))
         ruby_file = File.expand_path(File.join(Rails.root, "db/default/spree", "#{fixture}.rb"))
       end
       # an invoke will only execute the task once
@@ -32,10 +31,10 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
   end
 
   desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
-  task :remigrate => :environment do
+  task remigrate: :environment do
     require 'highline/import'
 
-    if ENV['SKIP_NAG'] or ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
+    if ENV['SKIP_NAG'] || ENV['OVERWRITE'].to_s.casecmp('true') || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
 
       # Drop all tables
       ActiveRecord::Base.connection.tables.each { |t| ActiveRecord::Base.connection.drop_table t }
@@ -52,12 +51,12 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
   end
 
   desc "Bootstrap is: migrating, loading defaults, sample data and seeding (for all extensions) and load_products tasks"
-  task :bootstrap  do
+  task :bootstrap do
     require 'highline/import'
 
     # remigrate unless production mode (as saftey check)
     if %w[demo development test].include? Rails.env
-      if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
+      if ENV['AUTO_ACCEPT'] || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
         ENV['SKIP_NAG'] = 'yes'
         Rake::Task["db:create"].invoke
         Rake::Task["db:remigrate"].invoke
@@ -70,19 +69,17 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
       Rake::Task["db:migrate"].invoke
     end
 
-    ActiveRecord::Base.send(:subclasses).each do |model|
-      model.reset_column_information
-    end
+    ActiveRecord::Base.send(:subclasses).each(&:reset_column_information)
 
-    load_defaults  = Spree::Country.count == 0
-    unless load_defaults    # ask if there are already Countries => default data hass been loaded
+    load_defaults = Spree::Country.count == 0
+    unless load_defaults # ask if there are already Countries => default data hass been loaded
       load_defaults = agree('Countries present, load sample data anyways? [y/n]: ')
     end
     if load_defaults
       Rake::Task["db:seed"].invoke
     end
 
-    if Rails.env.production? and Spree::Product.count > 0
+    if Rails.env.production? && Spree::Product.count > 0
       load_sample = agree("WARNING: In Production and products exist in database, load sample data anyways? [y/n]:" )
     else
       load_sample = true if ENV['AUTO_ACCEPT']
@@ -97,5 +94,4 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
 
     puts "Bootstrap Complete.\n\n"
   end
-
 end

data/lib/tasks/email.rake

@@ -1,7 +1,7 @@
 namespace :email do
-  desc 'Sends test email to specified address - Example: EMAIL=spree@example.com bundle exec rake test:email'
-  task :test => :environment do
-    raise ArgumentError, "Must pass EMAIL environment variable. Example: EMAIL=spree@example.com bundle exec rake test:email" unless ENV['EMAIL'].present?
+  desc 'Sends test email to specified address - Example: EMAIL=spree@example.com bundle exec rake email:test'
+  task test: :environment do
+    raise ArgumentError, "Must pass EMAIL environment variable. Example: EMAIL=spree@example.com bundle exec rake email:test" unless ENV['EMAIL'].present?
     Spree::TestMailer.test_email(ENV['EMAIL']).deliver!
   end
 end

data/lib/tasks/exchanges.rake

@@ -1,12 +1,11 @@
 namespace :exchanges do
-  desc %q{Takes unreturned exchanged items and creates a new order to charge
-  the customer for not returning them}
+  desc 'Takes unreturned exchanged items and creates a new order to charge
+  the customer for not returning them'
   task charge_unreturned_items: :environment do
-
-    unreturned_return_items =  Spree::ReturnItem.expecting_return.exchange_processed.includes(:exchange_inventory_unit).where([
+    unreturned_return_items = Spree::ReturnItem.expecting_return.exchange_processed.joins(:exchange_inventory_unit).where([
       "spree_inventory_units.created_at < :days_ago AND spree_inventory_units.state = :iu_state",
       days_ago: Spree::Config[:expedited_exchanges_days_window].days.ago, iu_state: "shipped"
-    ]).references(:exchange_inventory_units).to_a
+    ]).preload(:exchange_inventory_unit).to_a
 
     # Determine that a return item has already been deemed unreturned and therefore charged
     # by the fact that its exchange inventory unit has popped off to a different order
@@ -25,15 +24,14 @@ namespace :exchanges do
         failure = { message: "#{e.class}: #{e.message}" }
       end
 
-      if failure
-        failure[:new_order] = item_charger.new_order.number if item_charger.new_order
-        failures << failure.merge({
-          order: item_charger.original_order.number,
-          shipment: shipment.number,
-          return_items: return_items.map(&:id),
-          order_errors: item_charger.original_order.errors.full_messages,
-        })
-      end
+      next unless failure
+      failure[:new_order] = item_charger.new_order.number if item_charger.new_order
+      failures << failure.merge({
+        order: item_charger.original_order.number,
+        shipment: shipment.number,
+        return_items: return_items.map(&:id),
+        order_errors: item_charger.original_order.errors.full_messages
+      })
     end
 
     if failures.any?

data/lib/tasks/migrations/assure_store_on_orders.rake

@@ -0,0 +1,38 @@
+namespace :solidus do
+  namespace :migrations do
+    namespace :assure_store_on_orders do
+      desc "Makes sure every order in the system has a store attached"
+      task up: :environment do
+
+        attach_store_to_all_orders
+      end
+
+      def attach_store_to_all_orders
+        orders_without_store_count = Spree::Order.where(store_id: nil).count
+        if orders_without_store_count == 0
+          puts "Everything is good, all orders in your database have a store attached."
+          return
+        end
+
+        spree_store_count = Spree::Store.count
+        if spree_store_count == 0
+          abort "You do not have a store set up. Please create a store instance for your installation."
+        elsif spree_store_count > 1
+          abort(<<-TEXT.squish)
+            You have more than one store set up. We can not be sure which store to attach your
+            orders to. Please attach store ids to all your orders, and run this task again
+            when you're finished.
+          TEXT
+        end
+
+        default_store = Store.where(default: true).first
+        unless default_store
+          abort "Your store is not marked as default. Please mark your one store as the default store and run this task again."
+        end
+
+        Spree::Order.where(store_id: nil).update_all(store_id: Spree::Store.default.id)
+        puts "All orders updated with the default store."
+      end
+    end
+  end
+end

data/lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake

@@ -65,7 +65,7 @@ namespace 'spree:migrations:copy_order_bill_address_to_credit_card' do
         postgres_sql(
           start_id: current_start_id,
           end_id: current_end_id,
-          payment_state: "not in ('failed', 'invalid')",
+          payment_state: "not in ('failed', 'invalid')"
         )
       )
 
@@ -74,7 +74,7 @@ namespace 'spree:migrations:copy_order_bill_address_to_credit_card' do
         postgres_sql(
           start_id: current_start_id,
           end_id: current_end_id,
-          payment_state: "in ('failed', 'invalid')",
+          payment_state: "in ('failed', 'invalid')"
         )
       )
 

data/lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake

@@ -33,11 +33,9 @@ namespace 'spree:migrations:copy_shipped_shipments_to_cartons' do
     end
 
     say_with_time 'generating cartons' do
-
       last_id = Spree::Shipment.last.try!(:id) || 0
 
       in_batches(last_id: last_id) do |start_id, end_id|
-
         say_with_time "processing shipment #{start_id} to #{end_id}" do
           Spree::Carton.connection.execute(<<-SQL.strip_heredoc)
             insert into spree_cartons
@@ -48,7 +46,7 @@ namespace 'spree:migrations:copy_shipped_shipments_to_cartons' do
               )
             select
               -- create the carton number as 'C'+shipment number:
-              #{db_concat("'C'", "spree_shipments.number")}, -- number
+              #{db_concat("'C'", 'spree_shipments.number')}, -- number
               spree_shipments.id, -- imported_from_shipment_id
               spree_shipments.stock_location_id,
               spree_shipments.address_id,
@@ -80,15 +78,12 @@ namespace 'spree:migrations:copy_shipped_shipments_to_cartons' do
           SQL
         end
       end
-
     end
 
     say_with_time 'linking inventory units to cartons' do
-
       last_id = Spree::InventoryUnit.last.try!(:id) || 0
 
       in_batches(last_id: last_id) do |start_id, end_id|
-
         say_with_time "processing inventory units #{start_id} to #{end_id}" do
           Spree::InventoryUnit.connection.execute(<<-SQL.strip_heredoc)
             update spree_inventory_units
@@ -106,16 +101,13 @@ namespace 'spree:migrations:copy_shipped_shipments_to_cartons' do
           SQL
         end
       end
-
     end
-
   end
 
   task down: :environment do
     last_id = Spree::InventoryUnit.last.try!(:id) || 0
 
     say_with_time 'unlinking inventory units from cartons' do
-
       in_batches(last_id: last_id) do |start_id, end_id|
         say_with_time "processing inventory units #{start_id} to #{end_id}" do
           Spree::InventoryUnit.connection.execute(<<-SQL.strip_heredoc)
@@ -133,7 +125,6 @@ namespace 'spree:migrations:copy_shipped_shipments_to_cartons' do
           SQL
         end
       end
-
     end
 
     say_with_time "clearing carton imported_from_shipment_ids" do
@@ -176,5 +167,4 @@ namespace 'spree:migrations:copy_shipped_shipments_to_cartons' do
       start_id += batch_size
     end
   end
-
 end

data/lib/tasks/migrations/migrate_shipping_rate_taxes.rake

@@ -0,0 +1,17 @@
+namespace :solidus do
+  namespace :migrations do
+    namespace :migrate_shipping_rate_taxes do
+      task up: :environment do
+        puts "Adding persisted tax notes to historic shipping rates"
+        Spree::ShippingRate.where.not(tax_rate_id: nil).find_each do |shipping_rate|
+          tax_rate = Spree::TaxRate.unscoped.find(shipping_rate.tax_rate_id)
+          shipping_rate.taxes.find_or_create_by!(
+            tax_rate: tax_rate,
+            amount: tax_rate.compute_amount(shipping_rate)
+          )
+        end
+        Spree::ShippingRate.where.not(tax_rate_id: nil).update_all(tax_rate: nil)
+      end
+    end
+  end
+end

data/lib/tasks/migrations/migrate_user_addresses.rake

@@ -2,7 +2,7 @@ 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.
 
-  # This task should not need to be run more than once. But the de-dup behavior in 
+  # This task should not need to be run more than once. But the de-dup behavior in
   # UserAddressBook should make it safe.
   # When the code (in the same PR) is deployed, each new order's addresses will be added
   # to the user's address book. This will catch up all the historical data.

data/lib/tasks/order_capturing.rake

@@ -5,7 +5,7 @@ namespace :order_capturing do
     orders = Spree::Order.complete.where(payment_state: 'balance_due').where('completed_at > ?', Spree::Config[:order_capturing_time_window].days.ago)
 
     orders.find_each do |order|
-      if order.inventory_units.all? {|iu| iu.canceled? || iu.shipped? }
+      if order.inventory_units.all? { |iu| iu.canceled? || iu.shipped? }
         if Spree::OrderCapturing.failure_handler
           begin
             Spree::OrderCapturing.new(order).capture_payments

data/lib/tasks/upgrade.rake

@@ -0,0 +1,11 @@
+namespace :solidus do
+  namespace :upgrade do
+    desc "Upgrade Solidus to version 1.3"
+    task one_point_three: [
+        'solidus:migrations:assure_store_on_orders:up',
+        'solidus:migrations:migrate_shipping_rate_taxes:up'
+      ] do
+      puts "Your Solidus install is ready for Solidus 1.3."
+    end
+  end
+end

data/script/rails

@@ -6,4 +6,3 @@ ENGINE_PATH = File.expand_path('../../lib/spree/core/engine', __FILE__)
 
 require 'rails/all'
 require 'rails/engine/commands'
-

data/solidus_core.gemspec

@@ -12,30 +12,28 @@ Gem::Specification.new do |s|
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
   s.homepage    = 'http://solidus.io'
-  s.license     = %q{BSD-3}
+  s.license     = 'BSD-3'
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
   s.required_ruby_version = '>= 2.1.0'
 
-  s.add_dependency 'activemerchant', '~> 1.48.0'
+  s.add_dependency 'activemerchant', '~> 1.48'
   s.add_dependency 'acts_as_list', '~> 0.3'
   s.add_dependency 'awesome_nested_set', '~> 3.0.1'
   s.add_dependency 'carmen', '~> 1.0.0'
   s.add_dependency 'cancancan', '~> 1.10'
-  s.add_dependency 'ffaker', '~> 1.16'
-  s.add_dependency 'font-awesome-rails', '~> 4.0'
+  s.add_dependency 'ffaker', '~> 2.0'
   s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
-  s.add_dependency 'json', '~> 1.7'
   s.add_dependency 'kaminari', '~> 0.15', '>= 0.15.1'
   s.add_dependency 'monetize', '~> 1.1'
   s.add_dependency 'paperclip', '~> 4.2.0'
-  s.add_dependency 'paranoia', '~> 2.1.4'
+  s.add_dependency 'paranoia', '~> 2.1', '>= 2.1.4'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '~> 4.2.0'
-  s.add_dependency 'ransack', '~> 1.6.0'
+  s.add_dependency 'rails', '~> 4.2.5'
+  s.add_dependency 'ransack', '~> 1.6'
   s.add_dependency 'responders'
   s.add_dependency 'state_machines-activerecord', '~> 0.2'
   s.add_dependency 'stringex', '~> 1.5.1'

data/spec/helpers/base_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::BaseHelper, :type => :helper do
+describe Spree::BaseHelper, type: :helper do
   include Spree::BaseHelper
 
   let(:current_store){ create :store }
@@ -25,8 +25,8 @@ describe Spree::BaseHelper, :type => :helper do
     context "with a checkout zone defined" do
       context "checkout zone is of type country" do
         before do
-          @country_zone = create(:zone, :name => "CountryZone")
-          @country_zone.members.create(:zoneable => country)
+          @country_zone = create(:zone, name: "CountryZone")
+          @country_zone.members.create(zoneable: country)
           Spree::Config[:checkout_zone] = @country_zone.name
         end
 
@@ -37,9 +37,9 @@ describe Spree::BaseHelper, :type => :helper do
 
       context "checkout zone is of type state" do
         before do
-          state_zone = create(:zone, :name => "StateZone")
-          state = create(:state, :country => country)
-          state_zone.members.create(:zoneable => state)
+          state_zone = create(:zone, name: "StateZone")
+          state = create(:state, country: country)
+          state_zone.members.create(zoneable: state)
           Spree::Config[:checkout_zone] = state_zone.name
         end
 
@@ -52,10 +52,10 @@ describe Spree::BaseHelper, :type => :helper do
 
   # Regression test for https://github.com/spree/spree/issues/1436
   context "defining custom image helpers" do
-    let(:product) { mock_model(Spree::Product, :images => [], :variant_images => []) }
+    let(:product) { mock_model(Spree::Product, images: [], variant_images: []) }
     before do
       Spree::Image.class_eval do
-        attachment_definitions[:attachment][:styles].merge!({:very_strange => '1x1'})
+        attachment_definitions[:attachment][:styles][:very_strange] = '1x1'
       end
     end
 
@@ -68,12 +68,11 @@ describe Spree::BaseHelper, :type => :helper do
     it "should raise NoMethodError when style is not exists" do
       expect { another_strange_image(product) }.to raise_error(NoMethodError)
     end
-
   end
 
   # Regression test for https://github.com/spree/spree/issues/2034
   context "flash_message" do
-    let(:flash) { {"notice" => "ok", "foo" => "foo", "bar" => "bar"} }
+    let(:flash) { { "notice" => "ok", "foo" => "foo", "bar" => "bar" } }
 
     it "should output all flash content" do
       flash_messages
@@ -84,7 +83,7 @@ describe Spree::BaseHelper, :type => :helper do
     end
 
     it "should output flash content except one key" do
-      flash_messages(:ignore_types => :bar)
+      flash_messages(ignore_types: :bar)
       html = Nokogiri::HTML(helper.output_buffer)
       expect(html.css(".notice").text).to eq("ok")
       expect(html.css(".foo").text).to eq("foo")
@@ -92,7 +91,7 @@ describe Spree::BaseHelper, :type => :helper do
     end
 
     it "should output flash content except some keys" do
-      flash_messages(:ignore_types => [:foo, :bar])
+      flash_messages(ignore_types: [:foo, :bar])
       html = Nokogiri::HTML(helper.output_buffer)
       expect(html.css(".notice").text).to eq("ok")
       expect(html.css(".foo").text).to be_empty
@@ -136,20 +135,19 @@ describe Spree::BaseHelper, :type => :helper do
       # Because the controller_name method returns "test"
       # controller_name is used by this method to infer what it is supposed
       # to be generating meta_data_tags for
-      text = Faker::Lorem.paragraphs(2).join(" ")
-      @test = Spree::Product.new(:description => text)
+      @test = Spree::Product.new(description: "a" * 200)
       tags = Nokogiri::HTML.parse(meta_data_tags)
       content = tags.css("meta[name=description]").first["content"]
-      assert content.length <= 160, "content length is not truncated to 160 characters"
+      expect(content.length).to be <= 160
     end
   end
 
   # Regression test for https://github.com/spree/spree/issues/5384
   context "custom image helpers conflict with inproper statements" do
-    let(:product) { mock_model(Spree::Product, :images => [], :variant_images => []) }
+    let(:product) { mock_model(Spree::Product, images: [], variant_images: []) }
     before do
       Spree::Image.class_eval do
-        attachment_definitions[:attachment][:styles].merge!({:foobar => '1x1'})
+        attachment_definitions[:attachment][:styles][:foobar] = '1x1'
       end
     end
 
@@ -162,7 +160,6 @@ describe Spree::BaseHelper, :type => :helper do
     it "should raise NoMethodError when statement with name equal to style name called" do
       expect { foobar(product) }.to raise_error(NoMethodError)
     end
-
   end
 
   context "pretty_time" do

data/spec/helpers/order_helper_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 module Spree
-  describe Spree::OrdersHelper, :type => :helper do
+  describe Spree::OrdersHelper, type: :helper do
     # Regression test for https://github.com/spree/spree/issues/2518 and https://github.com/spree/spree/issues/2323
     it "truncates HTML correctly in product description" do
-      product = double(:description => "<strong>" + ("a" * 95) + "</strong> This content is invisible.")
+      product = double(description: "<strong>" + ("a" * 95) + "</strong> This content is invisible.")
       expected = "<strong>" + ("a" * 95) + "</strong>..."
       expect(truncated_product_description(product)).to eq(expected)
     end