spree_gateway 3.3.7 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd974d5699eb1d952f981435c81405d4cff0ac19f4bbbe1d9e6fa14cdeaf51f8
-  data.tar.gz: 7ba5f9c55f4467ed8c2846a38ff186606ed919a50bdf3835a052a95cc515472a
+  metadata.gz: aad9aebb297d8d3075838334fa28add9b8d814ff823221b9c45dde589e8ef854
+  data.tar.gz: f31ea14dab0e47a5d046b7890c351c257e5eecdd779300efc1251b63527cf6ef
 SHA512:
-  metadata.gz: 6b2aeb0c49744cbe445461485577ca9ab6088e6edcd5d921c46e3610273d01aec8a4c6a56253b57fb56d338c7c034cad5119ec765de251e2130c1306c82f9d28
-  data.tar.gz: eafb26b67ee4052ca4f51b923aa3a1c786a98b78a049956b090a6b52fd627b374c97b5317db9faae93c4c67d4bf1d105ea9ae1492e921f86499ae60c2de6bd8a
+  metadata.gz: d88b3801880261fb8ad09ca80549f436c2dd71a6c47319dd4a6f22b5bf6b0dd88300028b4c5f859018fa0f9c221ddaf49e22091da5208d8054b48d10ce05d149
+  data.tar.gz: 2be4ce4186492ad74826a4d58b1f5415078457aa380373e592cbd80dc2116443a9d1de04fec68c0d51abe47af5e2486ea1240524fd3e79cea7a2fd9bb1a9182e

data/.travis.yml

@@ -11,8 +11,9 @@ env:
   - DB=mysql
 
 gemfile:
-  - gemfiles/spree_3_1.gemfile
   - gemfiles/spree_3_2.gemfile
+  - gemfiles/spree_3_5.gemfile
+  - gemfiles/spree_3_6.gemfile
   - gemfiles/spree_master.gemfile
 
 script:
@@ -20,8 +21,9 @@ script:
   - bundle exec rake spec
 
 rvm:
-  - 2.3.1
-  - 2.2.7
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
 
 matrix:
     allow_failures:

data/Appraisals

@@ -1,12 +1,18 @@
-appraise 'spree-3-1' do
-  gem 'spree', '~> 3.1.0'
-end
-
 appraise 'spree-3-2' do
   gem 'spree', '~> 3.2.0'
   gem 'rails-controller-testing'
 end
 
+appraise 'spree-3-5' do
+  gem 'spree', '~> 3.5.0'
+  gem 'rails-controller-testing'
+end
+
+appraise 'spree-3-6' do
+  gem 'spree', '~> 3.6.0'
+  gem 'rails-controller-testing'
+end
+
 appraise 'spree-master' do
   gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'rails-controller-testing'

data/README.md

@@ -4,10 +4,33 @@
 [![Code Climate](https://codeclimate.com/github/spree/spree_gateway.svg)](https://codeclimate.com/github/spree/spree_gateway)
 
 Community supported Spree Payment Method Gateways. It works as a wrapper for
-active_merchant gateway. Note that for some gateways you might still need to
-add another gem to your Gemfile to make it work. For example active_merchant
-require `braintree` but it doesn't include that gem on its gemspec. So you
-need to manually add it to your rails app Gemfile.
+[active_merchant](https://github.com/activemerchant/active_merchant) gateway. 
+
+Supported payment gateways:
+* Authorize.net (with CIM support)
+* Apple Pay (via Stripe)
+* BanWire
+* Bambora (previously Beanstream)
+* Braintree
+* CyberSource
+* ePay
+* eWay
+* maxipago
+* MasterCard Payment Gateway Service (formerly MiGS)
+* Moneris
+* PayJunction
+* Payflow
+* Paymill
+* Pin Payments
+* QuickPay
+* sage Pay
+* SecurePay
+* Spreadly
+* Stripe (with Stripe Elements)
+* USAePay
+* Worldpay (previously Cardsave)
+
+For`PayPal` support head over to [braintree_vzero](https://github.com/spree-contrib/spree_braintree_vzero) extension.
 
 ## Installation
 
@@ -70,7 +93,21 @@ Starting point:
 * Submit your pull request
 
 
-Copyright (c) 2014 [Spree Commerce][4] and other [contributors][5], released under the [New BSD License][3]
+License
+----------------------
+
+Spree is released under the [New BSD License][3].
+
+About Spark Solutions
+----------------------
+[![Spark Solutions](http://sparksolutions.co/wp-content/uploads/2015/01/logo-ss-tr-221x100.png)][spark]
+
+Spree Gateway is maintained by [Spark Solutions Sp. z o.o.][spark].
+
+We are passionate about open source software.
+We are [available for hire][spark].
+
+[spark]:http://sparksolutions.co?utm_source=github
 
 [1]: http://www.fsf.org/licensing/essays/free-sw.html
 [2]: https://github.com/spree/spree_gateway/issues

data/app/models/spree/gateway/stripe_apple_pay_gateway.rb

@@ -0,0 +1,10 @@
+module Spree
+  class Gateway::StripeApplePayGateway < Gateway::StripeGateway
+    preference :country_code, :string, default: 'US'
+    preference :domain_verification_certificate, :text
+
+    def method_type
+      'stripe_apple_pay'
+    end
+  end
+end

data/app/models/spree/gateway/stripe_elements_gateway.rb

@@ -0,0 +1,7 @@
+module Spree
+  class Gateway::StripeElementsGateway < Gateway::StripeGateway
+    def method_type
+      'stripe_elements'
+    end
+  end
+end

data/app/models/spree/gateway/stripe_gateway.rb

@@ -87,17 +87,14 @@ module Spree
 
     # In this gateway, what we call 'secret_key' is the 'login'
     def options
-      super.merge(
-        login: preferred_secret_key,
-        application: app_info
-      )
+      options = super
+      options.merge(:login => preferred_secret_key)
     end
 
     def options_for_purchase_or_auth(money, creditcard, gateway_options)
       options = {}
       options[:description] = "Spree Order ID: #{gateway_options[:order_id]}"
       options[:currency] = gateway_options[:currency]
-      options[:application] = app_info
 
       if customer = creditcard.gateway_customer_profile_id
         options[:customer] = customer
@@ -136,11 +133,5 @@ module Spree
       source.cc_type = CARD_TYPE_MAPPING[source.cc_type] if CARD_TYPE_MAPPING.include?(source.cc_type)
       source
     end
-
-    def app_info
-      name_with_version = "SpreeGateway/#{SpreeGateway.version}"
-      url = 'https://spreecommerce.org'
-      "#{name_with_version} #{url}"
-    end
   end
 end

data/app/models/spree/order_decorator.rb

@@ -0,0 +1,15 @@
+module SpreeGateway
+  module ApplePayOrderDecorator
+    def confirmation_required?
+      return false if paid_with_apple_pay?
+
+      super
+    end
+
+    def paid_with_apple_pay?
+      payments.valid.any?(&:apple_pay?)
+    end
+  end
+end
+
+Spree::Order.prepend SpreeGateway::ApplePayOrderDecorator

data/app/models/spree/payment_decorator.rb

@@ -0,0 +1,9 @@
+module SpreeGateway
+  module ApplePayPaymentDecorator
+    def apple_pay?
+      payment_method.is_a? Spree::Gateway::StripeApplePayGateway
+    end
+  end
+end
+
+Spree::Payment.prepend SpreeGateway::ApplePayPaymentDecorator

data/config/routes.rb

@@ -0,0 +1,6 @@
+# we need to add this route to the root Rails application because Spree can
+# be mounted to some path eg. /shop and Apple Pay expects to access this file
+# via https://example.com/.well-known/apple-developer-merchantid-domain-association
+Rails.application.routes.draw do
+  get '/.well-known/apple-developer-merchantid-domain-association' => 'spree/apple_pay_domain_verification#show'
+end

data/gemfiles/spree_3_2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "spree", "~> 3.2.0"
 gem "rails-controller-testing"
+gem "spree", "~> 3.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/spree_3_5.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails-controller-testing"
+gem "spree", "~> 3.5.0"
+
+gemspec path: "../"

data/gemfiles/spree_3_6.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails-controller-testing"
+gem "spree", "~> 3.6.0"
+
+gemspec path: "../"

data/gemfiles/spree_master.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "spree", :github => "spree/spree", :branch => "master"
 gem "rails-controller-testing"
+gem "spree", github: "spree/spree", branch: "master"
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/controllers/spree/apple_pay_domain_verification_controller.rb

@@ -0,0 +1,11 @@
+module Spree
+  class ApplePayDomainVerificationController < Spree::BaseController
+    def show
+      gateway = Spree::Gateway::StripeApplePayGateway.active.last
+
+      raise ActiveRecord::RecordNotFound unless gateway
+
+      render plain: gateway.preferred_domain_verification_certificate
+    end
+  end
+end

data/lib/generators/spree_gateway/install/install_generator.rb

@@ -1,27 +1,18 @@
 module SpreeGateway
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      class_option :auto_run_migrations, type: :boolean, default: false
+      class_option :migrate, type: :boolean, default: true, banner: 'Migrate the database'
 
       def add_migrations
         run 'bundle exec rake railties:install:migrations FROM=spree_gateway'
       end
 
       def run_migrations
-         if running_migrations?
-           run 'bundle exec rake db:migrate'
-         else
-           puts "Skiping rake db:migrate, don't forget to run it!"
-         end
-      end
-
-      private
-
-      def running_migrations?
-         options.auto_run_migrations? || begin
-           response = ask 'Would you like to run the migrations now? [Y/n]'
-           ['', 'y'].include? response.downcase
-         end
+       if options[:migrate]
+         run 'bundle exec rake db:migrate VERBOSE=false'
+       else
+         puts "Skiping rake db:migrate, don't forget to run it!"
+       end
       end
     end
   end

data/lib/spree_gateway.rb

@@ -1,5 +1,4 @@
 require 'spree_core'
 require 'spree_gateway/engine'
-require 'spree_gateway/version'
 require 'sass/rails'
 require 'spree_extension'

data/lib/spree_gateway/engine.rb

@@ -30,6 +30,8 @@ module SpreeGateway
       app.config.spree.payment_methods << Spree::Gateway::SecurePayAU
       app.config.spree.payment_methods << Spree::Gateway::SpreedlyCoreGateway
       app.config.spree.payment_methods << Spree::Gateway::StripeGateway
+      app.config.spree.payment_methods << Spree::Gateway::StripeElementsGateway
+      app.config.spree.payment_methods << Spree::Gateway::StripeApplePayGateway
       app.config.spree.payment_methods << Spree::Gateway::UsaEpayTransaction
       app.config.spree.payment_methods << Spree::Gateway::Worldpay
     end
@@ -40,11 +42,8 @@ module SpreeGateway
           'lib/assets/javascripts/spree/frontend/spree_gateway.js',
           'lib/assets/stylesheets/spree/frontend/spree_gateway.css',
         ]
-        Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
-          Rails.configuration.cache_classes ? require(c) : load(c)
-        end
       end
-      Dir.glob(File.join(File.dirname(__FILE__), '../../lib/active_merchant/**/*_decorator*.rb')) do |c|
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/spree/*_decorator*.rb')) do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
       end
     end
@@ -61,8 +60,9 @@ module SpreeGateway
       paths["app/views"] << "lib/views/backend"
     end
 
+    paths['app/controllers'] << 'lib/controllers'
+
     if self.frontend_available?
-      paths["app/controllers"] << "lib/controllers/frontend"
       paths["app/views"] << "lib/views/frontend"
     end
 

data/lib/views/frontend/spree/checkout/payment/_stripe.html.erb

@@ -57,7 +57,7 @@
     }
   };
 
-  $(document).ready(function() {
+  Spree.ready(function() {
     Spree.stripePaymentMethod.prepend("<div id='stripeError' class='errorExplanation alert alert-danger' style='display:none'></div>");
     return $('#checkout_form_payment [data-hook=buttons]').click(function() {
       var expiration, params;
@@ -78,16 +78,4 @@
   });
 </script>
 
-<%- if @order.has_checkout_step?('address') -%>
-  <script>
-    Spree.stripeAdditionalInfo = {
-      name: "<%= @order.bill_address.full_name %>",
-      address_line1: "<%= @order.bill_address.address1 %>",
-      address_line2: "<%= @order.bill_address.address2 %>",
-      address_city: "<%= @order.bill_address.city %>",
-      address_state: "<%= @order.bill_address.state_text %>",
-      address_zip: "<%= @order.bill_address.zipcode %>",
-      address_country: "<%= @order.bill_address.country %>"
-    }
-  </script>
-<%- end -%>
+<%= render 'spree/checkout/payment/stripe_additional_info', bill_address: @order.bill_address %>

data/lib/views/frontend/spree/checkout/payment/_stripe_additional_info.html.erb

@@ -0,0 +1,14 @@
+<% bill_address ||= @order.bill_address %>
+<%- if @order.has_checkout_step?('address') -%>
+  <script>
+    Spree.stripeAdditionalInfo = {
+      name: "<%= bill_address.full_name %>",
+      address_line1: "<%= bill_address.address1 %>",
+      address_line2: "<%= bill_address.address2 %>",
+      address_city: "<%= bill_address.city %>",
+      address_state: "<%= bill_address.state_text %>",
+      address_zip: "<%= bill_address.zipcode %>",
+      address_country: "<%= bill_address.country %>"
+    }
+  </script>
+<%- end -%>

data/lib/views/frontend/spree/checkout/payment/_stripe_apple_pay.html.erb

@@ -0,0 +1,97 @@
+<% param_prefix = "payment_source[#{payment_method.id}]" %>
+
+<div id="payment-request-button">
+  <!-- A Stripe Element will be inserted here. -->
+</div>
+
+<script type="text/javascript" src="https://js.stripe.com/v3/"></script>
+
+<script>
+  Spree.stripeApplePayPaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+  var stripeApplePay = Stripe("<%= payment_method.preferred_publishable_key %>");
+  var elements = stripeApplePay.elements();
+
+  var paymentRequest = stripeApplePay.paymentRequest({
+    country: '<%= payment_method.preferred_country_code.try(:upcase) %>',
+    currency: '<%= @order.currency.downcase %>',
+    displayItems: [
+      <% @order.line_items.each do |line_item| %>
+      {
+        label: '<%= line_item.name %> x <%= line_item.quantity %>',
+        amount: <%= Spree::Money.new(line_item.total, currency: line_item.currency).amount_in_cents %>
+      },
+      <% end %>
+      <% if @order.tax_total != 0 %>
+      {
+        label: '<%= Spree.t(:tax) %>',
+        amount: <%= Spree::Money.new(@order.tax_total, currency: @order.currency).amount_in_cents %>
+      },
+      <% end %>
+      <% if @order.shipment_total != 0 %>
+      {
+        label: '<%= Spree.t(:shipment) %>',
+        amount: <%= Spree::Money.new(@order.shipment_total, currency: @order.currency).amount_in_cents %>
+      }
+      <% end %>
+    ],
+    total: {
+      label: '<%= Spree.t(:total) %>',
+      amount: <%= Spree::Money.new(@order.total, currency: @order.currency).amount_in_cents %>
+    },
+    requestPayerName: false,
+    requestPayerEmail: false,
+    requestPayerPhone: false
+  });
+
+  var prButton = elements.create('paymentRequestButton', {
+    paymentRequest: paymentRequest,
+  });
+
+  // Check the availability of the Payment Request API first.
+  paymentRequest.canMakePayment().then(function(result) {
+    if (result) {
+      prButton.mount('#payment-request-button');
+    } else {
+      document.getElementById('payment-request-button').style.display = 'none';
+    }
+  });
+
+  function addCreditCardFieldToForm(form, name, value) {
+    var hiddenInput = document.createElement('input');
+
+    hiddenInput.setAttribute('type', 'hidden');
+    hiddenInput.setAttribute('name', name);
+    hiddenInput.setAttribute('value', value);
+    form.appendChild(hiddenInput);
+  };
+
+  paymentRequest.on('token', function(ev) {
+    var form = document.getElementById('checkout_form_payment');
+    var token = ev.token;
+    if (ev.payerName) {
+      var payerName = ev.payerName
+    } else if (Spree.stripeAdditionalInfo) {
+      var payerName = Spree.stripeAdditionalInfo.name
+    }
+    addCreditCardFieldToForm(form, '<%= param_prefix %>[gateway_payment_profile_id]', token.id);
+    addCreditCardFieldToForm(form, '<%= param_prefix %>[number]', token.card.last4);
+    addCreditCardFieldToForm(form, '<%= param_prefix %>[month]', token.card.exp_month);
+    addCreditCardFieldToForm(form, '<%= param_prefix %>[year]', token.card.exp_year);
+    addCreditCardFieldToForm(form, '<%= param_prefix %>[name]', payerName);
+    ev.complete('success');
+    form.submit();
+  });
+
+  Spree.ready(function() {
+    Spree.stripeApplePayPaymentMethod.prepend("<div id='stripeApplePayError' class='errorExplanation alert alert-danger' style='display:none'></div>");
+    var form = document.getElementById('checkout_form_payment');
+    form.addEventListener('submit', function(e) {
+      if (Spree.stripeApplePayPaymentMethod.is(':visible')) {
+        $('#stripeApplePayError').hide();
+        e.preventDefault();
+      }
+    });
+  });
+</script>
+
+<%= render 'spree/checkout/payment/stripe_additional_info' %>

data/lib/views/frontend/spree/checkout/payment/_stripe_elements.html.erb

@@ -0,0 +1,104 @@
+<% param_prefix = "payment_source[#{payment_method.id}]" %>
+<div class="well clearfix">
+  <p class="field">
+    <%= label_tag "name_on_card_#{payment_method.id}" do %>
+      <%= Spree.t(:name_on_card) %><abbr class="required" title="required">*</abbr>
+    <% end %>
+    <%= text_field_tag "#{param_prefix}[name]", "#{@order.bill_address_firstname} #{@order.bill_address_lastname}", { id: "name_on_card_#{payment_method.id}", class: 'form-control required'} %>
+    </p>
+    <div class="form-row">
+      <%= label_tag "card_number" do %>
+        <%= Spree.t(:card_number) %><abbr class="required" title="required">*</abbr>
+      <% end %>
+      <div class="form-control required cardNumber">
+        <div id="card-element">
+          <!-- a Stripe Element will be inserted here. -->
+        </div>
+      </div>
+      <!-- Used to display form errors -->
+      <div id="card-errors" role="alert"></div>
+    </div>
+  </p>
+</div>
+
+<script type="text/javascript" src="https://js.stripe.com/v3/"></script>
+
+<script>
+  Spree.stripeElementsPaymentMethod = $('#payment_method_' + <%= payment_method.id %>);
+  var stripeElements = Stripe("<%= payment_method.preferred_publishable_key %>");
+  var elements = stripeElements.elements();
+
+  var card = elements.create('card', {
+    iconStyle: 'solid',
+    hidePostalCode: true,
+    style: {
+      base: {
+        iconColor: '#555555',
+        lineHeight: '24px',
+        fontWeight: 300,
+        fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+        fontSize: '14px',
+
+        '::placeholder': {
+          color: '#555555',
+        },
+      },
+      invalid: {
+        iconColor: '#e85746',
+        color: '#e85746',
+      }
+    },
+    classes: {
+      focus: 'is-focused',
+      empty: 'is-empty',
+    },
+  });
+  card.mount('#card-element');
+
+  function addCreditCardFieldToForm(form, name, value) {
+    var hiddenInput = document.createElement('input');
+
+    hiddenInput.setAttribute('type', 'hidden');
+    hiddenInput.setAttribute('name', name);
+    hiddenInput.setAttribute('value', value);
+    form.appendChild(hiddenInput);
+  };
+
+  function stripeElementsTokenHandler(token) {
+    var form = document.getElementById('checkout_form_payment');
+    addCreditCardFieldToForm(form, '<%= param_prefix %>[gateway_payment_profile_id]', token.id)
+    addCreditCardFieldToForm(form, '<%= param_prefix %>[number]', token.card.last4)
+    addCreditCardFieldToForm(form, '<%= param_prefix %>[month]', token.card.exp_month)
+    addCreditCardFieldToForm(form, '<%= param_prefix %>[year]', token.card.exp_year)
+    form.submit();
+  };
+
+  function createStripeElementsToken() {
+    stripeElements.createToken(card, Spree.stripeAdditionalInfo).then(function (result) {
+      if (result.error) {
+        // Inform the user if there was an error
+        var errorElement = document.getElementById('card-errors');
+
+        $('#stripeElementsError').html(result.error.message);
+        $('#stripeElementsError').show()
+        Spree.enableSave();
+      } else {
+        stripeElementsTokenHandler(result.token);
+      }
+    });
+  };
+
+  Spree.ready(function() {
+    Spree.stripeElementsPaymentMethod.prepend("<div id='stripeElementsError' class='errorExplanation alert alert-danger' style='display:none'></div>");
+    var form = document.getElementById('checkout_form_payment');
+    form.addEventListener('submit', function(e) {
+      if (Spree.stripeElementsPaymentMethod.is(':visible')) {
+        $('#stripeElementsError').hide();
+        e.preventDefault();
+        createStripeElementsToken();
+      }
+    });
+  });
+</script>
+
+<%= render 'spree/checkout/payment/stripe_additional_info' %>

data/spec/models/spree/order_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe Spree::Order do
+  let(:order_one) { OrderWalkthrough.up_to(:payment) }
+  let(:order_two) { OrderWalkthrough.up_to(:payment) }
+  let(:stripe_apple_pay_payment_method) do
+    Spree::Gateway::StripeApplePayGateway.create!(
+      name: 'ApplePay',
+      preferred_domain_verification_certificate: FFaker::Lorem.characters(20)
+    )
+  end
+  let(:stripe_credit_card_payment_method) do
+    Spree::Gateway::StripeGateway.create!(
+      name: 'CreditCard',
+      preferred_secret_key: FFaker::Lorem.characters(20),
+      preferred_publishable_key: FFaker::Lorem.characters(20)
+    )
+  end
+
+  before do
+    Spree::Config[:always_include_confirm_step] = true
+    allow_any_instance_of(Spree::PaymentMethod).to receive(:source_required?).and_return(false)
+
+    order_one.payments.create(payment_method_id: stripe_apple_pay_payment_method.id,
+                              amount: 29.99,
+                              state: 'completed')
+    order_two.payments.create(payment_method_id: stripe_credit_card_payment_method.id,
+                              amount: 29.99,
+                              state: 'completed')
+    order_one.update_totals
+    order_two.update_totals
+  end
+
+  describe '#paid_with_apple_pay?' do
+    context 'when an order was paid with Apply Pay' do
+      it 'returns true' do
+        expect(order_one.paid_with_apple_pay?).to eq true
+      end
+    end
+
+    context 'when an order was paid with Credit Card' do
+      it 'returns false' do
+        expect(order_two.paid_with_apple_pay?).to eq false
+      end
+    end
+  end
+
+  describe '#confirmation_required?' do
+    context 'when an order was paid with Apply Pay' do
+      it 'returns false' do
+        expect(order_one.confirmation_required?).to eq false
+      end
+    end
+
+    context 'when an order was paid with Credit Card' do
+      it 'returns true' do
+        expect(order_two.confirmation_required?).to eq true
+      end
+    end
+  end
+
+  context 'when an order was paid with Apply Pay' do
+    it 'proceeds to Complete order state' do
+      order_one.next
+
+      expect(order_one.state).to eq 'complete'
+    end
+  end
+
+  context 'when an order was paid with Credit Card' do
+    it 'proceeds to Confirm order state' do
+      order_two.next
+
+      expect(order_two.state).to eq 'confirm'
+    end
+  end
+end

data/spec/requests/apple_pay_domain_verification.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe 'Apple Pay Domain Verification', type: :request do
+  let(:domain_verification_certificate) { FFaker::Lorem.characters(20) }
+  let(:stripe_apple_pay_payment_method) do
+    Spree::Gateway::StripeApplePayGateway.create!(
+      name: 'ApplePay',
+      preferred_domain_verification_certificate: domain_verification_certificate
+    )
+  end
+  let(:execute) { get '/.well-known/apple-developer-merchantid-domain-association' }
+
+  shared_examples 'returns 404' do
+    it 'returns RecordNotFound exception' do
+      expect { execute }.to raise_exception(ActiveRecord::RecordNotFound)
+    end
+  end
+
+  context 'apple pay gateway exists' do
+    before do
+      stripe_apple_pay_payment_method
+      execute
+    end
+
+    it 'returns 200 HTTP status' do
+      expect(response.status).to eq(200)
+    end
+
+    it 'renders domain verification certificate' do
+      expect(response.body).to eq domain_verification_certificate
+    end
+  end
+
+  context 'apple pay gateway doesnt exist' do
+    it_behaves_like 'returns 404'
+  end
+
+  context 'apple pay gateway not active' do
+    before do
+      stripe_apple_pay_payment_method.update_column(:active, false)
+    end
+
+    it_behaves_like 'returns 404'
+  end
+end

data/spec/spec_helper.rb

@@ -11,10 +11,10 @@ require 'capybara/rspec'
 require 'capybara/rails'
 require 'capybara-screenshot/rspec'
 require "selenium-webdriver"
-require 'webdrivers'
 require 'database_cleaner'
 require 'ffaker'
 require 'rspec/active_model/mocks'
+require 'pry'
 
 Dir[File.join(File.dirname(__FILE__), "support", "**", "*.rb")].each { |f| require f }
 
@@ -23,7 +23,7 @@ require 'spree/testing_support/order_walkthrough'
 require 'spree/testing_support/preferences'
 require 'spree/testing_support/capybara_ext'
 
-FactoryGirl.find_definitions
+FactoryBot.find_definitions
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
@@ -35,7 +35,7 @@ RSpec.configure do |config|
   #config.filter_run focus: true
   #config.filter_run_excluding slow: true
 
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include Spree::TestingSupport::Preferences
 
   config.before :suite do
@@ -56,10 +56,8 @@ RSpec.configure do |config|
   Capybara.register_driver :chrome do |app|
     Capybara::Selenium::Driver.new app,
       browser: :chrome,
-      options: Selenium::WebDriver::Chrome::Options.new(
-        args: %w[no-sandbox disable-dev-shm-usage disable-popup-blocking headless disable-gpu window-size=1920,1080 --enable-features=NetworkService,NetworkServiceInProcess --disable-features=VizDisplayCompositor],
-        log_level: :error
-      )
+      options: Selenium::WebDriver::Chrome::Options.new(args: %w[disable-popup-blocking headless disable-gpu window-size=1920,1080])
   end
+
   Capybara.javascript_driver = :chrome
 end

data/spree_gateway.gemspec

@@ -1,13 +1,8 @@
 # coding: utf-8
-lib = File.expand_path('../lib/', __FILE__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-
-require 'spree_gateway/version'
-
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_gateway'
-  s.version     = SpreeGateway.version
+  s.version     = '3.4.0'
   s.summary     = 'Additional Payment Gateways for Spree Commerce'
   s.description = s.summary
 
@@ -25,27 +20,25 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_extension'
 
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'bootstrap-sass', '>= 3.3.5.1'
   s.add_development_dependency 'braintree'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'capybara-screenshot'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_girl'
-  s.add_development_dependency 'factory_bot', '~> 4.7'
+  s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'launchy'
-  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'mysql2', '~> 0.5.1'
   s.add_development_dependency 'pg', '~> 0.18'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'puma'
   s.add_development_dependency 'rspec-activemodel-mocks'
   s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'bootstrap-sass', '>= 3.3.5.1'
   s.add_development_dependency 'sass-rails', '>= 3.2'
   s.add_development_dependency 'selenium-webdriver'
-  s.add_development_dependency 'webdrivers', '~> 3.9.0'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3', '~> 1.3.6'
-  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.4.0
 platform: ruby
 authors:
 - Spree Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: braintree
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +59,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.5.1
+- !ruby/object:Gem::Dependency
+  name: braintree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara-screenshot
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,16 +146,16 @@ dependencies:
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -188,16 +202,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -268,20 +282,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bootstrap-sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.5.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -310,20 +310,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -340,20 +326,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -406,34 +378,42 @@ files:
 - app/models/spree/gateway/sage_pay.rb
 - app/models/spree/gateway/secure_pay_au.rb
 - app/models/spree/gateway/spreedly_core_gateway.rb
+- app/models/spree/gateway/stripe_apple_pay_gateway.rb
+- app/models/spree/gateway/stripe_elements_gateway.rb
 - app/models/spree/gateway/stripe_gateway.rb
 - app/models/spree/gateway/usa_epay_transaction.rb
 - app/models/spree/gateway/worldpay.rb
+- app/models/spree/order_decorator.rb
+- app/models/spree/payment_decorator.rb
 - config/locales/bg.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/sv.yml
+- config/routes.rb
 - db/migrate/20121017004102_update_braintree_payment_method_type.rb
 - db/migrate/20130213222555_update_stripe_payment_method_type.rb
 - db/migrate/20130415222802_update_balanced_payment_method_type.rb
 - db/migrate/20131008221012_update_paypal_payment_method_type.rb
 - db/migrate/20131112133401_migrate_stripe_preferences.rb
-- gemfiles/spree_3_1.gemfile
 - gemfiles/spree_3_2.gemfile
+- gemfiles/spree_3_5.gemfile
+- gemfiles/spree_3_6.gemfile
 - gemfiles/spree_master.gemfile
-- lib/active_merchant/billing/gateways/stripe_decorator.rb
 - lib/assets/javascripts/spree/frontend/spree_gateway.js
 - lib/assets/stylesheets/spree/frontend/spree_gateway.css
+- lib/controllers/spree/apple_pay_domain_verification_controller.rb
 - lib/generators/spree_gateway/install/install_generator.rb
 - lib/spree_gateway.rb
 - lib/spree_gateway/engine.rb
-- lib/spree_gateway/version.rb
 - lib/views/backend/spree/admin/log_entries/_braintree.html.erb
 - lib/views/backend/spree/admin/log_entries/_stripe.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_quickcheckout.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_stripe.html.erb
 - lib/views/backend/spree/admin/payments/source_views/_stripe.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe.html.erb
+- lib/views/frontend/spree/checkout/payment/_stripe_additional_info.html.erb
+- lib/views/frontend/spree/checkout/payment/_stripe_apple_pay.html.erb
+- lib/views/frontend/spree/checkout/payment/_stripe_elements.html.erb
 - script/rails
 - spec/features/stripe_checkout_spec.rb
 - spec/models/gateway/authorize_net_cim_spec.rb
@@ -461,6 +441,8 @@ files:
 - spec/models/gateway/stripe_gateway_spec.rb
 - spec/models/gateway/usa_epay_transaction_spec.rb
 - spec/models/gateway/worldpay_spec.rb
+- spec/models/spree/order_spec.rb
+- spec/requests/apple_pay_domain_verification.rb
 - spec/spec_helper.rb
 - spec/support/wait_for_stripe.rb
 - spree_gateway.gemspec
@@ -484,7 +466,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Additional Payment Gateways for Spree Commerce
@@ -515,5 +498,7 @@ test_files:
 - spec/models/gateway/stripe_gateway_spec.rb
 - spec/models/gateway/usa_epay_transaction_spec.rb
 - spec/models/gateway/worldpay_spec.rb
+- spec/models/spree/order_spec.rb
+- spec/requests/apple_pay_domain_verification.rb
 - spec/spec_helper.rb
 - spec/support/wait_for_stripe.rb

data/gemfiles/spree_3_1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "spree", "~> 3.1.0"
-
-gemspec :path => "../"

data/lib/active_merchant/billing/gateways/stripe_decorator.rb

@@ -1,17 +0,0 @@
-ActiveMerchant::Billing::StripeGateway.class_eval do
-  private
-
-  alias_method :original_headers, :headers
-  alias_method :original_add_customer_data, :add_customer_data
-
-  def headers(options = {})
-    headers = original_headers(options)
-    headers['User-Agent'] = headers['X-Stripe-Client-User-Agent']
-    headers
-  end
-
-  def add_customer_data(post, options)
-    original_add_customer_data(post, options)
-    post[:payment_user_agent] = "SpreeGateway/#{SpreeGateway.version}"
-  end
-end

data/lib/spree_gateway/version.rb

@@ -1,5 +0,0 @@
-module SpreeGateway
-  def self.version
-    '3.3.7'
-  end
-end