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

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

@@ -6,7 +6,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
   describe "#capture_payment" do
     context "when a full capture is performed" do
       it "completes a pending 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,
@@ -30,7 +30,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
       end
 
       it "adds a log entry to the 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,
@@ -61,7 +61,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
     context "when a partial capture is performed" do
       it "completes a pending payment" 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",
           amount: 1000,
@@ -91,7 +91,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber 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",
           amount: 1000,
@@ -121,7 +121,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
 
       it "adds a log entry for the captured payment" 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",
           amount: 1000,
@@ -154,7 +154,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
     end
 
     it "does nothing if the payment is already completed" 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,
@@ -175,7 +175,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
 
   describe "#fail_payment" do
     it "fails a pending 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")
       payment = create(:payment,
         payment_method: payment_method,
@@ -193,7 +193,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
     end
 
     it "adds a log entry to the 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")
       payment = create(:payment,
         payment_method: payment_method,
@@ -215,7 +215,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
     end
 
     it "does nothing if the payment is already 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,
@@ -236,7 +236,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
 
   describe "#void_payment" do
     it "voids a pending 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", cancellation_reason: "duplicate")
       payment = create(:payment,
         payment_method: payment_method,
@@ -254,7 +254,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
     end
 
     it "adds a log entry to the 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", cancellation_reason: "duplicate")
       payment = create(:payment,
         payment_method: payment_method,
@@ -276,7 +276,7 @@ RSpec.describe SolidusStripe::Webhook::PaymentIntentSubscriber do
     end
 
     it "does nothing if the payment is already voided" 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/support/solidus_stripe/backend_test_helper.rb

@@ -3,7 +3,7 @@
 module SolidusStripe::BackendTestHelper
   def create_payment_method(setup_future_usage: 'off_session', auto_capture: false)
     @payment_method = create(
-      :stripe_payment_method,
+      :solidus_stripe_payment_method,
       preferred_setup_future_usage: setup_future_usage,
       auto_capture: auto_capture
     )
@@ -77,12 +77,12 @@ module SolidusStripe::BackendTestHelper
 
   def create_authorized_payment(opts = {})
     stripe_payment_method = create_stripe_payment_method(opts[:card_number] || '4242424242424242')
-    payment_intent = create_stripe_payment_intent(stripe_payment_method.id)
+    stripe_payment_intent = create_stripe_payment_intent(stripe_payment_method.id)
 
-    create(:stripe_payment,
+    create(:solidus_stripe_payment,
       :authorized,
       order: order,
-      response_code: payment_intent.id,
+      response_code: stripe_payment_intent.id,
       stripe_payment_method_id: stripe_payment_method.id,
       payment_method: payment_method)
   end
@@ -132,6 +132,18 @@ module SolidusStripe::BackendTestHelper
     end
   end
 
+  def capture_partial_payment_amount(payment, amount)
+    within_row(1) do
+      click_icon(:edit)
+      fill_in('amount', with: amount)
+      click_icon(:ok)
+      expect(page).to have_selector('td.amount span', text: amount.to_money.format)
+      expect(payment.reload.amount).to eq(amount)
+    end
+
+    capture_payment
+  end
+
   def void_payment
     click_icon(:void)
   end
@@ -149,43 +161,6 @@ module SolidusStripe::BackendTestHelper
 
   # Helper methods for checking expected outcomes and states
 
-  def expects_page_to_display_successfully_captured_payment(payment)
-    expect(page).to have_content('Payment Updated')
-    expect(payment.reload.state).to eq('completed')
-    expect(payment.capture_events.first.amount).to eq(payment.amount)
-  end
-
-  def expects_page_to_display_successfully_refunded_payment(payment)
-    expect(page).to have_content('Refund has been successfully created!')
-    expect(payment).to be_fully_refunded
-  end
-
-  def expects_page_to_display_successfully_partially_refunded_payment(payment, amount)
-    expect(page).to have_content('Refund has been successfully created!')
-    expect(payment.reload.state).to eq('completed')
-    expect(payment.refunds.first.amount).to eq(amount)
-  end
-
-  def expects_page_to_display_successfully_voided_payment(payment)
-    expect(page).to have_content('Payment Updated')
-    expect(payment.reload.state).to eq('void')
-  end
-
-  def expects_page_to_display_successfully_canceled_order_payment(payment)
-    expect(page).to have_content('Order canceled')
-    expect(payment.reload.state).to eq('void')
-  end
-
-  def expects_page_to_display_capture_fail_message(payment, message)
-    expect(page).to have_content(message)
-    expect(payment.reload.state).to eq('failed')
-  end
-
-  def expects_page_to_display_payment(payment)
-    click_on 'Payments'
-    expect(page).to have_content(payment.number)
-  end
-
   def expects_page_to_display_log_messages(log_messages = [])
     expect(page).to have_content('Log Entries')
     log_messages.each do |log_message|
@@ -205,6 +180,6 @@ module SolidusStripe::BackendTestHelper
 
   def expects_payment_to_have_correct_capture_amount_on_stripe(payment, amount)
     stripe_payment_intent = fetch_stripe_payment_intent(payment)
-    expect(stripe_payment_intent.amount_received).to eq(amount * 100)
+    expect(stripe_payment_intent.amount_received).to eq(amount.to_money.fractional)
   end
 end

data/spec/support/solidus_stripe/checkout_test_helper.rb

@@ -25,7 +25,7 @@ module SolidusStripe::CheckoutTestHelper
 
   def create_payment_method(setup_future_usage: 'off_session', auto_capture: false)
     @payment_method = create(
-      :stripe_payment_method,
+      :solidus_stripe_payment_method,
       preferred_setup_future_usage: setup_future_usage,
       auto_capture: auto_capture
     )
@@ -188,6 +188,28 @@ module SolidusStripe::CheckoutTestHelper
     choose(option: payment_method.id)
   end
 
+  def choose_stripe_payment_method(payment_method_type: 'card')
+    using_wait_time(10) do
+      within_frame(find_stripe_iframe) do
+        # Stripe doesn't display payment methods in the same order.
+        # The payment method order is based on the most used in that
+        # context (and other parameters).
+        # For this reason, if the payment method tab is not visible,
+        # it will be selected from the dedicated additional Stripe
+        # payment methods "select" rendered in the Stripe payment form.
+        #
+        # https://stripe.com/docs/payments/customize-payment-element#payment-method-order
+        if has_css?("##{payment_method_type}-tab")
+          find("##{payment_method_type}-tab").click
+        else
+          find(
+            ".p-AdditionalPaymentMethods-menu option[value='#{payment_method_type}']"
+          ).select_option
+        end
+      end
+    end
+  end
+
   def submit_payment
     click_button("Save and Continue")
   end
@@ -216,6 +238,10 @@ module SolidusStripe::CheckoutTestHelper
     expect(last_stripe_payment.state).to eq('failed')
   end
 
+  def expects_payment_to_be_processing
+    expect(last_stripe_payment.state).to eq('processing')
+  end
+
   def expects_page_to_not_display_wallet_payment_sources
     expect(page).to have_no_selector("[name='order[wallet_payment_source_id]']")
   end

data/spec/support/solidus_stripe/webhook/event_with_context_factory.rb

@@ -59,7 +59,7 @@ module SolidusStripe
 
       def solidus_stripe_object
         @solidus_stripe_object = SolidusStripe::Webhook::Event.new(stripe_event: stripe_object,
-          spree_payment_method: @payment_method)
+          payment_method: @payment_method)
       end
 
       def json

data/spec/system/backend/solidus_stripe/orders/payments_spec.rb

@@ -4,41 +4,62 @@ require 'solidus_stripe_spec_helper'
 
 RSpec.describe 'SolidusStripe Orders Payments', :js do
   include SolidusStripe::BackendTestHelper
+  include Devise::Test::IntegrationHelpers
   stub_authorization!
 
+  let(:user) { create(:admin_user) }
+
   context 'with successful payment operations' do
     it 'navigates to the payments page' do
       payment = create_authorized_payment
       visit_payments_page
 
-      expects_page_to_display_payment(payment)
+      click_on 'Payments'
+      expect(page).to have_content(payment.number)
     end
 
     it 'displays log entries for a payment' do
-      payment = create(:stripe_payment, :captured, order: order, payment_method: payment_method)
+      payment = create(:solidus_stripe_payment, :captured, order: order, payment_method: payment_method)
 
       visit_payment_page(payment)
 
       expects_page_to_display_log_messages(["PaymentIntent was confirmed and captured successfully"])
     end
 
-    it 'captures an authorized payment successfully' do
+    it 'successfully captures an authorized payment' do
       payment = create_authorized_payment
       visit_payments_page
 
       capture_payment
 
-      expects_page_to_display_successfully_captured_payment(payment)
+      expect(page).to have_content('Payment Updated')
+      expect(payment.reload.state).to eq('completed')
+      expect(payment.capture_events.first.amount).to eq(payment.amount)
       expects_payment_to_have_correct_capture_amount_on_stripe(payment, payment.amount)
     end
 
+    it 'successfully captures a partial amount of an authorized payment' do
+      payment = create_authorized_payment
+      partial_capture_amount = payment.amount - 10
+
+      visit_payments_page
+
+      capture_partial_payment_amount(payment, partial_capture_amount)
+
+      expect(page).to have_content('Payment Updated')
+      expect(payment.reload.state).to eq('completed')
+      expect(payment.capture_events.first.amount).to eq(payment.amount)
+      expects_payment_to_have_correct_capture_amount_on_stripe(payment, partial_capture_amount)
+    end
+
     it 'voids a payment from an order' do
       payment = create_authorized_payment
       visit_payments_page
 
       void_payment
 
-      expects_page_to_display_successfully_voided_payment(payment)
+      expect(page).to have_content('Payment Updated')
+      expect(payment.reload.state).to eq('void')
       expects_payment_to_be_voided_on_stripe(payment)
     end
 
@@ -48,7 +69,8 @@ RSpec.describe 'SolidusStripe Orders Payments', :js do
 
       refund_payment
 
-      expects_page_to_display_successfully_refunded_payment(payment)
+      expect(page).to have_content('Refund has been successfully created!')
+      expect(payment).to be_fully_refunded
       expects_payment_to_be_refunded_on_stripe(payment, payment.amount)
     end
 
@@ -60,35 +82,35 @@ RSpec.describe 'SolidusStripe Orders Payments', :js do
       partial_refund_amount = 25
       partially_refund_payment(refund_reason, partial_refund_amount)
 
-      expects_page_to_display_successfully_partially_refunded_payment(payment, partial_refund_amount)
+      expect(page).to have_content('Refund has been successfully created!')
+      expect(payment.reload.state).to eq('completed')
+      expect(payment.refunds.first.amount).to eq(partial_refund_amount)
       expects_payment_to_be_refunded_on_stripe(payment, partial_refund_amount)
     end
 
     it 'cancels an order with captured payment' do
       payment = create_captured_payment
+
+      sign_in user
       visit_payments_page
 
       cancel_order
 
-      # https://github.com/solidusio/solidus/blob/ab59d6435239b50db79d73b9a974af057ad56b52/core/app/models/spree/payment_method.rb#L169-L181
-      pending "needs to implement try_void method to handle voiding payments on order cancellation"
-
-      expects_page_to_display_successfully_canceled_order_payment(payment)
-      expects_payment_to_be_voided_on_stripe(payment)
+      expect(page).to have_content('Order canceled')
+      expect(payment.reload.state).to eq('completed')
+      expects_payment_to_be_refunded_on_stripe(payment, payment.amount)
     end
 
     it 'cancels an order with authorized payment' do
       payment = create_authorized_payment
+
+      sign_in user
       visit_payments_page
 
       cancel_order
 
-      # https://github.com/solidusio/solidus/blob/ab59d6435239b50db79d73b9a974af057ad56b52/core/app/models/spree/payment_method.rb#L169-L181
-      # Note that for this specific case, the test is pending also because there is an issue
-      # with locating the user who canceled the order.
-      pending "needs to implement try_void method to handle voiding payments on order cancellation"
-
-      expects_page_to_display_successfully_canceled_order_payment(payment)
+      expect(page).to have_content('Order canceled')
+      expect(payment.reload.state).to eq('void')
       expects_payment_to_be_voided_on_stripe(payment)
     end
 
@@ -100,7 +122,9 @@ RSpec.describe 'SolidusStripe Orders Payments', :js do
       capture_payment
       payment = last_valid_payment
 
-      expects_page_to_display_successfully_captured_payment(payment)
+      expect(page).to have_content('Payment Updated')
+      expect(payment.reload.state).to eq('completed')
+      expect(payment.capture_events.first.amount).to eq(payment.amount)
       expects_payment_to_have_correct_capture_amount_on_stripe(payment, payment.amount)
     end
   end
@@ -112,8 +136,10 @@ RSpec.describe 'SolidusStripe Orders Payments', :js do
 
       capture_payment
 
-      expects_page_to_display_capture_fail_message(payment,
-        'This PaymentIntent could not be captured because it has a status of requires_action.')
+      expect(page).to have_content(
+        'This PaymentIntent could not be captured because it has a status of requires_action.'
+      )
+      expect(payment.reload.state).to eq('failed')
     end
   end
 end

data/spec/system/frontend/solidus_stripe/checkout_spec.rb

@@ -80,6 +80,25 @@ RSpec.describe 'SolidusStripe Checkout', :js do
     end
   end
 
+  context 'with non-card Stripe payment methods' do
+    before do
+      stub_spree_preferences(currency: 'EUR')
+      create_payment_method(setup_future_usage: 'off_session', auto_capture: true)
+    end
+
+    it 'creates a payment intent and successfully processes sepa_debit payment' do
+      visit_payment_step(user: create(:user))
+      choose_new_stripe_payment
+      choose_stripe_payment_method(payment_method_type: "sepa_debit")
+      fills_in_stripe_input 'iban', with: 'DE89370400440532013000'
+
+      submit_payment
+      complete_order
+
+      expects_payment_to_be_processing
+    end
+  end
+
   context 'with declined cards' do
     it 'reject transactions with cards declined at intent creation or invalid fields and return an appropriate response' do # rubocop:disable Layout/LineLength
       create_payment_method

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_stripe
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha.1
+  version: 5.0.0.rc.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -200,14 +200,9 @@ files:
 - config/routes.rb
 - coverage.rb
 - db/migrate/20230109183332_create_solidus_stripe_payment_sources.rb
-- db/migrate/20230303154931_create_solidus_stripe_setup_intent.rb
 - db/migrate/20230306105520_create_solidus_stripe_payment_intents.rb
-- db/migrate/20230308122414_create_solidus_stripe_webhook_endpoints.rb
-- db/migrate/20230310152615_add_payment_method_reference_to_stripe_intents.rb
-- db/migrate/20230310171444_normalize_stripe_intent_id_attributes.rb
+- db/migrate/20230308122414_create_solidus_stripe_slug_entries.rb
 - db/migrate/20230313150008_create_solidus_stripe_customers.rb
-- db/migrate/20230323154931_drop_solidus_stripe_setup_intent.rb
-- db/migrate/20230403094916_rename_webhook_endpoint_to_payment_method_slug_entries.rb
 - db/seeds.rb
 - lib/generators/solidus_stripe/install/install_generator.rb
 - lib/generators/solidus_stripe/install/templates/app/assets/stylesheets/spree/frontend/solidus_stripe.css

data/db/migrate/20230303154931_create_solidus_stripe_setup_intent.rb

@@ -1,10 +0,0 @@
-class CreateSolidusStripeSetupIntent < ActiveRecord::Migration[7.0]
-  def change
-    create_table :solidus_stripe_setup_intents do |t|
-      t.string :stripe_setup_intent_id
-      t.references :order, null: false, foreign_key: { to_table: :spree_orders }
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20230308122414_create_solidus_stripe_webhook_endpoints.rb

@@ -1,10 +0,0 @@
-class CreateSolidusStripeWebhookEndpoints < ActiveRecord::Migration[5.2]
-  def change
-    create_table :solidus_stripe_webhook_endpoints do |t|
-      t.references :payment_method, null: false, foreign_key: { to_table: :spree_payment_methods }
-      t.string :slug, null: false, index: { unique: true }
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20230310152615_add_payment_method_reference_to_stripe_intents.rb

@@ -1,6 +0,0 @@
-class AddPaymentMethodReferenceToStripeIntents < ActiveRecord::Migration[7.0]
-  def change
-    add_reference :solidus_stripe_setup_intents, :payment_method, null: false, foreign_key: { to_table: :spree_payment_methods }
-    add_reference :solidus_stripe_payment_intents, :payment_method, null: false, foreign_key: { to_table: :spree_payment_methods }
-  end
-end

data/db/migrate/20230310171444_normalize_stripe_intent_id_attributes.rb

@@ -1,6 +0,0 @@
-class NormalizeStripeIntentIdAttributes < ActiveRecord::Migration[7.0]
-  def change
-    rename_column :solidus_stripe_payment_intents, :stripe_payment_intent_id, :stripe_intent_id
-    rename_column :solidus_stripe_setup_intents, :stripe_setup_intent_id, :stripe_intent_id
-  end
-end

data/db/migrate/20230323154931_drop_solidus_stripe_setup_intent.rb

@@ -1,13 +0,0 @@
-class DropSolidusStripeSetupIntent < ActiveRecord::Migration[7.0]
-  def change
-    drop_table "solidus_stripe_setup_intents", force: :cascade do |t|
-      t.string "stripe_intent_id"
-      t.integer "order_id", null: false
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-      t.integer "payment_method_id", null: false
-      t.index ["order_id"], name: "index_solidus_stripe_setup_intents_on_order_id"
-      t.index ["payment_method_id"], name: "index_solidus_stripe_setup_intents_on_payment_method_id"
-    end
-  end
-end

data/db/migrate/20230403094916_rename_webhook_endpoint_to_payment_method_slug_entries.rb

@@ -1,5 +0,0 @@
-class RenameWebhookEndpointToPaymentMethodSlugEntries < ActiveRecord::Migration[7.0]
-  def change
-    rename_table :solidus_stripe_webhook_endpoints, :solidus_stripe_slug_entries
-  end
-end