solidus_core 2.2.2 → 2.3.0.beta1

data/db/migrate/20170412103617_transform_tax_rate_category_relation.rb

@@ -0,0 +1,48 @@
+class TransformTaxRateCategoryRelation < ActiveRecord::Migration[5.0]
+  class TaxRate < ActiveRecord::Base
+    self.table_name = "spree_tax_rates"
+  end
+
+  class TaxRateTaxCategory < ActiveRecord::Base
+    self.table_name = "spree_tax_rate_tax_categories"
+  end
+
+  def up
+    create_table :spree_tax_rate_tax_categories do |t|
+      t.integer :tax_category_id, index: true, null: false
+      t.integer :tax_rate_id, index: true, null: false
+    end
+
+    add_foreign_key :spree_tax_rate_tax_categories, :spree_tax_categories, column: :tax_category_id
+    add_foreign_key :spree_tax_rate_tax_categories, :spree_tax_rates, column: :tax_rate_id
+
+    TaxRate.where.not(tax_category_id: nil).find_each do |tax_rate|
+      TaxRateTaxCategory.create!(
+        tax_rate_id: tax_rate.id,
+        tax_category_id: tax_rate.tax_category_id
+      )
+    end
+
+    remove_column :spree_tax_rates, :tax_category_id
+  end
+
+  def down
+    add_column :spree_tax_rates, :tax_category_id, :integer, index: true
+    add_foreign_key :spree_tax_rates, :spree_tax_categories, column: :tax_category_id
+
+    TaxRate.find_each do |tax_rate|
+      tax_category_ids = TaxRateTaxCategory.where(tax_rate_id: tax_rate.id).pluck(:tax_category_id)
+
+      tax_category_ids.each_with_index do |category_id, i|
+        if i.zero?
+          tax_rate.update!(tax_category_id: category_id)
+        else
+          new_tax_rate = tax_rate.dup
+          new_tax_rate.update!(tax_category_id: category_id)
+        end
+      end
+    end
+
+    drop_table :spree_tax_rate_tax_categories
+  end
+end

data/db/migrate/20170422134804_add_roles_unique_constraints.rb

@@ -0,0 +1,6 @@
+class AddRolesUniqueConstraints < ActiveRecord::Migration[5.0]
+  def change
+    add_index :spree_roles, :name, unique: true
+    add_index :spree_roles_users, [:user_id, :role_id], unique: true
+  end
+end

data/db/migrate/20170522143442_add_time_range_to_tax_rate.rb

@@ -0,0 +1,6 @@
+class AddTimeRangeToTaxRate < ActiveRecord::Migration[5.0]
+  def change
+    add_column :spree_tax_rates, :starts_at, :datetime
+    add_column :spree_tax_rates, :expires_at, :datetime
+  end
+end

data/db/migrate/20170608074534_rename_bogus_gateways.rb

@@ -0,0 +1,13 @@
+class RenameBogusGateways < ActiveRecord::Migration[5.0]
+  def up
+    say_with_time 'Renaming bogus gateways into payment methods' do
+      Rake::Task['solidus:migrations:rename_gateways:up'].invoke
+    end
+  end
+
+  def down
+    say_with_time 'Renaming bogus payment methods into gateways' do
+      Rake::Task['solidus:migrations:rename_gateways:down'].invoke
+    end
+  end
+end

data/lib/generators/spree/custom_user/custom_user_generator.rb

@@ -3,7 +3,7 @@ module Spree
     include Rails::Generators::ResourceHelpers
     include Rails::Generators::Migration
 
-    desc "Set up a Spree installation with a custom User class"
+    desc "Set up a Solidus installation with a custom User class"
 
     def self.source_paths
       paths = superclass.source_paths

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -4,7 +4,7 @@ require 'spree/core/version'
 
 module Spree
   class DummyGenerator < Rails::Generators::Base
-    desc "Creates blank Rails application, installs Spree and all sample data"
+    desc "Creates blank Rails application, installs Solidus and all sample data"
 
     class_option :lib_name, default: ''
     class_option :database, default: ''
@@ -30,6 +30,15 @@ module Spree
       opts[:database] = 'sqlite3' if opts[:database].blank?
       opts[:force] = true
       opts[:skip_bundle] = true
+      opts[:skip_gemfile] = true
+      opts[:skip_git] = true
+      opts[:skip_keeps] = true
+      opts[:skip_listen] = true
+      opts[:skip_puma] = true
+      opts[:skip_rc] = true
+      opts[:skip_spring] = true
+      opts[:skip_test] = true
+      opts[:skip_yarn] = true
 
       puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,
@@ -46,9 +55,6 @@ module Spree
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
       template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", force: true
       template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", force: true
-
-      # FIXME: We aren't ready for rails 5 defaults
-      remove_file "#{dummy_path}/config/initializers/new_framework_defaults.rb"
     end
 
     def test_dummy_inject_extension_requirements

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -5,32 +5,32 @@ end %>
   when 'sqlite' %>
 development:
   adapter: sqlite3
-  database: db/spree_development.sqlite3
+  database: db/solidus_development.sqlite3
 test:
   adapter: sqlite3
-  database: db/spree_test.sqlite3
+  database: db/solidus_test.sqlite3
   timeout: 10000
 production:
   adapter: sqlite3
-  database: db/spree_production.sqlite3
+  database: db/solidus_production.sqlite3
 <% when 'mysql' %>
 development:
   adapter: mysql2
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
+  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_development
   encoding: utf8
 test:
   adapter: mysql2
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
+  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_test
   encoding: utf8
 production:
   adapter: mysql2
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
+  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_production
   encoding: utf8
 <% when 'postgres', 'postgresql' %>
 <% db_host = ENV['DB_HOST'] -%>
 development:
   adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
+  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_development
   username: postgres
   min_messages: warning
 <% unless db_host.blank? %>
@@ -38,7 +38,7 @@ development:
 <% end %>
 test:
   adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
+  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_test
   username: postgres
   min_messages: warning
 <% unless db_host.blank? %>
@@ -46,7 +46,7 @@ test:
 <% end %>
 production:
   adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
+  database: <%= database_prefix %><%= options[:lib_name] %>_solidus_production
   username: postgres
   min_messages: warning
 <% unless db_host.blank? %>
@@ -55,13 +55,13 @@ production:
 <% when 'sqlite', '', nil %>
 development:
   adapter: sqlite3
-  database: db/spree_development.sqlite3
+  database: db/solidus_development.sqlite3
 test:
   adapter: sqlite3
-  database: db/spree_test.sqlite3
+  database: db/solidus_test.sqlite3
 production:
   adapter: sqlite3
-  database: db/spree_production.sqlite3
+  database: db/solidus_production.sqlite3
 <% else %>
   <% raise "Invalid DB specified: #{ENV['DB']}" %>
 <% end %>

data/lib/generators/spree/install/install_generator.rb

@@ -5,7 +5,7 @@ require 'bundler/cli'
 
 module Spree
   class InstallGenerator < Rails::Generators::Base
-    class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
+    class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus migrations'
     class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
     class_option :auto_accept, type: :boolean
@@ -35,7 +35,7 @@ module Spree
     end
 
     def add_files
-      template 'config/initializers/spree.rb', 'config/initializers/spree.rb'
+      template 'config/initializers/solidus.rb', 'config/initializers/solidus.rb'
     end
 
     def additional_tweaks
@@ -152,11 +152,11 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     def install_routes
       insert_into_file File.join('config', 'routes.rb'), after: "Rails.application.routes.draw do\n" do
         <<-ROUTES
-  # This line mounts Spree's routes at the root of your application.
+  # This line mounts Solidus's routes at the root of your application.
   # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
   # If you would like to change where this engine is mounted, simply change the :at option to something different.
   #
-  # We ask that you don't use the :as option here, as Spree relies on it being the default of "spree"
+  # We ask that you don't use the :as option here, as Solidus relies on it being the default of "spree"
   mount Spree::Core::Engine, at: '/'
 
         ROUTES
@@ -173,7 +173,7 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     def complete
       unless options[:quiet]
         puts "*" * 50
-        puts "Spree has been installed successfully. You're all ready to go!"
+        puts "Solidus has been installed successfully. You're all ready to go!"
         puts " "
         puts "Enjoy!"
       end

data/lib/solidus/migrations/rename_gateways.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Solidus
+  module Migrations
+    class RenameGateways
+      DEFAULT_MAPPING = {
+        'Spree::Gateway' => 'Spree::PaymentMethod::CreditCard',
+        'Spree::Gateway::Bogus' => 'Spree::PaymentMethod::BogusCreditCard',
+        'Spree::Gateway::BogusSimple' => 'Spree::PaymentMethod::SimpleBogusCreditCard'
+      }
+
+      attr_reader :gateway_mapping
+
+      def initialize(gateway_mapping = DEFAULT_MAPPING)
+        @gateway_mapping = gateway_mapping
+      end
+
+      def up
+        gateway_mapping.inject(0) do |count, mapping|
+          count + update(from: mapping[0], to: mapping[1])
+        end
+      end
+
+      def down
+        gateway_mapping.inject(0) do |count, mapping|
+          count + update(from: mapping[1], to: mapping[0])
+        end
+      end
+
+      private
+
+      def update(from:, to:)
+        ActiveRecord::Base.connection.update <<-SQL.strip_heredoc
+          UPDATE spree_payment_methods SET type = '#{to}' WHERE type = '#{from}';
+        SQL
+      end
+    end
+  end
+end

data/lib/spree/core/controller_helpers/auth.rb

@@ -68,7 +68,7 @@ module Spree
           # This one will be defined by Devise
           elsif respond_to?(:current_spree_user)
             current_spree_user
-                    end
+          end
         end
       end
     end

data/lib/spree/core/controller_helpers/order.rb

@@ -14,7 +14,6 @@ module Spree
           helper_method :simple_current_order
         end
 
-        # Used in the link_to_cart helper.
         def simple_current_order
           return @simple_current_order if @simple_current_order
 
@@ -24,9 +23,10 @@ module Spree
             @simple_current_order.last_ip_address = ip_address
             return @simple_current_order
           else
-            @simple_current_order = Spree::Order.new
+            @simple_current_order = Spree::Order.new(current_order_params)
           end
         end
+        deprecate simple_current_order: :current_order, deprecator: Spree::Deprecation
 
         # The current incomplete order from the guest_token for use in cart and during checkout
         def current_order(options = {})
@@ -34,10 +34,10 @@ module Spree
 
           return @current_order if @current_order
 
-          @current_order = find_order_by_token_or_user(options, true)
+          @current_order = find_order_by_token_or_user(options)
 
           if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
-            @current_order = Spree::Order.new(current_order_params)
+            @current_order = Spree::Order.new(new_order_params)
             @current_order.user ||= try_spree_current_user
             # See issue https://github.com/spree/spree/issues/3346 for reasons why this line is here
             @current_order.created_by ||= try_spree_current_user
@@ -45,7 +45,7 @@ module Spree
           end
 
           if @current_order
-            @current_order.last_ip_address = ip_address
+            @current_order.record_ip_address(ip_address)
             return @current_order
           end
         end
@@ -79,11 +79,16 @@ module Spree
           { currency: current_pricing_options.currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id, user_id: try_spree_current_user.try(:id) }
         end
 
+        def new_order_params
+          current_order_params.merge(last_ip_address: ip_address)
+        end
+
         def find_order_by_token_or_user(options = {}, with_adjustments = false)
           options[:lock] ||= false
 
           # Find any incomplete orders for the guest_token
           if with_adjustments
+            Spree::Deprecation.warn "The second argument to find_order_by_token_or_user is deprecated, and will be removed in a future version."
             order = Spree::Order.incomplete.includes(:adjustments).lock(options[:lock]).find_by(current_order_params)
           else
             order = Spree::Order.incomplete.lock(options[:lock]).find_by(current_order_params)

data/lib/spree/core/controller_helpers/store.rb

@@ -4,20 +4,12 @@ module Spree
       module Store
         extend ActiveSupport::Concern
 
-        # @!attribute [rw] current_store_class
-        #   @!scope class
-        #   Extension point for overriding how the current store is chosen.
-        #   Defaults to checking headers and server name
-        #   @return [#store] class used to help find the current store
         included do
-          class_attribute :current_store_class
-          self.current_store_class = Spree::Core::CurrentStore
-
           helper_method :current_store
         end
 
         def current_store
-          @current_store ||= current_store_class.new(request).store
+          @current_store ||= Spree::Config.current_store_selector_class.new(request).store
         end
       end
     end

data/lib/spree/core/current_store.rb

@@ -6,24 +6,16 @@ module Spree
     class CurrentStore
       def initialize(request)
         @request = request
+        @current_store_selector = Spree::Config.current_store_selector_class.new(request)
+        Spree::Deprecation.warn "Using Spree::Core::CurrentStore is deprecated. Use Spree::Config.current_store_selector_class instead", caller
       end
 
-      # Chooses the current store based on a request.
-      # Checks request headers for HTTP_SPREE_STORE and falls back to
-      # looking up by the requesting server's name.
+      # Delegate store selection to Spree::Config.current_store_selector_class
+      # Using this class is deprecated.
+      #
       # @return [Spree::Store]
       def store
-        if store_key
-          Spree::Store.current(store_key)
-        else
-          Spree::Store.default
-        end
-      end
-
-      private
-
-      def store_key
-        @request.headers['HTTP_SPREE_STORE'] || @request.env['SERVER_NAME']
+        @current_store_selector.store
       end
     end
   end

data/lib/spree/core/engine.rb

@@ -43,8 +43,8 @@ module Spree
 
       initializer "spree.register.payment_methods", before: :load_config_initializers do |app|
         app.config.spree.payment_methods = %w[
-          Spree::Gateway::Bogus
-          Spree::Gateway::BogusSimple
+          Spree::PaymentMethod::BogusCreditCard
+          Spree::PaymentMethod::SimpleBogusCreditCard
           Spree::PaymentMethod::StoreCredit
           Spree::PaymentMethod::Check
         ]
@@ -67,9 +67,10 @@ module Spree
         ]
 
         app.config.spree.calculators.promotion_actions_create_item_adjustments = %w[
-          Spree::Calculator::PercentOnLineItem
+          Spree::Calculator::DistributedAmount
           Spree::Calculator::FlatRate
           Spree::Calculator::FlexiRate
+          Spree::Calculator::PercentOnLineItem
           Spree::Calculator::TieredPercent
         ]
 

data/lib/spree/core/importer/order.rb

@@ -54,7 +54,7 @@ module Spree
           shipments_hash.each do |s|
             shipment = Shipment.new
             shipment.tracking       = s[:tracking]
-            shipment.stock_location = Spree::StockLocation.find_by_admin_name(s[:stock_location]) || Spree::StockLocation.find_by_name!(s[:stock_location])
+            shipment.stock_location = Spree::StockLocation.find_by(admin_name: s[:stock_location]) || Spree::StockLocation.find_by!(name: s[:stock_location])
 
             inventory_units = s[:inventory_units] || []
             inventory_units.each do |iu|
@@ -87,7 +87,7 @@ module Spree
             order.shipments << shipment
             shipment.save!
 
-            shipping_method = Spree::ShippingMethod.find_by_name(s[:shipping_method]) || Spree::ShippingMethod.find_by_admin_name!(s[:shipping_method])
+            shipping_method = Spree::ShippingMethod.find_by(name: s[:shipping_method]) || Spree::ShippingMethod.find_by!(admin_name: s[:shipping_method])
             rate = shipment.shipping_rates.create!(shipping_method: shipping_method,
                                                    cost: s[:cost])
             shipment.selected_shipping_rate_id = rate.id
@@ -131,7 +131,7 @@ module Spree
             # Order API should be using state as that's the normal payment field.
             # spree_wombat serializes payment state as status so imported orders should fall back to status field.
             payment.state = p[:state] || p[:status] || 'completed'
-            payment.payment_method = Spree::PaymentMethod.find_by_name!(p[:payment_method])
+            payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
             payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
             payment.save!
           end
@@ -154,7 +154,7 @@ module Spree
         def self.ensure_variant_id_from_params(hash)
           sku = hash.delete(:sku)
           unless hash[:variant_id].present?
-            hash[:variant_id] = Spree::Variant.with_prices.find_by_sku!(sku).id
+            hash[:variant_id] = Spree::Variant.with_prices.find_by!(sku: sku).id
           end
           hash
         end

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.2.2"
+    "2.3.0.beta1"
   end
 
   def self.solidus_gem_version

data/lib/spree/core.rb

@@ -9,7 +9,6 @@ require 'mail'
 require 'monetize'
 require 'paperclip'
 require 'paranoia'
-require 'premailer/rails'
 require 'ransack'
 require 'state_machines-activerecord'
 require 'responders'

data/lib/spree/localized_number.rb

@@ -21,7 +21,8 @@ module Spree
       # then replace the locale-specific decimal separator with the standard separator if necessary
       number = number.gsub(separator, '.') unless separator == '.'
 
-      number.to_d
+      # Handle empty string for ruby 2.4 compatibility
+      BigDecimal.new(number.presence || 0)
     end
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -73,7 +73,8 @@ module Spree
       :meta_keywords, :price, :sku, :deleted_at,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
-      :taxon_ids, :option_type_ids, :cost_currency, :cost_price]
+      :taxon_ids, :option_type_ids, :cost_currency, :cost_price
+    ]
 
     @@property_attributes = [:name, :presentation]
 
@@ -81,7 +82,8 @@ module Spree
 
     @@shipment_attributes = [
       :special_instructions, :stock_location_id, :id, :tracking,
-      :selected_shipping_rate_id]
+      :selected_shipping_rate_id
+    ]
 
     # month / year may be provided by some sources, or others may elect to use one field
     @@source_attributes = [
@@ -96,10 +98,12 @@ module Spree
     @@stock_location_attributes = [
       :name, :active, :address1, :address2, :city, :zipcode,
       :backorderable_default, :state_name, :state_id, :country_id, :phone,
-      :propagate_all_variants]
+      :propagate_all_variants
+    ]
 
     @@stock_movement_attributes = [
-      :quantity, :stock_item, :stock_item_id, :originator, :action]
+      :quantity, :stock_item, :stock_item_id, :originator, :action
+    ]
 
     @@store_attributes = [:name, :url, :seo_title, :meta_keywords,
                           :meta_description, :default_currency,
@@ -109,7 +113,8 @@ module Spree
 
     @@taxon_attributes = [
       :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id,
-      :meta_description, :meta_keywords, :meta_title, :child_index]
+      :meta_description, :meta_keywords, :meta_title, :child_index
+    ]
 
     @@transfer_item_attributes = [:variant_id, :expected_quantity, :received_quantity]
 
@@ -123,6 +128,7 @@ module Spree
       :name, :presentation, :cost_price, :lock_version,
       :position, :track_inventory,
       :product_id, :product, :option_values_attributes, :price,
-      :weight, :height, :width, :depth, :sku, :cost_currency, option_value_ids: [], options: [:name, :value]]
+      :weight, :height, :width, :depth, :sku, :cost_currency, option_value_ids: [], options: [:name, :value]
+    ]
   end
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -106,7 +106,6 @@ module CapybaraExt
   end
 
   def wait_for_ajax
-
     Spree::Deprecation.warn <<-WARN.squish, caller
       wait_for_ajax has been deprecated.
       Please refer to the capybara documentation on how to properly wait for asyncronous behavior:

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

@@ -29,7 +29,11 @@ FactoryGirl.define do
       after(:create) do |adjustment|
         # Set correct tax category, so that adjustment amount is not 0
         if adjustment.adjustable.is_a?(Spree::LineItem)
-          adjustment.source.tax_category = adjustment.adjustable.tax_category
+          if adjustment.adjustable.tax_category.present?
+            adjustment.source.tax_categories = [adjustment.adjustable.tax_category]
+          else
+            adjustment.source.tax_categories = []
+          end
           adjustment.source.save
           adjustment.update!
         end

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

@@ -18,10 +18,14 @@ FactoryGirl.define do
       line_items_price BigDecimal.new(10)
     end
 
+    # TODO: Improve the name of order_with_totals factory.
     factory :order_with_totals do
-      after(:create) do |order, evaluator|
-        create(:line_item, order: order, price: evaluator.line_items_price)
-        order.line_items.reload # to ensure order.line_items is accessible after
+      after(:build) do |order, evaluator|
+        order.line_items << build(
+          :line_item,
+          order: order,
+          price: evaluator.line_items_price
+        )
       end
     end
 
@@ -37,7 +41,7 @@ FactoryGirl.define do
         stock_location { create(:stock_location) }
       end
 
-      after(:create) do |order, evaluator|
+      after(:build) do |order, evaluator|
         evaluator.stock_location # must evaluate before creating line items
 
         evaluator.line_items_attributes.each do |attributes|
@@ -52,6 +56,24 @@ FactoryGirl.define do
         order.update!
       end
 
+      factory :completed_order_with_promotion do
+        transient do
+          promotion nil
+        end
+
+        after(:create) do |order, evaluator|
+          promotion = evaluator.promotion || create(:promotion, code: "test")
+          promotion_code = promotion.codes.first || create(:promotion_code, promotion: promotion)
+
+          promotion.activate(order: order, promotion_code: promotion_code)
+          order.order_promotions.create!(promotion: promotion, promotion_code: promotion_code)
+
+          # Complete the order after the promotion has been activated
+          order.update_column(:completed_at, Time.current)
+          order.update_column(:state, "complete")
+        end
+      end
+
       factory :order_ready_to_complete do
         state 'confirm'
         payment_state 'checkout'
@@ -75,7 +97,6 @@ FactoryGirl.define do
         state 'complete'
 
         after(:create) do |order|
-          order.refresh_shipment_rates
           order.shipments.each do |shipment|
             shipment.inventory_units.update_all state: 'on_hand', pending: false
           end
@@ -130,23 +151,4 @@ FactoryGirl.define do
       end
     end
   end
-
-  factory :completed_order_with_promotion, parent: :order_with_line_items, class: "Spree::Order" do
-    transient do
-      promotion nil
-    end
-
-    after(:create) do |order, evaluator|
-      promotion = evaluator.promotion || create(:promotion, code: "test")
-      promotion_code = promotion.codes.first || create(:promotion_code, promotion: promotion)
-
-      promotion.activate(order: order, promotion_code: promotion_code)
-      order.order_promotions.create!(promotion: promotion, promotion_code: promotion_code)
-
-      # Complete the order after the promotion has been activated
-      order.refresh_shipment_rates
-      order.update_column(:completed_at, Time.current)
-      order.update_column(:state, "complete")
-    end
-  end
 end

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

@@ -11,6 +11,10 @@ FactoryGirl.define do
     state 'checkout'
     response_code '12345'
 
+    trait :completed do
+      state 'completed'
+    end
+
     trait :failing do
       response_code '00000'
       association(:source, :failing, { factory: :credit_card })