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

data/spec/models/solidus_stripe/customer_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe SolidusStripe::Customer, type: :model do
       it 'returns the customer_id' do
         user = create(:user)
         order = create(:order, user: user)
-        customer = create(:stripe_customer, stripe_id: 'cus_123', source: user)
+        customer = create(:solidus_stripe_customer, stripe_id: 'cus_123', source: user)
 
         expect(customer.source).to be_a(Spree::User)
         expect(
@@ -21,7 +21,7 @@ RSpec.describe SolidusStripe::Customer, type: :model do
       it 'creates the customer from a user' do
         user = create(:user, email: 'registered@example.com')
         order = create(:order, user: user)
-        payment_method = create(:stripe_payment_method)
+        payment_method = create(:solidus_stripe_payment_method)
 
         stripe_customer = Stripe::Customer.construct_from(id: 'cus_123')
         allow(Stripe::Customer).to receive(:create).with(email: 'registered@example.com').and_return(stripe_customer)
@@ -32,7 +32,7 @@ RSpec.describe SolidusStripe::Customer, type: :model do
       end
 
       it 'creates the customer from a guest order' do
-        payment_method = create(:stripe_payment_method)
+        payment_method = create(:solidus_stripe_payment_method)
         order = create(:order, user: nil, email: 'guest@example.com')
 
         stripe_customer = Stripe::Customer.construct_from(id: 'cus_123')

data/spec/models/solidus_stripe/gateway_spec.rb

@@ -5,36 +5,34 @@ require 'solidus_stripe_spec_helper'
 RSpec.describe SolidusStripe::Gateway do
   describe '#authorize' do
     it 'confirms the Stripe payment' do
-      stripe_payment_method = Stripe::PaymentMethod.construct_from(id: "pm_123")
+      stripe_payment_method = Stripe::PaymentMethod.construct_from(id: "pm_123", type: 'card')
       stripe_customer = Stripe::Customer.construct_from(id: 'cus_123')
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123")
 
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
-      order = create(:order_with_stripe_payment,
+      order = create(:solidus_stripe_order,
         amount: 123.45,
         payment_method: payment_method,
         stripe_payment_method_id: stripe_payment_method.id)
       payment = order.payments.last
 
       allow(Stripe::Customer).to receive(:create).and_return(stripe_customer)
-      [:create, :update, :retrieve].each do |method|
+      [:create, :retrieve].each do |method|
         allow(Stripe::PaymentIntent).to receive(method).and_return(stripe_payment_intent)
       end
+      allow(payment.source).to receive(:stripe_payment_method).and_return(stripe_payment_method)
       allow(Stripe::PaymentIntent).to receive(:confirm).with(stripe_payment_intent.id).and_return(stripe_payment_intent)
 
       result = gateway.authorize(123_45, payment.source, currency: 'USD', originator: order.payments.first)
 
-      expect(Stripe::PaymentIntent).to have_received(:update).with(
-        stripe_payment_intent.id,
-        { payment_method: stripe_payment_method.id }
-      )
-
       expect(Stripe::PaymentIntent).to have_received(:create).with(
         amount: 123_45,
         currency: 'USD',
         capture_method: 'manual',
         confirm: false,
+        payment_method: stripe_payment_method.id,
+        payment_method_types: [stripe_payment_method.type],
         metadata: { solidus_order_number: order.number },
         customer: "cus_123",
         setup_future_usage: nil
@@ -45,20 +43,21 @@ RSpec.describe SolidusStripe::Gateway do
     end
 
     it 'generates error response on failure' do
-      stripe_payment_method = Stripe::PaymentMethod.construct_from(id: "pm_123")
+      stripe_payment_method = Stripe::PaymentMethod.construct_from(id: "pm_123", type: 'card')
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123")
 
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
-      order = create(:order_with_stripe_payment,
+      order = create(:solidus_stripe_order,
         amount: 123.45,
         payment_method: payment_method,
         stripe_payment_method_id: stripe_payment_method.id)
       payment = order.payments.last
 
-      [:create, :update, :retrieve].each do |method|
+      [:create, :retrieve].each do |method|
         allow(Stripe::PaymentIntent).to receive(method).and_return(stripe_payment_intent)
       end
+      allow(payment.source).to receive(:stripe_payment_method).and_return(stripe_payment_method)
       allow(Stripe::PaymentIntent).to receive(:confirm).with(
         stripe_payment_intent.id
       ).and_raise(Stripe::StripeError.new("auth error"))
@@ -71,9 +70,9 @@ RSpec.describe SolidusStripe::Gateway do
     end
 
     it "raises if the given amount doesn't match the order total" do
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
-      order = create(:order_with_stripe_payment, amount: 123.45, payment_method: payment_method)
+      order = create(:solidus_stripe_order, amount: 123.45, payment_method: payment_method)
 
       expect { gateway.authorize(10, :source, originator: order.payments.first ) }.to raise_error(
         /custom amount is not supported/
@@ -85,21 +84,21 @@ RSpec.describe SolidusStripe::Gateway do
     it 'captures a pre-authorized Stripe payment' do
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123")
 
-      gateway = build(:stripe_payment_method).gateway
+      gateway = build(:solidus_stripe_payment_method).gateway
       payment = build(:payment, response_code: "pi_123", amount: 123.45)
 
       allow(Stripe::PaymentIntent).to receive(:capture).and_return(stripe_payment_intent)
 
       result = gateway.capture(123_45, "pi_123", originator: payment)
 
-      expect(Stripe::PaymentIntent).to have_received(:capture).with('pi_123')
+      expect(Stripe::PaymentIntent).to have_received(:capture).with('pi_123', { amount: 12_345 })
       expect(result.params).to eq("data" => '{"id":"pi_123"}')
     end
 
     it "raises if the given amount doesn't match the order total" do
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
-      order = create(:order_with_stripe_payment, amount: 123.45, payment_method: payment_method)
+      order = create(:solidus_stripe_order, amount: 123.45, payment_method: payment_method)
 
       expect { gateway.capture(10, :payment_intent_id, originator: order.payments.first ) }.to raise_error(
         /custom amount is not supported/
@@ -107,20 +106,20 @@ RSpec.describe SolidusStripe::Gateway do
     end
 
     it "raises if no payment_intent_id is given" do
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
-      order = create(:order_with_stripe_payment, amount: 123.45, payment_method: payment_method)
+      order = create(:solidus_stripe_order, amount: 123.45, payment_method: payment_method)
 
       expect { gateway.capture(123_45, nil, originator: order.payments.first ) }.to raise_error(
         ArgumentError,
-        /missing payment_intent_id/
+        /missing stripe_payment_intent_id/
       )
     end
 
-    it "raises if payment_intent_id is not valid" do
-      payment_method = build(:stripe_payment_method)
+    it "raises if stripe_payment_intent_id is not valid" do
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
-      order = create(:order_with_stripe_payment, amount: 123.45, payment_method: payment_method)
+      order = create(:solidus_stripe_order, amount: 123.45, payment_method: payment_method)
 
       expect { gateway.capture(123_45, "invalid", originator: order.payments.first ) }.to raise_error(
         ArgumentError,
@@ -131,7 +130,7 @@ RSpec.describe SolidusStripe::Gateway do
 
   describe '#void' do
     it 'voids a payment that hasn not been captured yet' do
-      gateway = build(:stripe_payment_method).gateway
+      gateway = build(:solidus_stripe_payment_method).gateway
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123")
       allow(Stripe::PaymentIntent).to receive(:cancel).and_return(stripe_payment_intent)
 
@@ -141,18 +140,18 @@ RSpec.describe SolidusStripe::Gateway do
       expect(result.params).to eq("data" => '{"id":"pi_123"}')
     end
 
-    it "raises if no payment_intent_id is given" do
-      payment_method = build(:stripe_payment_method)
+    it "raises if no stripe_payment_intent_id is given" do
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
 
       expect { gateway.void(nil) }.to raise_error(
         ArgumentError,
-        /missing payment_intent_id/
+        /missing stripe_payment_intent_id/
       )
     end
 
-    it "raises if payment_intent_id is not valid" do
-      payment_method = build(:stripe_payment_method)
+    it "raises if stripe_payment_intent_id is not valid" do
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
 
       expect { gateway.void("invalid") }.to raise_error(
@@ -164,36 +163,34 @@ RSpec.describe SolidusStripe::Gateway do
 
   describe '#purchase' do
     it 'authorizes and captures in a single operation' do
-      stripe_payment_method = Stripe::PaymentMethod.construct_from(id: "pm_123")
+      stripe_payment_method = Stripe::PaymentMethod.construct_from(id: "pm_123", type: 'card')
       stripe_customer = Stripe::Customer.construct_from(id: 'cus_123')
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123")
 
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
-      order = create(:order_with_stripe_payment,
+      order = create(:solidus_stripe_order,
         amount: 123.45,
         payment_method: payment_method,
         stripe_payment_method_id: stripe_payment_method.id)
       payment = order.payments.last
 
       allow(Stripe::Customer).to receive(:create).and_return(stripe_customer)
-      [:create, :update, :retrieve].each do |method|
+      [:create, :retrieve].each do |method|
         allow(Stripe::PaymentIntent).to receive(method).and_return(stripe_payment_intent)
       end
+      allow(payment.source).to receive(:stripe_payment_method).and_return(stripe_payment_method)
       allow(Stripe::PaymentIntent).to receive(:confirm).with(stripe_payment_intent.id).and_return(stripe_payment_intent)
 
       result = gateway.purchase(123_45, payment.source, currency: 'USD', originator: order.payments.first)
 
-      expect(Stripe::PaymentIntent).to have_received(:update).with(
-        stripe_payment_intent.id,
-        { payment_method: stripe_payment_method.id }
-      )
-
       expect(Stripe::PaymentIntent).to have_received(:create).with(
         amount: 123_45,
         currency: 'USD',
         capture_method: 'automatic',
         confirm: false,
+        payment_method: stripe_payment_method.id,
+        payment_method_types: [stripe_payment_method.type],
         metadata: { solidus_order_number: order.number },
         customer: "cus_123",
         setup_future_usage: nil
@@ -204,20 +201,21 @@ RSpec.describe SolidusStripe::Gateway do
     end
 
     it 'generates error response on failure' do
-      stripe_payment_method = Stripe::PaymentMethod.construct_from(id: "pm_123")
+      stripe_payment_method = Stripe::PaymentMethod.construct_from(id: "pm_123", type: 'card')
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123")
 
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
-      order = create(:order_with_stripe_payment,
+      order = create(:solidus_stripe_order,
         amount: 123.45,
         payment_method: payment_method,
         stripe_payment_method_id: stripe_payment_method.id)
       payment = order.payments.last
 
-      [:create, :update, :retrieve].each do |method|
+      [:create, :retrieve].each do |method|
         allow(Stripe::PaymentIntent).to receive(method).and_return(stripe_payment_intent)
       end
+      allow(payment.source).to receive(:stripe_payment_method).and_return(stripe_payment_method)
       allow(Stripe::PaymentIntent).to receive(:confirm).with(
         stripe_payment_intent.id
       ).and_raise(Stripe::StripeError.new("auth error"))
@@ -230,9 +228,9 @@ RSpec.describe SolidusStripe::Gateway do
     end
 
     it "raises if the given amount doesn't match the order total" do
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
-      order = create(:order_with_stripe_payment, amount: 123.45, payment_method: payment_method)
+      order = create(:solidus_stripe_order, amount: 123.45, payment_method: payment_method)
 
       expect { gateway.purchase(10, :source, originator: order.payments.first ) }.to raise_error(
         /custom amount is not supported/
@@ -242,10 +240,10 @@ RSpec.describe SolidusStripe::Gateway do
 
   describe '#credit' do
     it 'refunds when provided an originator payment' do
-      gateway = build(:stripe_payment_method).gateway
+      gateway = build(:solidus_stripe_payment_method).gateway
       payment = instance_double(Spree::Payment, response_code: 'pi_123', currency: "USD")
-      refund = Stripe::Refund.construct_from(id: "re_123")
-      allow(Stripe::Refund).to receive(:create).and_return(refund)
+      stripe_refund = Stripe::Refund.construct_from(id: "re_123")
+      allow(Stripe::Refund).to receive(:create).and_return(stripe_refund)
 
       result = gateway.credit(123_45, 'pi_123', currency: 'USD', originator: instance_double(
         Spree::Refund,
@@ -260,18 +258,18 @@ RSpec.describe SolidusStripe::Gateway do
       expect(result.params).to eq("data" => '{"id":"re_123"}')
     end
 
-    it "raises if no payment_intent_id is given" do
-      payment_method = build(:stripe_payment_method)
+    it "raises if no stripe_payment_intent_id is given" do
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
 
       expect { gateway.credit(:amount, nil) }.to raise_error(
         ArgumentError,
-        /missing payment_intent_id/
+        /missing stripe_payment_intent_id/
       )
     end
 
-    it "raises if payment_intent_id is not valid" do
-      payment_method = build(:stripe_payment_method)
+    it "raises if stripe_payment_intent_id is not valid" do
+      payment_method = build(:solidus_stripe_payment_method)
       gateway = payment_method.gateway
 
       expect { gateway.credit(:amount, "invalid") }.to raise_error(

data/spec/models/solidus_stripe/payment_intent_spec.rb

@@ -5,7 +5,7 @@ require 'solidus_stripe_spec_helper'
 RSpec.describe SolidusStripe::PaymentIntent do
   describe "#reload" do
     it "reloads the stripe intent" do
-      intent = create(:stripe_payment_intent)
+      intent = create(:solidus_stripe_payment_intent)
       allow(Stripe::PaymentIntent).to receive(:retrieve) do
         Stripe::PaymentIntent.construct_from(id: intent.stripe_intent_id)
       end
@@ -14,4 +14,65 @@ RSpec.describe SolidusStripe::PaymentIntent do
       expect(intent.stripe_intent.object_id).not_to eq(intent.reload.stripe_intent.object_id)
     end
   end
+
+  describe '.usable?' do
+    context 'when the Stripe intent is usable' do
+      it 'returns true' do
+        payment_intent = create(:solidus_stripe_payment_intent, order: create(:order_with_line_items))
+        status = 'requires_payment_method'
+        stripe_intent = Stripe::PaymentIntent.construct_from(
+          id: payment_intent.stripe_intent_id,
+          amount: payment_intent.stripe_order_amount,
+          status: status
+        )
+
+        allow(payment_intent).to receive(:stripe_intent).and_return(stripe_intent)
+
+        expect(payment_intent).to be_usable
+      end
+    end
+
+    context 'when the Stripe intent ID is nil' do
+      it 'returns false' do
+        payment_intent = create(:solidus_stripe_payment_intent,
+          order: create(:order_with_line_items),
+          stripe_intent_id: nil)
+
+        expect(payment_intent).not_to be_usable
+      end
+    end
+
+    context 'when the Stripe intent status is not "requires_payment_method"' do
+      it 'returns false' do
+        payment_intent = create(:solidus_stripe_payment_intent, order: create(:order_with_line_items))
+        status = 'requires_action'
+        stripe_intent = Stripe::PaymentIntent.construct_from(
+          id: payment_intent.stripe_intent_id,
+          amount: payment_intent.stripe_order_amount,
+          status: status
+        )
+
+        allow(payment_intent).to receive(:stripe_intent).and_return(stripe_intent)
+
+        expect(payment_intent).not_to be_usable
+      end
+    end
+
+    context 'when the Stripe intent amount is different from the order amount' do
+      it 'returns false' do
+        payment_intent = create(:solidus_stripe_payment_intent, order: create(:order_with_line_items))
+        status = 'requires_payment_method'
+        amount = payment_intent.stripe_order_amount + 1
+        stripe_intent = Stripe::PaymentIntent.construct_from(
+          id: payment_intent.stripe_intent_id,
+          amount: amount,
+          status: status
+        )
+
+        allow(payment_intent).to receive(:stripe_intent).and_return(stripe_intent)
+
+        expect(payment_intent).not_to be_usable
+      end
+    end
+  end
 end

data/spec/models/solidus_stripe/payment_method_spec.rb

@@ -4,13 +4,13 @@ require 'solidus_stripe_spec_helper'
 
 RSpec.describe SolidusStripe::PaymentMethod do
   it 'has a working factory' do
-    expect(create(:stripe_payment_method)).to be_valid
+    expect(create(:solidus_stripe_payment_method)).to be_valid
   end
 
   describe 'Callbacks' do
     describe 'after_create' do
       it 'creates a webhook endpoint' do
-        payment_method = create(:stripe_payment_method)
+        payment_method = create(:solidus_stripe_payment_method)
 
         expect(payment_method.slug_entry).to be_present
       end
@@ -28,7 +28,7 @@ RSpec.describe SolidusStripe::PaymentMethod do
 
     context 'when the order has a payment intent' do
       it 'fetches the payment intent id' do
-        intent = create(:stripe_payment_intent, stripe_intent_id: 'pi_123')
+        intent = create(:solidus_stripe_payment_intent, stripe_intent_id: 'pi_123')
         payment = build(:payment, response_code: nil, payment_method: intent.payment_method, order: intent.order)
 
         expect(described_class.intent_id_for_payment(payment)).to eq("pi_123")
@@ -43,20 +43,20 @@ RSpec.describe SolidusStripe::PaymentMethod do
   describe '#stripe_dashboard_url' do
     context 'with a payment intent id' do
       it 'generates a dashboard link' do
-        payment_method = build(:stripe_payment_method, preferred_test_mode: false)
+        payment_method = build(:solidus_stripe_payment_method, preferred_test_mode: false)
 
         expect(payment_method.stripe_dashboard_url('pi_123')).to eq("https://dashboard.stripe.com/payments/pi_123")
       end
 
       it 'supports test mode' do
-        payment_method = build(:stripe_payment_method, preferred_test_mode: true)
+        payment_method = build(:solidus_stripe_payment_method, preferred_test_mode: true)
 
         expect(payment_method.stripe_dashboard_url('pi_123')).to eq("https://dashboard.stripe.com/test/payments/pi_123")
       end
     end
 
     it 'returns nil with anything else' do
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
 
       expect(payment_method.stripe_dashboard_url(Object.new)).to eq(nil)
       expect(payment_method.stripe_dashboard_url('')).to eq(nil)
@@ -66,7 +66,7 @@ RSpec.describe SolidusStripe::PaymentMethod do
 
   describe '.with_slug' do
     it 'selects by slug' do
-      payment_method = create(:stripe_payment_method)
+      payment_method = create(:solidus_stripe_payment_method)
 
       expect(described_class.with_slug(payment_method.slug)).to eq([payment_method])
       expect(described_class.with_slug('bad-slug')).to eq([])
@@ -75,14 +75,14 @@ RSpec.describe SolidusStripe::PaymentMethod do
 
   describe '.previous_sources' do
     it 'finds no sources associated with the order' do
-      payment_method = create(:stripe_payment_method)
+      payment_method = create(:solidus_stripe_payment_method)
       order = create(:order, user: nil)
 
       expect(payment_method.previous_sources(order)).to be_empty
     end
 
     it 'finds no sources associated with the user' do
-      payment_method = create(:stripe_payment_method)
+      payment_method = create(:solidus_stripe_payment_method)
       user = create(:user)
       order = create(:order, user: user)
 
@@ -90,7 +90,7 @@ RSpec.describe SolidusStripe::PaymentMethod do
     end
 
     it 'finds sources associated with the user' do
-      payment_source = create(:stripe_payment_source)
+      payment_source = create(:solidus_stripe_payment_source)
       payment_method = payment_source.payment_method
       user = create(:user)
       order = create(:order, user: user.reload)
@@ -103,7 +103,7 @@ RSpec.describe SolidusStripe::PaymentMethod do
 
   describe '.assign_slug' do
     it 'generates a "test" slug for the first payment method in test mode' do
-      payment_method = build(:stripe_payment_method)
+      payment_method = build(:solidus_stripe_payment_method)
 
       payment_method.save!
 
@@ -111,7 +111,7 @@ RSpec.describe SolidusStripe::PaymentMethod do
     end
 
     it 'generates a "live" slug for the first payment method in live mode' do
-      payment_method = build(:stripe_payment_method, preferred_test_mode: false)
+      payment_method = build(:solidus_stripe_payment_method, preferred_test_mode: false)
 
       payment_method.save!
 
@@ -119,8 +119,8 @@ RSpec.describe SolidusStripe::PaymentMethod do
     end
 
     it 'generates a random hex string' do
-      _existing_payment_method = create(:stripe_payment_method)
-      payment_method = create(:stripe_payment_method)
+      _existing_payment_method = create(:solidus_stripe_payment_method)
+      payment_method = create(:solidus_stripe_payment_method)
 
       expect(payment_method.slug).to match(/^[0-9a-f]{32}$/)
     end
@@ -128,10 +128,10 @@ RSpec.describe SolidusStripe::PaymentMethod do
     it 'generates a unique slug' do
       slug = SecureRandom.hex(16)
 
-      create(:stripe_slug_entry, slug: slug)
+      create(:solidus_stripe_slug_entry, slug: slug)
       allow(SecureRandom).to receive(:hex).and_return(slug).and_call_original
 
-      expect(create(:stripe_payment_method).slug).not_to eq(slug)
+      expect(create(:solidus_stripe_payment_method).slug).not_to eq(slug)
     end
   end
 end

data/spec/models/solidus_stripe/payment_source_spec.rb

@@ -4,20 +4,20 @@ require 'solidus_stripe_spec_helper'
 
 RSpec.describe SolidusStripe::PaymentSource, type: :model do
   it 'has a working factory' do
-    expect(create(:stripe_payment_source)).to be_valid
+    expect(create(:solidus_stripe_payment_source)).to be_valid
   end
 
   describe '#stripe_payment_method' do
     it 'retrieves the Stripe::PaymentMethod object if the stripe_payment_method id is present' do
       stripe_payment_method = Stripe::PaymentMethod.construct_from(id: 'pm_123')
-      source = create(:stripe_payment_source, stripe_payment_method_id: 'pm_123')
+      source = create(:solidus_stripe_payment_source, stripe_payment_method_id: 'pm_123')
       allow(Stripe::PaymentMethod).to receive(:retrieve).with('pm_123').and_return(stripe_payment_method)
 
       expect(source.stripe_payment_method).to eq(stripe_payment_method)
     end
 
     it 'returns nil if the stripe_payment_method id is missing' do
-      source = create(:stripe_payment_source, stripe_payment_method_id: nil)
+      source = create(:solidus_stripe_payment_source, stripe_payment_method_id: nil)
 
       expect(source.stripe_payment_method).to be_nil
     end

data/spec/requests/solidus_stripe/intents_controller_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe SolidusStripe::IntentsController, type: :request do
   describe "GET /after_confirmation" do
     context 'when not provided a payment intent' do
       it 'responds with unprocessable entity' do
-        payment_method = create(:stripe_payment_method)
+        payment_method = create(:solidus_stripe_payment_method)
         order = create(:order_ready_to_complete)
         sign_in order.user
 
@@ -16,7 +16,7 @@ RSpec.describe SolidusStripe::IntentsController, type: :request do
 
     context 'when the order is not at "confirm"' do
       it 'redirects to the current order step' do
-        payment_method = create(:stripe_payment_method)
+        payment_method = create(:solidus_stripe_payment_method)
         order = create(:order)
         sign_in order.user
 

data/spec/requests/solidus_stripe/webhooks_controller/charge/refunded_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe SolidusStripe::WebhooksController, type: %i[request webhook_reque
   describe "POST /create charge.refunded" do
     it "synchronizes refunds" do
       SolidusStripe::Seeds.refund_reasons
-      payment_method = create(:stripe_payment_method)
+      payment_method = create(:solidus_stripe_payment_method)
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123")
       payment = create(:payment,
         amount: 10,

data/spec/requests/solidus_stripe/webhooks_controller/payment_intent/canceled_spec.rb

@@ -3,7 +3,7 @@ require "solidus_stripe_spec_helper"
 RSpec.describe SolidusStripe::WebhooksController, type: %i[request webhook_request] do
   describe "POST /create payment_intent.canceled" do
     it "transitions the associated payment to failed" do
-      payment_method = create(:stripe_payment_method)
+      payment_method = create(:solidus_stripe_payment_method)
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123", cancellation_reason: "duplicate")
       payment = create(:payment,
         payment_method: payment_method,

data/spec/requests/solidus_stripe/webhooks_controller/payment_intent/payment_failed_spec.rb

@@ -3,7 +3,7 @@ require "solidus_stripe_spec_helper"
 RSpec.describe SolidusStripe::WebhooksController, type: %i[request webhook_request] do
   describe "POST /create payment_intent.payment_failed" do
     it "transitions the associated payment to failed" do
-      payment_method = create(:stripe_payment_method)
+      payment_method = create(:solidus_stripe_payment_method)
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123")
       payment = create(:payment,
         payment_method: payment_method,

data/spec/requests/solidus_stripe/webhooks_controller/payment_intent/succeeded_spec.rb

@@ -3,7 +3,7 @@ require "solidus_stripe_spec_helper"
 RSpec.describe SolidusStripe::WebhooksController, type: %i[request webhook_request] do
   describe "POST /create payment_intent.succeeded" do
     it "captures the associated payment" do
-      payment_method = create(:stripe_payment_method)
+      payment_method = create(:solidus_stripe_payment_method)
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(
         id: "pi_123",
         amount: 1000,

data/spec/requests/solidus_stripe/webhooks_controller_spec.rb

@@ -2,13 +2,17 @@ require "solidus_stripe_spec_helper"
 
 RSpec.describe SolidusStripe::WebhooksController, type: [:request, :webhook_request] do
   describe "POST /create" do
-    let(:stripe) { create(:stripe_payment_method) }
-    let(:payment_intent) { stripe.gateway.request { Stripe::PaymentIntent.create(amount: 100, currency: 'usd') } }
+    let(:payment_method) { create(:solidus_stripe_payment_method) }
+    let(:stripe_payment_intent) {
+      payment_method.gateway.request {
+        Stripe::PaymentIntent.create(amount: 100, currency: 'usd')
+      }
+    }
     let(:context) do
       SolidusStripe::Webhook::EventWithContextFactory.from_object(
-        object: payment_intent,
+        object: stripe_payment_intent,
         type: "payment_intent.created",
-        payment_method: stripe
+        payment_method: payment_method
       )
     end
 

data/spec/subscribers/solidus_stripe/webhook/charge_subscriber_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe SolidusStripe::Webhook::ChargeSubscriber do
   describe "#sync_refunds" do
     it "synchronizes refunds" do
       SolidusStripe::Seeds.refund_reasons
-      payment_method = create(:stripe_payment_method)
+      payment_method = create(:solidus_stripe_payment_method)
       stripe_payment_intent = Stripe::PaymentIntent.construct_from(id: "pi_123")
       payment = create(:payment,
         amount: 10,