solidus_stripe 1.0.0 → 1.1.0

data/spec/models/solidus_stripe/address_from_params_service_spec.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SolidusStripe::AddressFromParamsService do
+  let(:service) { described_class.new(params, user) }
+  let(:state) { create :state }
+
+  describe '#call' do
+    let(:params) do
+      {
+        country: state.country.iso,
+        region: state.abbr,
+        recipient: 'Clark Kent',
+        city: 'Metropolis',
+        postalCode: '12345',
+        addressLine: [ '12, Lincoln Rd']
+      }
+    end
+
+    subject { service.call }
+
+    context "when there is no user" do
+      let(:user) { nil }
+
+      it "returns a non-persisted address model" do
+        expect(subject).to be_new_record
+      end
+    end
+
+    context "when there is a user" do
+      let(:user) { create :user }
+
+      context "when the user has an address compatible with the params" do
+        before do
+          user.addresses << create(
+            :address, city: params[:city],
+            zipcode: params[:postalCode],
+            firstname: 'Clark',
+            lastname: 'Kent',
+            address1: params[:addressLine].first,
+            address2: nil
+          )
+        end
+
+        it "returns an existing user's address" do
+          expect(subject).to eql user.addresses.first
+        end
+      end
+
+      context "when no user's address is compatible with the params" do
+        before do
+          user.addresses << create(:address)
+        end
+
+        it "returns a non-persisted address model" do
+          expect(subject).to be_new_record
+        end
+      end
+    end
+  end
+end

data/spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SolidusStripe::PrepareOrderForPaymentService do
+  let(:service) { described_class.new(address, controller) }
+
+  let(:address) { create :address }
+  let(:user) { double("Spree::User") }
+  let(:email) { "foo@example.com" }
+  let(:order) { create :order_with_line_items, state: :cart, ship_address: nil, bill_address: nil }
+  let!(:shipping_method) { create :shipping_method, name: 'Air Mail', cost: 15 }
+  let!(:other_shipping_method) { create :shipping_method, name: 'DHL', cost: 7 }
+  let(:controller) do
+    double(
+      current_order: order,
+      spree_current_user: user,
+      params: {
+        email: email,
+        shipping_option: { id: shipping_method.id }
+      }
+    )
+  end
+
+  before do
+    Spree::ZoneMember.create!(zone: Spree::Zone.first, zoneable: address.country)
+  end
+
+  describe "#call" do
+    subject { service.call }
+
+    it "sets the order ship and bill address" do
+      expect { subject }.to change { order.ship_address }.to(address)
+        .and change { order.bill_address }.to(address)
+    end
+
+    context "when the user is not logged in" do
+      let(:user) { nil }
+
+      it "sets the order email to allow guest checkout" do
+        expect { subject }.to change { order.email }.to(email)
+      end
+    end
+
+    it "sets the right shipping rate" do
+      expect { subject }.to change {
+        order.shipments.first.selected_shipping_rate.shipping_method_id
+      }.to(shipping_method.id)
+    end
+
+    context "when the order can be advanced to payment state" do
+      it "advances the order to 'payment'" do
+        expect { subject }.to change { order.state }.to("payment")
+      end
+    end
+
+    context "when the order fails to be advanced to payment state" do
+      before { order.line_items.destroy_all }
+
+      it "leaves the order to a previous state" do
+        expect { subject }.not_to change { order.state }
+      end
+    end
+  end
+end

data/spec/models/solidus_stripe/shipping_rates_service_spec.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SolidusStripe::ShippingRatesService do
+  let(:service) { described_class.new(order, user, params) }
+
+  let(:order) { create :order }
+  let(:user) { Spree::User.new }
+
+  let(:params) do
+    {
+      country: Spree::ZoneMember.first.zoneable.iso,
+      city: "Metropolis",
+      postalCode: "12345",
+      recipient: "",
+      addressLine: []
+    }
+  end
+
+  let(:ups_ground) { create(:shipping_method, cost: 5, available_to_all: false) }
+  let(:air_mail) { create(:shipping_method, cost: 8, name: "Air Mail", available_to_all: false) }
+
+  let(:fl_warehouse) { create(:stock_location, name: "FL Warehouse", shipping_methods: [ups_ground]) }
+  let(:ca_warehouse) { create(:stock_location, name: "CA Warehouse", shipping_methods: [air_mail]) }
+
+  before do
+    2.times { create :inventory_unit, order: order }
+    Spree::StockLocation.update_all backorderable_default: false
+    Spree::StockItem.find_by(stock_location: fl_warehouse, variant: order.variants.first).set_count_on_hand(1)
+    Spree::StockItem.find_by(stock_location: ca_warehouse, variant: order.variants.last).set_count_on_hand(1)
+    order.create_proposed_shipments
+  end
+
+  describe "#call" do
+    subject { service.call }
+
+    context "when there are no common shipping methods for all order shipments" do
+      it "cannot find any shipping rate" do
+        expect(subject).to be_empty
+      end
+    end
+
+    context "when there are common shipping methods for all order shipments" do
+      before { fl_warehouse.shipping_methods << ca_warehouse.shipping_methods.first }
+
+      context "when one shipping method is available for all shipments" do
+        it "sums the shipping rates for the shared shipping method" do
+          expect(subject).to eql [{ amount: 1600, id: air_mail.id.to_s, label: air_mail.name }]
+        end
+      end
+    end
+  end
+end

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

@@ -7,12 +7,23 @@ describe Spree::PaymentMethod::StripeCreditCard do
   let(:email) { 'customer@example.com' }
   let(:source) { Spree::CreditCard.new }
 
+  let(:bill_address) { nil }
+
+  let(:order) {
+    double('Spree::Order',
+      email: email,
+      bill_address: bill_address,
+      currency: 'USD',
+      number: 'NUMBER',
+      total: 10.99
+    )
+  }
+
   let(:payment) {
     double('Spree::Payment',
       source: source,
-      order: double('Spree::Order',
-        email: email,
-        bill_address: bill_address))
+      order: order
+    )
   }
 
   let(:gateway) do
@@ -35,6 +46,36 @@ describe Spree::PaymentMethod::StripeCreditCard do
     end.to change { subject.v3_elements? }.from(false).to true
   end
 
+  describe '#stripe_config' do
+    context 'when payment request feature is disabled' do
+      before { subject.preferences = { publishable_key: 'stripe_key' } }
+
+      it 'includes the basic configuration' do
+        config = subject.stripe_config(order)
+        expect(config.keys).to eq %i[id publishable_key]
+        expect(config[:publishable_key]).to include('stripe_key')
+      end
+    end
+
+    context 'when the payment request feature is enabled' do
+      before do
+        subject.preferences = {
+          publishable_key: 'stripe_key',
+          stripe_country: 'US',
+          v3_intents: true
+        }
+      end
+
+      it 'includes the payment request configuration as well' do
+        config = subject.stripe_config(order)
+        expect(config.keys).to eq %i[id publishable_key payment_request]
+        expect(config[:payment_request][:currency]).to eq 'usd'
+        expect(config[:payment_request][:amount]).to be 1099
+        expect(config[:payment_request][:label]).to include 'NUMBER'
+      end
+    end
+  end
+
   describe '#create_profile' do
     before do
       allow(payment.source).to receive(:update_attributes!)
@@ -71,8 +112,6 @@ describe Spree::PaymentMethod::StripeCreditCard do
     end
 
     context 'with an order that does not have a bill address' do
-      let(:bill_address) { nil }
-
       it 'does not store a bill address with the gateway' do
         expect(subject.gateway).to receive(:store).with(payment.source, {
           email: email,

data/spec/spec_helper.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
-require "simplecov"
-SimpleCov.start "rails"
+# Configure Rails Environment
+ENV['RAILS_ENV'] = 'test'
 
-ENV["RAILS_ENV"] ||= "test"
+# Run Coverage report
+require 'solidus_dev_support/rspec/coverage'
 
 require File.expand_path('dummy/config/environment.rb', __dir__)
 
-require 'solidus_support/extension/feature_helper'
+# Requires factories and other useful helpers defined in spree_core.
+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 }
 
-Capybara.server = :webrick
-
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
-
   FactoryBot.find_definitions
+  config.use_transactional_fixtures = false
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_stripe
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -32,158 +32,34 @@ dependencies:
         version: '3'
 - !ruby/object:Gem::Dependency
   name: solidus_support
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: activemerchant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.48'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.58.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.59.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.48'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.58.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.59.0
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara-screenshot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: factory_bot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.142'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.142'
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  name: activemerchant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.100'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.100'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -204,16 +80,29 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gem_release.yml"
+- ".github/stale.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - LICENSE.md
 - README.md
 - Rakefile
+- app/assets/javascripts/solidus_stripe/stripe-init.js
+- app/assets/javascripts/solidus_stripe/stripe-init/base.js
+- app/controllers/solidus_stripe/intents_controller.rb
+- app/controllers/solidus_stripe/payment_request_controller.rb
+- app/controllers/spree/stripe_controller.rb
+- app/models/solidus_stripe/address_from_params_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/rails
+- bin/setup
+- config/routes.rb
 - db/migrate/20181010123508_update_stripe_payment_method_type_to_credit_card.rb
 - db/seeds.rb
 - lib/assets/stylesheets/spree/frontend/solidus_stripe.scss
@@ -229,15 +118,25 @@ files:
 - lib/views/frontend/spree/checkout/existing_payment/_stripe.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe.html.erb
 - lib/views/frontend/spree/checkout/payment/v2/_javascript.html.erb
+- lib/views/frontend/spree/checkout/payment/v3/_elements_js.html.erb
+- lib/views/frontend/spree/checkout/payment/v3/_form_elements.html.erb
+- lib/views/frontend/spree/checkout/payment/v3/_intents.html.erb
+- lib/views/frontend/spree/checkout/payment/v3/_intents_js.html.erb
 - lib/views/frontend/spree/checkout/payment/v3/_stripe.html.erb
+- lib/views/frontend/spree/orders/_stripe_payment_request_button.html.erb
 - solidus_stripe.gemspec
 - spec/features/stripe_checkout_spec.rb
+- spec/models/solidus_stripe/address_from_params_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
 homepage: https://solidus.io
 licenses:
 - BSD-3
-metadata: {}
+metadata:
+  homepage_uri: https://solidus.io
+  source_code_uri: https://solidus.io
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -254,11 +153,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 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/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