solidus_stripe 3.1.0 → 4.2.0

data/spec/features/stripe_checkout_spec.rb

@@ -217,7 +217,7 @@ RSpec.describe "Stripe checkout", type: :feature do
     end
   end
 
-  context 'when using Stripe V3 API libarary with Elements', :js do
+  context 'when using Stripe V3 API library with Elements', :js do
     let(:preferred_v3_elements) { true }
     let(:preferred_v3_intents) { false }
 
@@ -240,60 +240,95 @@ RSpec.describe "Stripe checkout", type: :feature do
       expect(page).to have_content("Your order has been processed successfully")
     end
 
-    it "can re-use saved cards" do
-      within_frame find('#card_number iframe') do
-        '4242 4242 4242 4242'.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-      end
-      within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-      within_frame(find '#card_expiry iframe') do
-        '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-      end
-      click_button "Save and Continue"
-      expect(page).to have_current_path("/checkout/confirm")
-      click_button "Place Order"
-      expect(page).to have_content("Your order has been processed successfully")
+    context "when reusing saved cards" do
+      stub_authorization!
 
-      visit spree.root_path
-      click_link "DL-44"
-      click_button "Add To Cart"
+      it "completes the order, captures the payment and cancels the order" do
+        within_frame find('#card_number iframe') do
+          '4242 4242 4242 4242'.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
+        end
+        within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
+        within_frame(find '#card_expiry iframe') do
+          '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
+        end
+        click_button "Save and Continue"
+        expect(page).to have_current_path("/checkout/confirm")
+        click_button "Place Order"
+        expect(page).to have_content("Your order has been processed successfully")
 
-      expect(page).to have_current_path("/cart")
-      click_button "Checkout"
+        visit spree.root_path
+        click_link "DL-44"
+        click_button "Add To Cart"
 
-      # Address
-      expect(page).to have_current_path("/checkout/address")
+        expect(page).to have_current_path("/cart")
+        click_button "Checkout"
 
-      within("#billing") do
-        fill_in_name
-        fill_in "Street Address", with: "YT-1300"
-        fill_in "City", with: "Mos Eisley"
-        select "United States of America", from: "Country"
-        select country.states.first.name, from: "order_bill_address_attributes_state_id"
-        fill_in "Zip", with: "12010"
-        fill_in "Phone", with: "(555) 555-5555"
-      end
-      click_on "Save and Continue"
+        # Address
+        expect(page).to have_current_path("/checkout/address")
 
-      # Delivery
-      expect(page).to have_current_path("/checkout/delivery")
-      expect(page).to have_content("UPS Ground")
-      click_on "Save and Continue"
+        within("#billing") do
+          fill_in_name
+          fill_in "Street Address", with: "YT-1300"
+          fill_in "City", with: "Mos Eisley"
+          select "United States of America", from: "Country"
+          select country.states.first.name, from: "order_bill_address_attributes_state_id"
+          fill_in "Zip", with: "12010"
+          fill_in "Phone", with: "(555) 555-5555"
+        end
+        click_on "Save and Continue"
 
-      # Payment
-      expect(page).to have_current_path("/checkout/payment")
-      choose "Use an existing card on file"
-      click_button "Save and Continue"
+        # Delivery
+        expect(page).to have_current_path("/checkout/delivery")
+        expect(page).to have_content("UPS Ground")
+        click_on "Save and Continue"
 
-      # Confirm
-      expect(page).to have_current_path("/checkout/confirm")
-      click_button "Place Order"
-      expect(page).to have_content("Your order has been processed successfully")
+        # Payment
+        expect(page).to have_current_path("/checkout/payment")
+        choose "Use an existing card on file"
+        click_button "Save and Continue"
+
+        # Confirm
+        expect(page).to have_current_path("/checkout/confirm")
+        click_button "Place Order"
+        expect(page).to have_content("Your order has been processed successfully")
+
+        Spree::Order.complete.each do |order|
+          # Capture in backend
+
+          visit spree.admin_path
+
+          expect(page).to have_selector("#listing_orders tbody tr", count: 2)
+
+          click_link order.number
+
+          click_link "Payments"
+          find(".fa-capture").click
+
+          expect(page).to have_content "Payment Updated"
+          expect(find("table#payments")).to have_content "Completed"
+
+          # Order cancel, after capture
+          click_link "Cart"
+
+          within "#sidebar" do
+            expect(page).to have_content "Completed"
+          end
+
+          find('input[value="Cancel"]').click
+
+          expect(page).to have_content "Order canceled"
+
+          within "#sidebar" do
+            expect(page).to have_content "Canceled"
+          end
+        end
+      end
     end
 
     it_behaves_like "Stripe Elements invalid payments"
   end
 
-  context "when using Stripe V3 API libarary with Intents", :js do
+  context "when using Stripe V3 API library with Intents", :js do
     let(:preferred_v3_elements) { false }
     let(:preferred_v3_intents) { true }
 
@@ -400,8 +435,9 @@ RSpec.describe "Stripe checkout", type: :feature do
         click_button "Place Order"
         expect(page).to have_content("Your order has been processed successfully")
 
-        # Capture in backend
         Spree::Order.complete.each do |order|
+          # Capture in backend
+
           visit spree.admin_path
 
           expect(page).to have_selector("#listing_orders tbody tr", count: 2)
@@ -413,6 +449,21 @@ RSpec.describe "Stripe checkout", type: :feature do
 
           expect(page).to have_content "Payment Updated"
           expect(find("table#payments")).to have_content "Completed"
+
+          # Order cancel, after capture
+          click_link "Cart"
+
+          within "#sidebar" do
+            expect(page).to have_content "Completed"
+          end
+
+          find('input[value="Cancel"]').click
+
+          expect(page).to have_content "Order canceled"
+
+          within "#sidebar" do
+            expect(page).to have_content "Canceled"
+          end
         end
       end
     end
@@ -487,9 +538,11 @@ RSpec.describe "Stripe checkout", type: :feature do
   end
 
   def within_3d_secure_modal
-    within_frame "__privateStripeFrame10" do
-      within_frame "challengeFrame" do
-        yield
+    within_frame "__privateStripeFrame11" do
+      within_frame "__stripeJSChallengeFrame" do
+        within_frame "acsFrame" do
+          yield
+        end
       end
     end
   end
@@ -505,7 +558,7 @@ RSpec.describe "Stripe checkout", type: :feature do
     click_button "Save and Continue"
 
     within_3d_secure_modal do
-      expect(page).to have_content '$19.99 using 3D Secure'
+      expect(page).to have_content '$19.99 USD using 3D Secure'
 
       click_button 'Complete authentication'
     end

data/spec/models/solidus_stripe/address_from_params_service_spec.rb

@@ -14,7 +14,8 @@ RSpec.describe SolidusStripe::AddressFromParamsService do
         recipient: 'Clark Kent',
         city: 'Metropolis',
         postalCode: '12345',
-        addressLine: [ '12, Lincoln Rd']
+        addressLine: [ '12, Lincoln Rd'],
+        phone: '555-555-0199'
       }
     end
 
@@ -39,7 +40,8 @@ RSpec.describe SolidusStripe::AddressFromParamsService do
             firstname: 'Clark',
             lastname: 'Kent',
             address1: params[:addressLine].first,
-            address2: nil
+            address2: nil,
+            phone: '555-555-0199'
           )
         end
 
@@ -50,11 +52,23 @@ RSpec.describe SolidusStripe::AddressFromParamsService do
 
       context "when no user's address is compatible with the params" do
         before do
-          user.addresses << create(:address)
+          user.addresses << create(:address, state: state)
         end
 
-        it "returns a non-persisted address model" do
-          expect(subject).to be_new_record
+        it "returns a non-persisted valid address" do
+          aggregate_failures do
+            expect(subject).to be_new_record
+            expect(subject).to be_valid
+            expect(subject.state).to eq state
+          end
+        end
+
+        context "when the region is the state name" do
+          before { params[:region] = state.name }
+
+          it "still can set the address state attribute" do
+            expect(subject.state).to eq state
+          end
         end
       end
     end

data/spec/models/solidus_stripe/create_intents_payment_service_spec.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SolidusStripe::CreateIntentsPaymentService do
+  let(:service) { described_class.new(intent_id, stripe, controller) }
+
+  let(:stripe) {
+    Spree::PaymentMethod::StripeCreditCard.create!(
+      name: "Stripe",
+      preferred_secret_key: "sk_test_VCZnDv3GLU15TRvn8i2EsaAN",
+      preferred_publishable_key: "pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg",
+      preferred_v3_elements: false,
+      preferred_v3_intents: true
+    )
+  }
+
+  let(:order) { create :order, state: :payment, total: 19.99 }
+
+  let(:intent_id) { "pi_123123ABC" }
+  let(:controller) { double(current_order: order.reload, params: params, request: spy) }
+
+  let(:params) do
+    {
+      spree_payment_method_id: stripe.id,
+      stripe_payment_intent_id: intent_id,
+      form_data: {
+        addressLine: ["31 Cotton Rd"],
+        city: "San Diego",
+        country: "US",
+        phone: "+188836412312",
+        postalCode: "12345",
+        recipient: "James Edwards",
+        region: "CA"
+      }
+    }
+  end
+
+  let(:intent) do
+    double(params: {
+      "id" => intent_id,
+      "charges" => {
+        "data" => [{
+          "billing_details" => {
+            "name" => "John Doe"
+          },
+          "payment_method_details" => {
+            "card" => {
+              "brand" => "visa",
+              "exp_month" => 1,
+              "exp_year" => 2022,
+              "last4" => "4242"
+            },
+          }
+        }]
+      }
+    })
+  end
+
+  describe '#call' do
+    subject { service.call }
+
+    before do
+      allow(stripe).to receive(:show_intent) { intent }
+      allow_any_instance_of(Spree::CreditCard).to receive(:require_card_numbers?) { false }
+      allow_any_instance_of(Spree::PaymentMethod::StripeCreditCard).to receive(:create_profile) { true }
+    end
+
+    it { expect(subject).to be true }
+
+    it "creates a new pending payment" do
+      expect { subject }.to change { order.payments.count }
+      expect(order.payments.last.reload).to be_pending
+    end
+
+    it "creates a credit card with the correct information" do
+      expect { subject }.to change { Spree::CreditCard.count }
+      card = Spree::CreditCard.last
+
+      aggregate_failures do
+        expect(card.name).to eq "John Doe"
+        expect(card.cc_type).to eq "visa"
+        expect(card.month).to eq "1"
+        expect(card.year).to eq "2022"
+        expect(card.last_digits).to eq "4242"
+      end
+    end
+
+    context "when for any reason the payment could not be created" do
+      before { params[:form_data].delete(:city) }
+
+      it "returns false" do
+        expect(subject).to be false
+      end
+    end
+
+    context "when there are previous pending payments" do
+      let!(:payment) do
+        create(:payment, order: order).tap do |payment|
+          payment.update!(state: :pending)
+        end
+      end
+
+      before do
+        response = double(success?: true, authorization: payment.response_code)
+        allow_any_instance_of(Spree::PaymentMethod::StripeCreditCard).to receive(:void) { response }
+      end
+
+      context "when one of them is a Payment Intent" do
+        before do
+          payment.update!(payment_method: stripe)
+          payment.source.update!(payment_method: stripe)
+        end
+
+        it "invalidates it" do
+          expect { subject }.to change { payment.reload.state }.to 'void'
+        end
+      end
+
+      context "when none is a Payment Intent" do
+        it "does not invalidate them" do
+          expect { subject }.not_to change { payment.reload.state }
+        end
+      end
+    end
+  end
+end

data/spec/models/spree/payment_method/stripe_credit_card_spec.rb

@@ -22,7 +22,8 @@ describe Spree::PaymentMethod::StripeCreditCard do
   let(:payment) {
     double('Spree::Payment',
       source: source,
-      order: order
+      order: order,
+      amount: order.total
     )
   }
 
@@ -241,4 +242,46 @@ describe Spree::PaymentMethod::StripeCreditCard do
       expect(gateway).to receive(:capture).with(9855, '12345', anything).and_return(success_response)
     end
   end
+
+  describe '#try_void' do
+    let(:payment) { create :payment, amount: order.total }
+
+    shared_examples 'voids the payment transaction' do
+      it 'voids the payment transaction' do
+        expect(gateway).to receive(:void)
+
+        subject.try_void(payment)
+      end
+    end
+
+    context 'when using Payment Intents' do
+      before { subject.preferred_v3_intents = true }
+
+      context 'when the payment is completed' do
+        before do
+          allow(payment).to receive(:completed?) { true }
+        end
+
+        it 'creates a refund' do
+          expect { subject.try_void(payment) }.to change { Spree::Refund.count }.by(1)
+        end
+      end
+
+      context 'when the payment is not completed' do
+        it_behaves_like 'voids the payment transaction'
+      end
+    end
+
+    context 'when not using Payment Intents' do
+      before { subject.preferred_v3_intents = false }
+
+      context 'when the payment is completed' do
+        it_behaves_like 'voids the payment transaction'
+      end
+
+      context 'when the payment is not completed' do
+        it_behaves_like 'voids the payment transaction'
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -13,7 +13,10 @@ require 'solidus_dev_support/rspec/feature_helper'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+
+# Requires factories defined in lib/solidus_stripe/factories.rb
+require 'solidus_stripe/factories'
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_stripe
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,6 @@ files:
 - CHANGELOG.md
 - Gemfile
 - LICENSE
-- LICENSE.md
 - README.md
 - Rakefile
 - app/assets/javascripts/spree/frontend/solidus_stripe.js
@@ -103,13 +102,18 @@ files:
 - app/controllers/spree/stripe_controller.rb
 - app/decorators/models/spree/order_update_attributes_decorator.rb
 - app/decorators/models/spree/payment_decorator.rb
+- app/decorators/models/spree/refund_decorator.rb
 - app/models/solidus_stripe/address_from_params_service.rb
-- app/models/solidus_stripe/create_intents_order_service.rb
+- app/models/solidus_stripe/create_intents_payment_service.rb
 - app/models/solidus_stripe/prepare_order_for_payment_service.rb
 - app/models/solidus_stripe/shipping_rates_service.rb
 - app/models/spree/payment_method/stripe_credit_card.rb
 - bin/console
+- bin/r
 - bin/rails
+- bin/rake
+- bin/sandbox
+- bin/sandbox_rails
 - bin/setup
 - config/routes.rb
 - db/migrate/20181010123508_update_stripe_payment_method_type_to_credit_card.rb
@@ -118,6 +122,7 @@ files:
 - lib/generators/solidus_stripe/install/install_generator.rb
 - lib/solidus_stripe.rb
 - lib/solidus_stripe/engine.rb
+- lib/solidus_stripe/factories.rb
 - lib/solidus_stripe/version.rb
 - lib/tasks/solidus_stripe/db/seed.rake
 - lib/views/api/spree/api/payments/source_views/_stripe.json.jbuilder
@@ -135,40 +140,42 @@ files:
 - solidus_stripe.gemspec
 - spec/features/stripe_checkout_spec.rb
 - spec/models/solidus_stripe/address_from_params_service_spec.rb
+- spec/models/solidus_stripe/create_intents_payment_service_spec.rb
 - spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb
 - spec/models/solidus_stripe/shipping_rates_service_spec.rb
 - spec/models/spree/payment_method/stripe_credit_card_spec.rb
 - spec/spec_helper.rb
 - spec/support/solidus_address_helper.rb
-homepage: https://solidus.io
+homepage: https://github.com/solidusio/solidus_stripe#readme
 licenses:
 - BSD-3
 metadata:
-  homepage_uri: https://solidus.io
-  source_code_uri: https://solidus.io
-post_install_message: 
+  homepage_uri: https://github.com/solidusio/solidus_stripe#readme
+  source_code_uri: https://github.com/solidusio/solidus_stripe
+  changelog_uri: https://github.com/solidusio/solidus_stripe/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- none
+requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Stripe Payment Method for Solidus
 test_files:
 - spec/features/stripe_checkout_spec.rb
 - spec/models/solidus_stripe/address_from_params_service_spec.rb
+- spec/models/solidus_stripe/create_intents_payment_service_spec.rb
 - spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb
 - spec/models/solidus_stripe/shipping_rates_service_spec.rb
 - spec/models/spree/payment_method/stripe_credit_card_spec.rb