solidus_stripe 5.0.0.alpha.1 → 5.0.0.rc.2

data/lib/generators/solidus_stripe/install/templates/app/views/checkouts/payment/_stripe.html.erb

@@ -1,22 +1,57 @@
-<% payment_element_options = {
-  mode: 'payment',
-  amount: SolidusStripe::MoneyToStripeAmountConverter.to_stripe_amount(
-    current_order.display_order_total_after_store_credit.money.fractional,
-    current_order.currency,
-  ),
-  currency: current_order.currency.downcase,
-  paymentMethodCreation: 'manual',
-  captureMethod: payment_method.auto_capture? ? 'automatic' : 'manual',
-  # Fully customizable with appearance API.
-  # https://stripe.com/docs/elements/appearance-api
-  # appearance: {},
-} %>
+<%
+  bill_address = current_order.bill_address
+  options = {
+    elementsInitialization: {
+      mode: 'payment',
+      amount: SolidusStripe::MoneyToStripeAmountConverter.to_stripe_amount(
+        current_order.display_order_total_after_store_credit.money.fractional,
+        current_order.currency,
+      ),
+      currency: current_order.currency.downcase,
+      paymentMethodCreation: 'manual',
+      captureMethod: payment_method.auto_capture? ? 'automatic' : 'manual',
+
+      # If you want to allow the display/use of specific payment method types
+      # activated from the Stripe Dashboard, you can use this option.
+      #
+      # For a complete list of payment method types available on Stripe:
+      # https://stripe.com/docs/payments/payment-methods/overview
+      # https://stripe.com/docs/api/payment_methods/object#payment_method_object-type
+      #
+      # To activate/deactivate Stripe payment methods:
+      # https://dashboard.stripe.com/settings/payment_methods
+      # paymentMethodTypes: ['card', 'sepa_debit'],
+
+      # Fully customizable with appearance API.
+      # https://stripe.com/docs/elements/appearance-api
+      # appearance: {},
+    },
+    paymentElementCreation: {
+      layout: "tabs",
+      defaultValues: {
+        billingDetails: {
+          name: bill_address.name,
+          email: current_order.email,
+          phone: bill_address.phone,
+          address: {
+            line1: bill_address.address1,
+            line2: bill_address.address2,
+            city: bill_address.city,
+            state: bill_address.state.abbr,
+            country: bill_address.country.iso,
+            postal_code: bill_address.zipcode,
+          }
+        }
+      },
+    },
+  }
+ %>
 
 <div
   class="solidus-stripe-payment"
   data-controller="solidus-stripe-payment"
   data-solidus-stripe-payment-publishable-key-value="<%= payment_method.preferred_publishable_key %>"
-  data-solidus-stripe-payment-payment-element-options-value="<%= payment_element_options.to_json %>"
+  data-solidus-stripe-payment-options-value="<%= options.to_json %>"
   data-solidus-stripe-payment-radio-selector-value="#order_payments_attributes__payment_method_id_<%= payment_method.id %>"
   data-solidus-stripe-payment-submit-selector-value="#checkout_form_payment [type='submit']"
   data-action="submit@window->solidus-stripe-payment#handleSubmit"

data/lib/generators/solidus_stripe/install/templates/app/views/orders/payment_info/_stripe.html.erb

@@ -1,7 +1,19 @@
-<% stripe_payment_method = payment.source.stripe_payment_method %>
+<%
+  stripe_payment_method = payment.source.stripe_payment_method
+
+  # https://stripe.com/docs/api/payment_methods/object#payment_method_object-type
+  partial_base = "checkouts/existing_payment/stripe"
+  payment_type = stripe_payment_method.type
+
+  # Fallback on the default partial if a specialized partial is not available.
+  payment_type = 'default' if lookup_context.find_all("#{partial_base}/_#{payment_type}").none?
+%>
+
 <%= render(
-  "checkouts/existing_payment/stripe/#{stripe_payment_method.type}",
-  stripe_payment_method: stripe_payment_method
+  "#{partial_base}/#{payment_type}",
+  stripe_payment_method: stripe_payment_method,
+  partial_base: partial_base,
+  payment_type: payment_type
 ) %>
 
 <% if current_order&.confirm? %>

data/lib/solidus_stripe/refunds_synchronizer.rb

@@ -32,52 +32,54 @@ module SolidusStripe
   class RefundsSynchronizer
     include MoneyToStripeAmountConverter
 
-    # Metadata key used to mark refunds that shouldn't be synced back to Solidus.
-    # @return [Symbol]
     SKIP_SYNC_METADATA_KEY = :solidus_skip_sync
+    private_constant :SKIP_SYNC_METADATA_KEY
 
-    # Metadata value used to mark refunds that shouldn't be synced back to Solidus.
-    # @return [String]
     SKIP_SYNC_METADATA_VALUE = 'true'
+    private_constant :SKIP_SYNC_METADATA_VALUE
+
+    # Metadata used to mark Stripe refunds that shouldn't be synced back to Solidus.
+    # @return [Hash]
+    def self.skip_sync_metadata
+      { SKIP_SYNC_METADATA_KEY => SKIP_SYNC_METADATA_VALUE }
+    end
 
     # @param payment_method [SolidusStripe::PaymentMethod]
     def initialize(payment_method)
       @payment_method = payment_method
     end
 
-    # @param payment_intent_id [String]
-    def call(payment_intent_id)
-      payment = Spree::Payment.find_by!(response_code: payment_intent_id)
+    # @param stripe_payment_intent_id [String]
+    def call(stripe_payment_intent_id)
+      payment = @payment_method.payments.find_by!(response_code: stripe_payment_intent_id)
 
-      stripe_refunds(payment_intent_id)
-        .select(&method(:stripe_refund_needs_sync?))
-        .map(
-          &method(:create_refund).curry[payment]
-        )
+      stripe_refunds(stripe_payment_intent_id)
+        .select { stripe_refund_needs_sync?(_1) }
+        .map { create_refund(payment, _1) }
     end
 
     private
 
-    def stripe_refunds(payment_intent_id)
+    def stripe_refunds(stripe_payment_intent_id)
       @payment_method.gateway.request do
-        Stripe::Refund.list(payment_intent: payment_intent_id).data
+        Stripe::Refund.list(payment_intent: stripe_payment_intent_id).data
       end
     end
 
-    def stripe_refund_needs_sync?(refund)
-      originated_outside_solidus = refund.metadata[SKIP_SYNC_METADATA_KEY] != SKIP_SYNC_METADATA_VALUE
-      not_already_synced = Spree::Refund.find_by(transaction_id: refund.id).nil?
+    def stripe_refund_needs_sync?(stripe_refund)
+      originated_outside_solidus = stripe_refund.metadata[SKIP_SYNC_METADATA_KEY] != SKIP_SYNC_METADATA_VALUE
+      not_already_synced = Spree::Refund.find_by(transaction_id: stripe_refund.id).nil?
 
       originated_outside_solidus && not_already_synced
     end
 
-    def create_refund(payment, refund)
+    def create_refund(payment, stripe_refund)
       Spree::Refund.create!(
         payment: payment,
-        amount: refund_decimal_amount(refund),
-        transaction_id: refund.id,
+        amount: refund_decimal_amount(stripe_refund),
+        transaction_id: stripe_refund.id,
         reason: SolidusStripe::PaymentMethod.refund_reason
-      ).tap(&method(:log_refund).curry[payment])
+      ).tap { log_refund(payment, _1) }
     end
 
     def log_refund(payment, refund)
@@ -88,9 +90,9 @@ module SolidusStripe
       )
     end
 
-    def refund_decimal_amount(refund)
-      to_solidus_amount(refund.amount, refund.currency)
-        .then { |amount| solidus_subunit_to_decimal(amount, refund.currency) }
+    def refund_decimal_amount(stripe_refund)
+      to_solidus_amount(stripe_refund.amount, stripe_refund.currency)
+        .then { |amount| solidus_subunit_to_decimal(amount, stripe_refund.currency) }
     end
   end
 end

data/lib/solidus_stripe/testing_support/factories.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :stripe_payment_method, class: 'SolidusStripe::PaymentMethod' do
+  factory :solidus_stripe_payment_method, class: 'SolidusStripe::PaymentMethod' do
     type { "SolidusStripe::PaymentMethod" }
     name { "Stripe Payment Method" }
     preferences {
@@ -16,13 +16,13 @@ FactoryBot.define do
     }
   end
 
-  factory :stripe_payment_source, class: 'SolidusStripe::PaymentSource' do
-    association :payment_method, factory: :stripe_payment_method
+  factory :solidus_stripe_payment_source, class: 'SolidusStripe::PaymentSource' do
+    association :payment_method, factory: :solidus_stripe_payment_method
     stripe_payment_method_id { "pm_#{SecureRandom.uuid.delete('-')}" }
   end
 
-  factory :stripe_payment, parent: :payment do
-    association :payment_method, factory: :stripe_payment_method
+  factory :solidus_stripe_payment, parent: :payment do
+    association :payment_method, factory: :solidus_stripe_payment_method
     amount { order.outstanding_balance }
     response_code { "pi_#{SecureRandom.uuid.delete('-')}" }
     state { 'checkout' }
@@ -33,7 +33,7 @@ FactoryBot.define do
 
     source {
       create(
-        :stripe_payment_source,
+        :solidus_stripe_payment_source,
         payment_method: payment_method,
         stripe_payment_method_id: stripe_payment_method_id
       )
@@ -44,7 +44,7 @@ FactoryBot.define do
 
       after(:create) do |payment, _evaluator|
         create(
-          :stripe_payment_log_entry,
+          :solidus_stripe_payment_log_entry,
           :authorize,
           source: payment
         )
@@ -56,7 +56,7 @@ FactoryBot.define do
 
       after(:create) do |payment, _evaluator|
         create(
-          :stripe_payment_log_entry,
+          :solidus_stripe_payment_log_entry,
           :autocapture,
           source: payment
         )
@@ -64,19 +64,19 @@ FactoryBot.define do
     end
   end
 
-  factory :stripe_payment_intent, class: 'SolidusStripe::PaymentIntent' do
+  factory :solidus_stripe_payment_intent, class: 'SolidusStripe::PaymentIntent' do
     association :order
-    association :payment_method, factory: :stripe_payment_method
+    association :payment_method, factory: :solidus_stripe_payment_method
     stripe_intent_id { "pm_#{SecureRandom.uuid.delete('-')}" }
   end
 
-  factory :stripe_slug_entry, class: 'SolidusStripe::SlugEntry' do
-    association :payment_method, factory: :stripe_payment_method
+  factory :solidus_stripe_slug_entry, class: 'SolidusStripe::SlugEntry' do
+    association :payment_method, factory: :solidus_stripe_payment_method
     slug { SecureRandom.hex(16) }
   end
 
-  factory :stripe_customer, class: 'SolidusStripe::Customer' do
-    association :payment_method, factory: :stripe_payment_method
+  factory :solidus_stripe_customer, class: 'SolidusStripe::Customer' do
+    association :payment_method, factory: :solidus_stripe_payment_method
     association :source, factory: :user
     stripe_id { "cus_#{SecureRandom.uuid.delete('-')}" }
 
@@ -85,7 +85,7 @@ FactoryBot.define do
     end
   end
 
-  factory :stripe_payment_log_entry, class: 'Spree::LogEntry' do
+  factory :solidus_stripe_payment_log_entry, class: 'Spree::LogEntry' do
     transient do
       success { true }
       message { nil }
@@ -134,10 +134,10 @@ FactoryBot.define do
     }
   end
 
-  factory :order_with_stripe_payment, parent: :order do
+  factory :solidus_stripe_order, parent: :order do
     transient do
       amount { 10 }
-      payment_method { build(:stripe_payment_method) }
+      payment_method { build(:solidus_stripe_payment_method) }
       stripe_payment_method_id { "pm_#{SecureRandom.uuid.delete('-')}" }
     end
 
@@ -145,7 +145,7 @@ FactoryBot.define do
 
     after(:create) do |order, evaluator|
       build(
-        :stripe_payment,
+        :solidus_stripe_payment,
         amount: evaluator.amount,
         order: order,
         payment_method: evaluator.payment_method,

data/lib/solidus_stripe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusStripe
-  VERSION = '5.0.0.alpha.1'
+  VERSION = '5.0.0.rc.2'
 end

data/lib/solidus_stripe/webhook/event.rb

@@ -13,6 +13,7 @@ module SolidusStripe
       PREFIX = "stripe."
       private_constant :PREFIX
 
+      # /!\ This list must be kept in sync with the list of events in the README
       CORE_EVENTS = Set[*%i[
         payment_intent.succeeded
         payment_intent.payment_failed
@@ -31,7 +32,7 @@ module SolidusStripe
             payment_method.preferred_webhook_endpoint_signing_secret,
             tolerance: tolerance
           )
-          new(stripe_event: stripe_event, spree_payment_method: payment_method)
+          new(stripe_event: stripe_event, payment_method: payment_method)
         rescue ActiveRecord::RecordNotFound, Stripe::SignatureVerificationError, JSON::ParserError
           nil
         end
@@ -53,12 +54,12 @@ module SolidusStripe
       attr_reader :omnes_event_name
 
       # @attr_reader [SolidusStripe::PaymentMethod]
-      attr_reader :spree_payment_method
+      attr_reader :payment_method
 
       # @api private
-      def initialize(stripe_event:, spree_payment_method:)
+      def initialize(stripe_event:, payment_method:)
         @stripe_event = stripe_event
-        @spree_payment_method = spree_payment_method
+        @payment_method = payment_method
         @omnes_event_name = :"#{PREFIX}#{stripe_event.type}"
       end
 
@@ -72,7 +73,7 @@ module SolidusStripe
       def payload
         {
           "stripe_event" => @stripe_event.as_json,
-          "spree_payment_method_id" => @spree_payment_method.id
+          "payment_method_id" => @payment_method.id
         }
       end
 

data/solidus_stripe.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'solidus_core', ['>= 3.2', '< 4']
+  spec.add_dependency 'solidus_core', ['>= 3.2', '< 5']
   spec.add_dependency 'solidus_support', '~> 0.8'
 
   spec.add_dependency 'stripe', '~> 8.0'

data/spec/lib/solidus_stripe/refunds_synchronizer_spec.rb

@@ -5,8 +5,8 @@ require "solidus_stripe/refunds_synchronizer"
 require "solidus_stripe/seeds"
 
 RSpec.describe SolidusStripe::RefundsSynchronizer do
-  def mock_refund_list(payment_intent_id, refunds)
-    allow(Stripe::Refund).to receive(:list).with(payment_intent: payment_intent_id).and_return(
+  def mock_stripe_refund_list(stripe_payment_intent_id, refunds)
+    allow(Stripe::Refund).to receive(:list).with(payment_intent: stripe_payment_intent_id).and_return(
       Stripe::ListObject.construct_from(
         data: refunds
       )
@@ -14,13 +14,13 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
   end
 
   describe "#call" do
-    let(:payment_method) { create(:stripe_payment_method) }
+    let(:payment_method) { create(:solidus_stripe_payment_method) }
 
     it "creates missing refunds on Solidus" do
       SolidusStripe::Seeds.refund_reasons
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 1000,
@@ -29,16 +29,16 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
         }
       ])
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       expect(payment.refunds.count).to eq(1)
     end
 
     it "uses the stripe refund id as created Solidus refund transaction_id field" do
       SolidusStripe::Seeds.refund_reasons
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 1000,
@@ -47,7 +47,7 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
         }
       ])
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       refund = payment.refunds.first
       expect(refund.transaction_id).to eq("re_123")
@@ -55,9 +55,9 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
 
     it "uses the stripe amount as created Solidus refund amount" do
       SolidusStripe::Seeds.refund_reasons
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 1000,
@@ -66,7 +66,7 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
         }
       ])
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       refund = payment.refunds.first
       expect(refund.amount).to eq(10)
@@ -74,9 +74,9 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
 
     it "uses the configured reason for created Solidus refunds" do
       SolidusStripe::Seeds.refund_reasons
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 1000,
@@ -85,16 +85,16 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
         }
       ])
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       refund = payment.refunds.first
       expect(refund.reason).to eq(SolidusStripe::PaymentMethod.refund_reason)
     end
 
     it "skips the creation of Solidus refunds with transaction_id matching some stripe refund id" do
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 1000,
@@ -104,15 +104,15 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
       ])
       create(:refund, amount: 10, payment: payment, transaction_id: "re_123")
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       expect(payment.refunds.count).to be(1)
     end
 
     it "skips the creation of Solidus refunds when specified in their metadata" do
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 1000,
@@ -123,16 +123,16 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
         }
       ])
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       expect(payment.refunds.count).to be(0)
     end
 
     it "creates multiple Solidus refunds if needed" do
       SolidusStripe::Seeds.refund_reasons
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 500,
@@ -147,16 +147,16 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
         }
       ])
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       expect(payment.refunds.count).to be(2)
     end
 
     it "creates only the missing Solidus refunds when there're multiple Stripe refunds" do
       SolidusStripe::Seeds.refund_reasons
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 500,
@@ -172,16 +172,16 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
       ])
       create(:refund, amount: 5, payment: payment, transaction_id: "re_123")
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       expect(payment.refunds.pluck(:transaction_id)).to contain_exactly("re_123", "re_456")
     end
 
     it "adds a log entry for created Solidus refund" do
       SolidusStripe::Seeds.refund_reasons
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 1000,
@@ -190,16 +190,16 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
         }
       ])
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       expect(payment.log_entries.count).to eq(1)
     end
 
     it "sets created log entry as successful" do
       SolidusStripe::Seeds.refund_reasons
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 1000,
@@ -208,7 +208,7 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
         }
       ])
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       expect(
         payment.log_entries.first.parsed_details.success?
@@ -217,9 +217,9 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
 
     it "uses a meaningful message with the refunded amount in created log entry" do
       SolidusStripe::Seeds.refund_reasons
-      payment_intent_id = "pi_123"
-      payment = create(:payment, response_code: payment_intent_id, amount: 10, payment_method: payment_method)
-      mock_refund_list(payment_intent_id, [
+      stripe_payment_intent_id = "pi_123"
+      payment = create(:payment, response_code: stripe_payment_intent_id, amount: 10, payment_method: payment_method)
+      mock_stripe_refund_list(stripe_payment_intent_id, [
         {
           id: "re_123",
           amount: 500,
@@ -228,7 +228,7 @@ RSpec.describe SolidusStripe::RefundsSynchronizer do
         }
       ])
 
-      described_class.new(payment_method).call(payment_intent_id)
+      described_class.new(payment_method).call(stripe_payment_intent_id)
 
       expect(
         payment.log_entries.first.parsed_details.message

data/spec/lib/solidus_stripe/webhook/event_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe SolidusStripe::Webhook::Event do
     let(:context) do
       SolidusStripe::Webhook::EventWithContextFactory.from_data(
         data: SolidusStripe::Webhook::DataFixtures.charge_succeeded,
-        payment_method: create(:stripe_payment_method)
+        payment_method: create(:solidus_stripe_payment_method)
       )
     end
 
@@ -88,24 +88,24 @@ RSpec.describe SolidusStripe::Webhook::Event do
     let(:context) do
       SolidusStripe::Webhook::EventWithContextFactory.new(
         data: SolidusStripe::Webhook::DataFixtures.charge_succeeded,
-        payment_method: create(:stripe_payment_method)
+        payment_method: create(:solidus_stripe_payment_method)
       )
     end
 
     it "sets the payment method" do
-      event = described_class.new(stripe_event: context.stripe_object, spree_payment_method: context.payment_method)
+      event = described_class.new(stripe_event: context.stripe_object, payment_method: context.payment_method)
 
-      expect(event.spree_payment_method).to be(context.payment_method)
+      expect(event.payment_method).to be(context.payment_method)
     end
 
     it "sets the omnes_event_name from the event type field" do
-      event = described_class.new(stripe_event: context.stripe_object, spree_payment_method: context.payment_method)
+      event = described_class.new(stripe_event: context.stripe_object, payment_method: context.payment_method)
 
       expect(event.omnes_event_name).to be(:"stripe.charge.succeeded")
     end
 
     it "delegates all other methods to the stripe event" do
-      event = described_class.new(stripe_event: context.stripe_object, spree_payment_method: context.payment_method)
+      event = described_class.new(stripe_event: context.stripe_object, payment_method: context.payment_method)
 
       expect(event.type).to eq("charge.succeeded")
     end
@@ -115,20 +115,20 @@ RSpec.describe SolidusStripe::Webhook::Event do
     let(:context) do
       SolidusStripe::Webhook::EventWithContextFactory.new(
         data: SolidusStripe::Webhook::DataFixtures.charge_succeeded,
-        payment_method: create(:stripe_payment_method)
+        payment_method: create(:solidus_stripe_payment_method)
       )
     end
 
     it "includes stripe event Hash representation" do
-      event = described_class.new(stripe_event: context.stripe_object, spree_payment_method: context.payment_method)
+      event = described_class.new(stripe_event: context.stripe_object, payment_method: context.payment_method)
 
       expect(event.payload["stripe_event"]).to eq(context.stripe_object.as_json)
     end
 
     it "includes spree payment method id" do
-      event = described_class.new(stripe_event: context.stripe_object, spree_payment_method: context.payment_method)
+      event = described_class.new(stripe_event: context.stripe_object, payment_method: context.payment_method)
 
-      expect(event.payload["spree_payment_method_id"]).to be(context.payment_method.id)
+      expect(event.payload["payment_method_id"]).to be(context.payment_method.id)
     end
   end
 end