solidus_core 2.11.17 → 3.0.0.rc2

data/lib/spree/core/search/base.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/deprecation'
-
 module Spree
   module Core
     module Search
@@ -16,17 +14,6 @@ module Spree
           prepare(params)
         end
 
-        def current_currency=(currency)
-          self.pricing_options = Spree::Config.pricing_options_class.new(
-            pricing_options.desired_attributes.merge(currency: currency)
-          )
-        end
-
-        def current_currency
-          pricing_options.currency
-        end
-        deprecate :current_currency, :current_currency=, deprecator: Spree::Deprecation
-
         def retrieve_products
           @products = get_base_scope
           curr_page = @properties[:page] || 1
@@ -37,19 +24,6 @@ module Spree
           @products = @products.page(curr_page).per(@properties[:per_page])
         end
 
-        def method_missing(name)
-          if @properties.key?(name)
-            Spree::Deprecation.warn "Accessing Searcher's #{name} property using #{self.class.name}##{name} is deprecated without replacement"
-            @properties[name]
-          else
-            super
-          end
-        end
-
-        def respond_to_missing?(name)
-          @properties.key?(name) || super(name)
-        end
-
         protected
 
         def get_base_scope

data/lib/spree/core/state_machines.rb

@@ -68,17 +68,8 @@ module Spree
 
       def order
         @order ||= begin
-          if Spree::Config.use_legacy_order_state_machine
-            Spree::Deprecation.warn(
-              "Spree::Order state machine defined in Spree::Order::Checkout is deprecated. " \
-              "Future versions of Solidus will use Spree::Core::StateMachines::Order}",
-              caller
-            )
-            'Spree::Order::Checkout'
-          else
-            require 'spree/core/state_machines/order'
-            'Spree::Core::StateMachines::Order'
-          end
+          require 'spree/core/state_machines/order'
+          'Spree::Core::StateMachines::Order'
         end
 
         @order.constantize

data/lib/spree/core/validators/email.rb

@@ -12,7 +12,7 @@ module Spree
   #     end
   #
   class EmailValidator < ActiveModel::EachValidator
-    EMAIL_REGEXP = URI::MailTo::EMAIL_REGEXP
+    EMAIL_REGEXP = /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
 
     def validate_each(record, attribute, value)
       unless EMAIL_REGEXP.match? value

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.11.17"
+  VERSION = "3.0.0.rc2"
 
   def self.solidus_version
     VERSION

data/lib/spree/core.rb

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
-require 'rails/all'
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "active_job/railtie"
+require "active_model/railtie"
+require "active_record/railtie"
+require "active_storage/engine"
+require "sprockets/railtie"
+
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
@@ -9,12 +17,10 @@ require 'kaminari/activerecord'
 require 'mail'
 require 'monetize'
 require 'paperclip'
-require 'paranoia'
 require 'ransack'
 require 'state_machines-activerecord'
 
 require 'spree/deprecation'
-require 'spree/paranoia_deprecations'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
@@ -47,9 +53,6 @@ module Spree
 
   module Core
     class GatewayError < RuntimeError; end
-
-    include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-    deprecate_constant 'DestroyWithOrdersError', ActiveRecord::DeleteRestrictionError, deprecator: Spree::Deprecation
   end
 end
 
@@ -61,7 +64,6 @@ require 'spree/core/environment_extension'
 require 'spree/core/environment/calculators'
 require 'spree/core/environment/promotions'
 require 'spree/core/environment'
-require 'spree/promo/environment'
 require 'spree/migrations'
 require 'spree/migration_helpers'
 require 'spree/event'
@@ -75,7 +77,6 @@ require 'spree/permitted_attributes'
 require 'spree/core/importer'
 require 'spree/core/permalinks'
 require 'spree/core/product_duplicator'
-require 'spree/core/current_store'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/current_host'

data/lib/spree/event/configuration.rb

@@ -7,11 +7,6 @@ module Spree
         @subscriber_registry ||= Spree::Event::SubscriberRegistry.new
       end
 
-      def subscribers
-        Spree::Deprecation.warn("`Spree::Config.events.subscribers` is deprecated. Please use `Spree::Config.events.subscriber_registry`.", caller)
-        subscriber_registry.send(:registry).keys.map { |module_name| module_name.constantize }
-      end
-
       attr_writer :adapter, :suffix, :autoload_subscribers
 
       def autoload_subscribers

data/lib/spree/event/subscriber.rb

@@ -59,14 +59,6 @@ module Spree
       #     end
       #   end
       def event_action(method_name, event_name: nil)
-        mattr_writer "#{method_name}_handler"
-
-        define_method "#{method_name}_handler" do
-          Spree::Deprecation.warn("#{name}.#{method_name}_handler and #{name}.#{method_name}_handler= from the old events mapping interface are deprecated. Please use the new mapping stored in Spree::Event.subscribers.", caller)
-
-          class_variable_get("@@#{method_name}_handler")
-        end
-
         event_actions[method_name] = (event_name || method_name).to_s
       end
 
@@ -89,16 +81,6 @@ module Spree
       def deactivate(event_action_name = nil)
         Spree::Event.subscriber_registry.deactivate_subscriber(self, event_action_name)
       end
-
-      def subscribe!
-        Spree::Deprecation.warn("#{self}.subscribe! is deprecated. Please use `#{self}.activate`.", caller)
-        activate
-      end
-
-      def unsubscribe!
-        Spree::Deprecation.warn("#{self}.unsubscribe! is deprecated. Please use `#{self}.deactivate`.", caller)
-        deactivate
-      end
     end
   end
 end

data/lib/spree/event/subscriber_registry.rb

@@ -35,7 +35,9 @@ module Spree
             subscription = Spree::Event.subscribe(event_name) { |event| subscriber.send(event_action, event) }
 
             # deprecated mappings, to be removed when Solidus 2.10 is not supported anymore:
-            subscriber.send("#{event_action}_handler=", subscription)
+            if subscriber.respond_to?("#{event_action}_handler=")
+              subscriber.send("#{event_action}_handler=", subscription)
+            end
 
             registry[subscriber.name][event_action] = subscription
           end

data/lib/spree/event.rb

@@ -29,20 +29,6 @@ module Spree
       end
     end
 
-    # @deprecated Loads all Solidus' core and application's event subscribers files.
-    # The latter are loaded automatically only when the preference
-    # Spree::Config.events.autoload_subscribers is set to a truthy value.
-    #
-    # Files must be placed under the directory `app/subscribers` and their
-    # name must end with `_subscriber.rb`.
-    #
-    # Loading the files has the side effect of adding their module to the
-    # list in Spree::Event.subscribers.
-    def require_subscriber_files
-      Spree::Deprecation.warn("#{self}.require_subscriber_files is deprecated and will be removed in Solidus 3.0.", caller)
-      subscriber_registry.send(:require_subscriber_files)
-    end
-
     # Subscribe to an event with the given name. The provided block is executed
     # every time the subscribed event is fired.
     #
@@ -114,23 +100,6 @@ module Spree
       Spree::Config.events.adapter
     end
 
-    # The suffix used for namespacing Solidus events, defaults to
-    # `.spree`
-    #
-    # @see Spree::Event::Configuration#suffix
-    def suffix
-      Spree::Deprecation.warn "This method is deprecated and will be removed. Please use Event::Adapters::ActiveSupportNotifications#suffix"
-      Spree::Config.events.suffix
-    end
-
-    # @deprecated
-    # @!attribute [r] subscribers
-    #   @return [Array<Spree::Event::Subscriber>] A list of subscribers used to support class reloading for Spree::Event::Subscriber instances
-    def subscribers
-      Spree::Deprecation.warn("`#{self}.subscribers` is deprecated. Please use `#{self}.subscriber_registry` instead.", caller)
-      Spree::Config.events.subscribers
-    end
-
     # @!attribute [r] subscribers
     #   @return <Spree::Event::SubscriberRegistry> The registry for supporting class reloading for Spree::Event::Subscriber instances
     def subscriber_registry

data/lib/spree/i18n.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'i18n'
-require 'active_support/core_ext/array/extract_options'
-require 'action_view'
 
 module Spree
   def self.i18n_available_locales
@@ -11,29 +9,9 @@ module Spree
     end
   end
 
-  class TranslationHelperWrapper # :nodoc:
-    include ActionView::Helpers::TranslationHelper
-  end
-
   # This value is used as a count for the pluralization helpers related to I18n
   # ex: Spree::Order.model_name.human(count: Spree::I18N_GENERIC_PLURAL)
   # Related to Solidus issue #1164, this is needed to avoid problems with
   # some pluralization calculators
   I18N_GENERIC_PLURAL = 2.1
-
-  class << self
-    # Add spree namespace and delegate to Rails TranslationHelper for some nice
-    # 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
-
-    alias_method :t, :translate
-  end
 end

data/lib/spree/money.rb

@@ -6,7 +6,6 @@ module Spree
   class Money
     include Comparable
     DifferentCurrencyError = Class.new(StandardError)
-    RUBY_NUMERIC_STRING = /\A-?\d+(\.\d+)?\z/
 
     class <<self
       attr_accessor :default_formatting_rules
@@ -37,15 +36,8 @@ module Spree
         @money = amount
       else
         currency = (options[:currency] || Spree::Config[:currency])
-        if amount.to_s =~ RUBY_NUMERIC_STRING
-          @money = Monetize.from_string(amount, currency)
-        else
-          @money = Spree::Money.parse_to_money(amount, currency)
-          Spree::Deprecation.warn <<-WARN.squish, caller
-            Spree::Money was initialized with #{amount.inspect}, which will not be supported in the future.
-            Instead use Spree::Money.new(#{@money.to_s.inspect}, options) or Spree::Money.parse(#{amount.inspect})
-          WARN
-        end
+
+        @money = Monetize.from_string(amount, currency)
       end
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
@@ -80,14 +72,7 @@ module Spree
     def to_html(options = { html_wrap: true })
       output = format(options)
       # 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].inspect}),
-          which will not be supported in the future.
-          Instead use :html_wrap e.g. Spree::Money#to_html(html_wrap: #{options[:html].inspect})
-        WARN
-      end
-      if options[:html_wrap] || options[:html]
+      if options[:html_wrap]
         output = output.html_safe
       end
       output

data/lib/spree/permitted_attributes.rb

@@ -39,8 +39,7 @@ module Spree
     mattr_reader(*ATTRIBUTES)
 
     @@address_attributes = [
-      :id, :name, :firstname, :lastname, :first_name, :last_name,
-      :address1, :address2, :city, :country_id, :state_id,
+      :id, :name, :address1, :address2, :city, :country_id, :state_id,
       :zipcode, :phone, :state_name, :country_iso, :alternative_phone, :company,
       country: [:iso, :name, :iso3, :iso_name],
       state: [:name, :abbr]
@@ -52,13 +51,7 @@ module Spree
       :month, :year, :expiry, :first_name, :last_name, :name
     ]
 
-    @@customer_return_attributes = [
-      :stock_location_id, return_items_attributes: [
-        :id, :inventory_unit_id, :return_authorization_id, :returned, :amount,
-        :reception_status_event, :acceptance_status, :exchange_variant_id,
-        :resellable, :return_reason_id
-      ]
-    ]
+    @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :amount, :reception_status_event, :acceptance_status, :exchange_variant_id, :resellable]]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
@@ -96,7 +89,7 @@ module Spree
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
-      :existing_card_id, :wallet_payment_source_id, address_attributes: address_attributes
+      :wallet_payment_source_id, address_attributes: address_attributes
     ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
@@ -149,61 +142,11 @@ module Spree
     ]
 
     @@checkout_payment_attributes = [
-      :coupon_code,
       payments_attributes: payment_attributes + [
         source_attributes: source_attributes
       ]
     ]
 
     @@checkout_confirm_attributes = []
-
-    def self.checkout_attributes
-      Spree::Deprecation.warn <<-WARN.squish, caller
-        checkout_attributes is deprecated, please use the permitted
-        attributes set for the specific step that needs to be updated.
-
-        E.g. permitted_checkout_address_attributes
-      WARN
-
-      CheckoutAdditionalAttributes.new(
-        checkout_address_attributes +
-        checkout_delivery_attributes +
-        checkout_payment_attributes +
-        checkout_confirm_attributes
-      )
-    end
-  end
-
-  class CheckoutAdditionalAttributes < Array
-    def <<(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :<<)
-    end
-
-    def push(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :push)
-    end
-    alias append push
-
-    def prepend(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :prepend)
-    end
-    alias unshift prepend
-
-    private
-
-    def inject_attributes_to_all_steps(attributes, method_name)
-      attributes.each do |attribute|
-        PermittedAttributes.checkout_address_attributes.send(method_name, attribute)
-        PermittedAttributes.checkout_delivery_attributes.send(method_name, attribute)
-        PermittedAttributes.checkout_payment_attributes.send(method_name, attribute)
-        PermittedAttributes.checkout_confirm_attributes.send(method_name, attribute)
-      end
-    end
   end
 end

data/lib/spree/testing_support/blacklist_urls.rb

@@ -5,7 +5,7 @@ module Spree
     module BlacklistUrls
       def setup_url_blacklist(browser)
         if browser.respond_to?(:url_blacklist)
-          browser.url_blacklist = ['https://fonts.googleapis.com']
+          browser.url_blacklist = ['http://fonts.googleapis.com']
         end
       end
     end

data/lib/spree/testing_support/capybara_ext.rb

@@ -35,18 +35,6 @@ module Spree
         find("td:nth-of-type(#{num})").text
       end
 
-      def fill_in_quantity(table_column, selector, quantity)
-        Spree::Deprecation.warn <<-WARN.strip_heredoc
-          fill_in_quantity is deprecated. Instead use:
-            within(#{table_column.inspect}) do
-              fill_in #{selector.inspect}, with: #{quantity.inspect}
-            end
-        WARN
-        within(table_column) do
-          fill_in selector, with: quantity
-        end
-      end
-
       def select2_search(value, options)
         options = {
           search: value, # by default search for the value
@@ -122,21 +110,6 @@ module Spree
         # find the original.
         find('label:not(.select2-offscreen)', text: /#{Regexp.escape(text)}/i, match: :one)
       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:
-          https://github.com/teamcapybara/capybara#asynchronous-javascript-ajax-and-friends
-        WARN
-
-        counter = 0
-        while page.evaluate_script("typeof($) === 'undefined' || $.active > 0")
-          counter += 1
-          sleep(0.1)
-          raise "AJAX request took longer than 5 seconds." if counter >= 50
-        end
-      end
     end
   end
 end
@@ -156,9 +129,6 @@ RSpec::Matchers.define :have_meta do |name, expected|
   end
 end
 
-# @private
-CapybaraExt = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('CapybaraExt', 'Spree::TestingSupport::CapybaraExt')
-
 RSpec.configure do |c|
   c.include Spree::TestingSupport::CapybaraExt
 end

data/lib/spree/testing_support/controller_requests.rb

@@ -2,23 +2,12 @@
 
 module Spree
   module TestingSupport
-    # A module providing convenience methods to test Solidus controllers
-    # in Rails controller/functional tests. Possibly from inside an
-    # application with a mounted Solidus engine.
-    #
     # *There is generaly no need* to use this module. Instead, in
     # a functional/controller test against a Spree controller, just
     # use standard Rails functionality by including:
     #
     #   routes { Spree::Core::Engine.routes }
     #
-    # And then use standard Rails test `get`, `post` etc methods.
-    #
-    # But some legacy code uses this ControllerRequests helper. It must
-    # be included only in tests against Spree controllers, it will interfere
-    # with tests against local app or other engine controllers, resulting
-    # in ActionController::UrlGenerationError.
-    #
     # To use this module, inside your spec_helper.rb, include this module inside
     # the RSpec.configure block by:
     #
@@ -26,83 +15,12 @@ module Spree
     #   RSpec.configure do |c|
     #     c.include Spree::TestingSupport::ControllerRequests, spree_controller: true
     #   end
-    #
-    # Then, in your controller tests against spree controllers, you can access
-    # tag to use this module, and access spree routes like this:
-    #
-    #   require 'spec_helper'
-    #
-    #   describe Spree::ProductsController, :spree_controller do
-    #     it "can see all the products" do
-    #       spree_get :index
-    #     end
-    #   end
-    #
-    # Use spree_get, spree_post, spree_put or spree_delete to make requests to
-    # the Spree engine, and use regular get, post, put or delete to make
-    # requests to your application.
     module ControllerRequests
       extend ActiveSupport::Concern
 
       included do
         routes { Spree::Core::Engine.routes }
       end
-
-      def spree_get(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "GET")
-      end
-      deprecate spree_get: :get, deprecator: Spree::Deprecation
-
-      # Executes a request simulating POST HTTP method and set/volley the response
-      def spree_post(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "POST")
-      end
-      deprecate spree_post: :post, deprecator: Spree::Deprecation
-
-      # Executes a request simulating PUT HTTP method and set/volley the response
-      def spree_put(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "PUT")
-      end
-      deprecate spree_put: :put, deprecator: Spree::Deprecation
-
-      # Executes a request simulating DELETE HTTP method and set/volley the response
-      def spree_delete(action, parameters = nil, session = nil, flash = nil)
-        process_spree_action(action, parameters, session, flash, "DELETE")
-      end
-      deprecate spree_delete: :delete, deprecator: Spree::Deprecation
-
-      def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :get)
-      end
-      deprecate spree_xhr_get: :get, deprecator: Spree::Deprecation
-
-      def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :post)
-      end
-      deprecate spree_xhr_post: :post, deprecator: Spree::Deprecation
-
-      def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :put)
-      end
-      deprecate spree_xhr_put: :put, deprecator: Spree::Deprecation
-
-      def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
-        process_spree_xhr_action(action, parameters, session, flash, :delete)
-      end
-      deprecate spree_xhr_delete: :delete, deprecator: Spree::Deprecation
-
-      private
-
-      def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
-        parameters ||= {}
-        process(action, method, parameters, session, flash)
-      end
-
-      def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
-        parameters ||= {}
-        parameters.reverse_merge!(format: :json)
-        xml_http_request(method, action, parameters, session, flash)
-      end
     end
   end
 end

data/lib/spree/testing_support/dummy_app/migrations.rb

@@ -27,9 +27,6 @@ module DummyApp
         ActiveRecord::Base.remove_connection
 
         sh 'rake db:reset VERBOSE=false'
-        if ENV['ENABLE_ACTIVE_STORAGE']
-          sh 'rake active_storage:install db:migrate VERBOSE=false'
-        end
 
         # We have a brand new database, so we must re-establish our connection
         ActiveRecord::Base.establish_connection

data/lib/spree/testing_support/dummy_app.rb

@@ -7,6 +7,7 @@ require 'rails'
 require 'active_record/railtie'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
+require 'active_storage/engine'
 
 Rails.env = 'test'
 
@@ -45,7 +46,6 @@ module DummyApp
   end
 
   class Application < ::Rails::Application
-    config.has_many_inverse = true
     config.eager_load = false
     config.cache_classes = true
     config.cache_store = :memory_store
@@ -68,7 +68,7 @@ module DummyApp
 
     config.storage_path = Rails.root.join('tmp', 'storage')
 
-    if ENV['ENABLE_ACTIVE_STORAGE']
+    unless ENV['DISABLE_ACTIVE_STORAGE']
       initializer 'solidus.active_storage' do
         config.active_storage.service_configurations = {
           test: {
@@ -77,7 +77,6 @@ module DummyApp
           }
         }
         config.active_storage.service = :test
-        config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', :mini_magick).to_sym
       end
     end
 
@@ -118,20 +117,11 @@ end
 
 Spree.user_class = 'Spree::LegacyUser'
 Spree.config do |config|
-  config.use_legacy_address_state_validator = false
   config.mails_from = "store@example.com"
-  config.raise_with_invalid_currency = false
-  config.redirect_back_on_unauthorized = true
-  config.run_order_validations_on_order_updater = true
-  config.use_combined_first_and_last_name_in_address = true
-  config.use_legacy_order_state_machine = false
-  config.use_custom_cancancan_actions = false
-  config.consider_actionless_promotion_active = false
-  config.use_legacy_store_credit_reimbursement_category_name = false
-
-  if ENV['ENABLE_ACTIVE_STORAGE']
-    config.image_attachment_module = 'Spree::Image::ActiveStorageAttachment'
-    config.taxon_attachment_module = 'Spree::Taxon::ActiveStorageAttachment'
+
+  if ENV['DISABLE_ACTIVE_STORAGE']
+    config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
+    config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
   end
 end
 

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

@@ -30,7 +30,6 @@ FactoryBot.define do
       after(:build) do |order, evaluator|
         order.line_items << build(
           :line_item,
-          order: order,
           price: evaluator.line_items_price
         )
       end

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

@@ -18,7 +18,6 @@ FactoryBot.define do
 
     amount { 100.00 }
     transaction_id { generate(:refund_transaction_id) }
-    perform_after_create { false }
     payment do
       association(:payment, state: 'completed', amount: payment_amount)
     end