solidus-adyen 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b981dfc62f2ab3ffa76996fe091a6ff639b86d32
-  data.tar.gz: 0372a49ad6ff5763af8c0748315838c7b8976321
+  metadata.gz: 30642824e2cf52ec60990cff981d9031976d872b
+  data.tar.gz: c591f80c5901703cc01569d15af3617f62077140
 SHA512:
-  metadata.gz: 1a2ec3751f1119a2d271fc03f8ace0a8364d6605ea9f68afe71caca65faca6e2d669b0fd2fb52bddb8d98c726b38a2b5ab6bb0d7f400fb1cc7b90032688f33dc
-  data.tar.gz: 5145598ee3116a7ac02bbdbb7c2eef673f655ec34e52869d0352f4ac0fda0ff0e28f066c0f539138d45397c75db07546912ea49ebc3aeeeee09e67120e8f6d73
+  metadata.gz: 376c387db2a66a64c0a543bd3e470328fe3e6462b89f36b6e115cb3306a998c3d7dfbabdce96a2698b5b668a23ae49a18e0c2f99d54a2a3ad3853209213d91da
+  data.tar.gz: 5bc39e85ba846957b6ee7b0ad0fef4a9a5f129f5727d05412da6c5c0e689a4521ce62ce453a786200f955c52de80973bf560d715cca875d4c8ef33684c1ef678

data/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/.travis.yml

@@ -7,4 +7,5 @@ install:
   - bundle install
 script:
   - bundle exec rake test_app
+  - ( cd ./spec/dummy && bundle exec rake solidus-adyen:factory_girl:lint RAILS_ENV=test )
   - bundle exec rspec

data/Gemfile

@@ -1,12 +1,20 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "solidus", "~> 1.0.0"
-gem "solidus_auth_devise", "~> 1.2.0"
+group :development, :test do
+  gem "solidus"
+  gem "solidus_auth_devise"
+
+  gem "pg"
+  gem "mysql2"
+  gem "sqlite3"
+end
 
 group :test do
+  gem "database_cleaner"
+  gem "factory_girl"
   gem "timecop"
-  gem "webmock"
   gem "vcr"
+  gem "webmock", "~> 1.24"
 end
 
 gemspec

data/README.md

@@ -1,4 +1,7 @@
-# Solidus-Adyen [![Build Status](https://travis-ci.org/StemboltHQ/solidus-adyen.svg)](https://travis-ci.org/StemboltHQ/solidus-adyen) 
+# Solidus-Adyen [![Build Status](https://travis-ci.org/StemboltHQ/solidus-adyen.svg)](https://travis-ci.org/StemboltHQ/solidus-adyen)
+
+**NOTICE** From July 2016 Adyen will no longer support SHA1 HPP's, this extension is _not_ only compatible with the SHA256 skins.
+
 Adds support for Adyen Hosted Payment Page payments to Solidus stores using the
 [Adyen](https://github.com/wvanbergen/adyen/) gem.
 
@@ -14,7 +17,7 @@ notification is received from Adyen.
 # Installation
 Add this line to your application's Gemfile:
 ```ruby
-gem 'solidus-adyen', '~> 0.1'
+gem 'solidus-adyen', '~> 1.0.0'
 ```
 
 Then run:
@@ -196,20 +199,17 @@ in the view.
 
 # Testing
 ```bash
-$ bundle exec rake test_app
+$ DB=postgres bundle exec rake test_app
 $ rspec
+$ cd spec/dummy
+$ rake solidus-adyen:factory_girl:lint
 ```
 
 # Development
 My prefered method of setting up a sandbox is with
 ```bash
-$ rake test_app
-$ cd spec/dummy
-$ rake railties:install:migrations
-$ rake db:migrate
-$ rake db:seed
-$ rake db:spree_sample:load
-$ ./bin/rails s
+$ ./bin/bootstrap.sh
+$ ./spec/dummy/bin/rails s
 ```
 You will need to reverse tunnel or make your server publicly available by some
 other means - and update the server communication as well as the skin's url
@@ -217,7 +217,7 @@ with the proper end point to receive notifications.
 
 # Test Credit Card Info
 
-https://support.adyen.com/index.php?/Knowledgebase/Article/View/11/0/test-card-numbers
+https://docs.adyen.com/support/integration#testcardnumbers
 
 # Terminology and other API information
 [More info about Adyen can be found here](https://docs.adyen.com/display/TD/3D+Secure).

data/app/controllers/spree/adyen/hpps_controller.rb

@@ -10,7 +10,7 @@ module Spree
       layout false
 
       def directory
-        @brands = Adyen::Form.payment_methods_from_directory(
+        @brands = Spree::Adyen::HPP.payment_methods_from_directory(
           @order,
           @payment_method)
 

data/app/controllers/spree/adyen_redirect_controller.rb

@@ -43,7 +43,7 @@ module Spree
         state: "checkout"
       )
 
-      if @order.complete
+      if complete
         redirect_to_order
       else
         #TODO void/cancel payment
@@ -52,13 +52,21 @@ module Spree
     end
 
     # If an authorization notification is received before the redirection the
-    # payment is created there.In this case we just need to assign the addition
+    # payment is created there. In this case we just need to assign the addition
     # parameters received about the source.
     #
     # We do this because there is a chance that we never get redirected back
     # so we need to make sure we complete the payment and order.
     def confirm_order_already_completed
-      payment = @order.payments.find_by!(response_code: psp_reference)
+      if psp_reference
+        payment = @order.payments.find_by!(response_code: psp_reference)
+      else
+        # If no psp_reference is present but the order is complete then the
+        # notification must have completed the order and created the payment.
+        # Therefore select the last Adyen payment.
+        payment =
+          @order.payments.where(source_type: "Spree::Adyen::HppSource").last
+      end
 
       payment.source.update(source_params)
 
@@ -66,12 +74,14 @@ module Spree
     end
 
     def redirect_to_order
+      @current_order = nil
       flash.notice = Spree.t(:order_processed_successfully)
+      flash['order_completed'] = true
       redirect_to order_path(@order)
     end
 
     def check_signature
-      unless ::Adyen::Form.redirect_signature_check(params, @payment_method.shared_secret)
+      unless ::Adyen::HPP::Signature.verify(response_params, @payment_method.shared_secret)
         raise "Payment Method not found."
       end
     end
@@ -90,15 +100,23 @@ module Spree
     end
 
     def source_params
+      adyen_permitted_params
+    end
+
+    def response_params
+      adyen_permitted_params
+    end
+
+    def adyen_permitted_params
       params.permit(
         :authResult,
-        :pspReference,
         :merchantReference,
-        :skinCode,
+        :merchantReturnData,
         :merchantSig,
         :paymentMethod,
+        :pspReference,
         :shopperLocale,
-        :merchantReturnData)
+        :skinCode)
     end
 
     def order_number
@@ -108,5 +126,10 @@ module Spree
     def psp_reference
       params[:pspReference]
     end
+
+    def complete
+      @order.contents.advance
+      @order.complete
+    end
   end
 end

data/app/models/adyen_notification.rb

@@ -83,7 +83,18 @@ class AdyenNotification < ActiveRecord::Base
   end
 
   def payment
-    Spree::Payment.find_by response_code: original_reference || psp_reference
+    reference = original_reference || psp_reference
+    payment_with_reference = Spree::Payment.find_by response_code: reference
+    return payment_with_reference if payment_with_reference
+
+    # If no reference take the last payment in the associated order where the
+    # response_code was nil.
+    if order
+      order
+        .payments
+        .where(source_type: "Spree::Adyen::HppSource", response_code: nil)
+        .last
+    end
   end
 
   # Returns true if this notification is an AUTHORISATION notification

data/app/models/concerns/spree/adyen/payment.rb

@@ -67,7 +67,6 @@ module Spree
       end
 
       def process &block
-        check_environment
         response = nil
 
         Spree::Payment.transaction do

data/app/models/spree/adyen/notification_processor.rb

@@ -77,7 +77,7 @@ module Spree
 
         elsif notification.refund?
           payment.refunds.create!(
-            amount: notification.value / 100, # cents to dollars
+            amount: notification.value / 100.0, # cents to dollars
             transaction_id: notification.psp_reference,
             refund_reason_id: ::Spree::RefundReason.first.id # FIXME
           )
@@ -89,6 +89,13 @@ module Spree
 
       # normal event is defined as just AUTHORISATION
       def handle_normal_event
+        # Payment may not have psp_reference. Add this from notification if it
+        # doesn't have one.
+        unless self.payment.response_code
+          payment.response_code = notification.psp_reference
+          payment.save
+        end
+
         if notification.auto_captured?
           complete_payment!
 
@@ -132,6 +139,7 @@ module Spree
           order: order
         )
 
+        order.contents.advance
         order.complete
         payment
       end
@@ -142,7 +150,6 @@ module Spree
         notification.order.present? &&
         payment.nil?
       end
-
     end
   end
 end

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

@@ -7,6 +7,7 @@ module Spree
     preference :api_username, :string
     preference :api_password, :string
     preference :merchant_account, :string
+    preference :restricted_brand_codes, :string, default: ''
 
     def merchant_account
       ENV["ADYEN_MERCHANT_ACCOUNT"] || preferred_merchant_account
@@ -73,6 +74,10 @@ module Spree
         psp_reference)
     end
 
+    def restricted_brand_codes
+      preferred_restricted_brand_codes.split(',').compact.uniq
+    end
+
     private
 
     def handle_response response, original_reference

data/bin/bootstrap.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+bundle exec rake test_app DB=postgres
+cd spec/dummy
+bundle exec rake db:schema:load
+bundle exec rake db:seed AUTO_ACCEPT=1
+bundle exec rake spree_sample:load
+
+sed -i.bak "s/USD/EUR/" config/initializers/spree.rb

data/config/locales/en.yml

@@ -21,3 +21,4 @@ en:
         method only supports manual refunds.
         Please attempt to refund this payment through the Adyen customer area
         or contact an Adyen representative to assist.
+  restricted_brand_codes: "Restricted Brand Codes (comma delimited, no spaces)"

data/lib/spree/adyen.rb

@@ -2,5 +2,5 @@ require "spree/adyen/version"
 require "adyen"
 require "spree_core"
 require "spree/adyen/engine"
-require "spree/adyen/form"
+require "spree/adyen/hpp"
 require "spree/adyen/hpp_check"

data/lib/spree/adyen/{form.rb → hpp.rb}

@@ -2,8 +2,8 @@ require "json"
 
 module Spree
   module Adyen
-    module Form
-      Form = ::Adyen::Form
+    module HPP
+      HPP = ::Adyen::HPP
       UrlHelper = Object.new.extend ActionView::Helpers::UrlHelper
 
       class << self
@@ -41,15 +41,21 @@ module Spree
         end
 
         def endpoint_url endpoint, order, payment_method, opts = {}
-          base = URI::parse(url payment_method, endpoint)
+          adyen_request = hpp_request order, payment_method, opts
 
-          URI::HTTPS.build(
-            host: base.host,
-            path: base.path,
-            query: params(order, payment_method).merge(opts).to_query)
+          URI::parse("#{adyen_request.url(endpoint)}?#{adyen_request.flat_payment_parameters.to_query}")
         end
 
         private
+        def hpp_request order, payment_method, opts
+          server = payment_method.preferences.fetch(:server)
+          parameters = params(order, payment_method).merge(opts)
+
+          HPP::Request.new(parameters, environment: server,
+                                       skin: { skin_code: payment_method.skin_code },
+                                       shared_secret: payment_method.shared_secret)
+        end
+
         def payment_methods order, payment_method
           url = directory_url(order, payment_method)
 
@@ -60,18 +66,16 @@ module Spree
           )
         end
 
-        def url payment_method, endpoint
-          server = payment_method.preferences.fetch(:server)
-          Form.url(server, endpoint)
-        end
-
         def form_payment_methods_and_urls response, order, payment_method
           response.fetch("paymentMethods").map do |brand|
+            next unless payment_method_allows_brand_code?(payment_method, brand['brandCode'])
+
             issuers = brand.fetch("issuers", []).map do |issuer|
               form_issuer(issuer, order, payment_method, brand)
             end
+
             form_payment_method(brand, order, payment_method, issuers)
-          end
+          end.compact
         end
 
         def form_issuer issuer, order, payment_method, brand
@@ -100,16 +104,20 @@ module Spree
         end
 
         def params order, payment_method
-          merchant_return_data = [
-            order.guest_token,
-            payment_method.id
-          ].
-          join("|")
-
-          Form.flat_payment_parameters default_params.
+          default_params.
             merge(order_params order).
             merge(payment_method_params payment_method).
-            merge(merchant_return_data: merchant_return_data)
+            merge(merchant_return_data order, payment_method)
+        end
+
+        def merchant_return_data order, payment_method
+          { merchantReturnData: [order.guest_token, payment_method.id].join("|") }
+        end
+
+        def payment_method_allows_brand_code? payment_method, brand_code
+          return true if payment_method.restricted_brand_codes.empty?
+
+          payment_method.restricted_brand_codes.include?(brand_code)
         end
 
         # TODO set this in the adyen config
@@ -123,7 +131,8 @@ module Spree
             merchant_reference: order.number.to_s,
             country_code: order.billing_address.country.iso,
             payment_amount: (order.total * 100).to_int,
-            shopper_locale: I18n.locale.to_s.gsub("-", "_")
+            shopper_locale: I18n.locale.to_s.gsub("-", "_"),
+            shopper_email: order.email
           }
         end
 

data/lib/spree/adyen/version.rb

@@ -1,5 +1,5 @@
 module Spree
   module Adyen
-    VERSION = "0.2.2"
+    VERSION = "1.0.0"
   end
 end

data/lib/tasks/solidus-adyen/factory_girl.rake

@@ -0,0 +1,17 @@
+namespace :"solidus-adyen" do
+  namespace :factory_girl do
+    desc "Verify that all FactoryGirl factories are valid"
+    task lint: :environment do
+      if Rails.env.test?
+        begin
+          DatabaseCleaner.start
+          FactoryGirl.lint
+        ensure
+          DatabaseCleaner.clean
+        end
+      else
+        system("bundle exec rake soldius-adyen:factory_girl:lint RAILS_ENV='test'")
+      end
+    end
+  end
+end

data/solidus-adyen.gemspec

@@ -18,31 +18,30 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "adyen", "~> 1.4"
-  spec.add_runtime_dependency "solidus_core", "~> 1.0.0"
+  spec.add_runtime_dependency "adyen", "~> 2.2.0"
+  spec.add_runtime_dependency "solidus_core", "~> 1.1"
   spec.add_runtime_dependency "bourbon"
 
-  spec.add_development_dependency "sass-rails", "~> 4.0.2"
+  spec.add_development_dependency "sass-rails"
   spec.add_development_dependency "coffee-rails"
 
   spec.add_development_dependency "pg"
 
   spec.add_development_dependency "rspec-rails", "~> 3.3"
   spec.add_development_dependency "rspec-activemodel-mocks"
-  spec.add_development_dependency "factory_girl"
   spec.add_development_dependency "shoulda-matchers"
 
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-rcov"
 
   spec.add_development_dependency "awesome_print"
-  spec.add_development_dependency "pry-rails"
   spec.add_development_dependency "better_errors"
   spec.add_development_dependency "binding_of_caller"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pry-stack_explorer"
+  spec.add_development_dependency "pry-rails"
 
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "poltergeist"
   spec.add_development_dependency "launchy"
-  spec.add_development_dependency "database_cleaner"
 end

data/spec/controllers/spree/adyen/hpps_controller_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Spree::Adyen::HppsController, type: :controller do
       payment_url: "www.test-payment-url.com/amex"}] }
 
     before do
-      allow(Spree::Adyen::Form).to receive(:payment_methods_from_directory).
+      allow(Spree::Adyen::HPP).to receive(:payment_methods_from_directory).
         with(order, payment_method).
         and_return(parsed_directory_response)
     end
@@ -33,7 +33,7 @@ RSpec.describe Spree::Adyen::HppsController, type: :controller do
         format: :json }
 
       it { is_expected.to have_http_status :ok }
-      
+
       it "renders a json response" do
         subject
         expect(response.body).to eq parsed_directory_response.to_json

data/spec/controllers/spree/adyen_redirect_controller_spec.rb

@@ -106,6 +106,7 @@ RSpec.describe Spree::AdyenRedirectController, type: :controller do
 
           create(:hpp_payment, source: source, order: order)
 
+          order.contents.advance
           order.complete
         end
 

data/spec/factories/spree_gateway_adyen_hpp.rb

@@ -2,7 +2,6 @@ FactoryGirl.define do
   factory :spree_gateway_adyen_hpp, aliases: [:hpp_gateway],
     class: "Spree::Gateway::AdyenHPP" do
     name "Adyen"
-    environment "test"
     display_on "both"
     preferences(
       skin_code: "XXXXX",
@@ -11,6 +10,10 @@ FactoryGirl.define do
       days_to_ship: 3
     )
 
+    trait :with_restricted_brand_codes do
+      preferred_restricted_brand_codes 'paypal'
+    end
+
     trait :env_configured do
       preferred_test_mode true
       preferred_days_to_ship 1

data/spec/lib/spree/adyen/form_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe Spree::Adyen::Form do
+RSpec.describe Spree::Adyen::HPP do
   let(:order) { create :order, total: 39.98 }
   let(:payment_method) { create :hpp_gateway, preferences: preferences }
   let(:preferences){
@@ -29,10 +29,11 @@ RSpec.describe Spree::Adyen::Form do
         country_code: order.billing_address.country.iso,
         merchant_return_data: merchant_return_data,
         payment_amount: 3998,
-        shopper_locale: locale
+        shopper_locale: locale,
+        shopper_email: order.email
       }
 
-       ::Adyen::Form.redirect_url(redirect_params)
+      ::Adyen::HPP::Request.new(redirect_params, skin: { skin_code: 'XXXXXX' }).redirect_url
     end
 
     let(:merchant_return_data) do
@@ -170,6 +171,35 @@ RSpec.describe Spree::Adyen::Form do
         ]
       end
     end
+
+    context "when payment_method specifies restricted brand_codes" do
+      let(:adyen_response) {
+        {
+          "paymentMethods" => [
+            {
+              "brandCode" => "mc",
+              "name" => "MasterCard"
+            }, {
+              "brandCode" => "paypal",
+              "name" => "PayPal"
+            }
+          ]
+        }
+      }
+
+      let(:payment_method) { create(:hpp_gateway, :with_restricted_brand_codes) }
+
+      it "will only return paypal brand_code" do
+        expect(subject).to eq [
+          {
+            name: "PayPal",
+            brand_code: "paypal",
+            payment_url: payment_url,
+            issuers: []
+          }
+        ]
+      end
+    end
   end
 
   describe "details_url" do

data/spec/lib/tasks/requests/notification_processing_spec.rb

@@ -88,42 +88,72 @@ RSpec.describe "Notification processing", type: :request do
 
   describe "full redirect, auth, capture flow", truncation: true do
     it "creates a payment, completes order, captures payment" do
-      authorize_request = lambda do
-        post "/adyen/notify", auth_params, headers
-        expect(response).to have_http_status :ok
-        expect(response.body).to eq "[accepted]"
-      end
+      VCR.use_cassette "adyen capture" do
+        expect { initial_authorization }.
+        to change { order.payments.count }.by(1).
+        and change { order.reload.state}.to("complete").
+        and change { AdyenNotification.count }.by(1)
 
-      redirect_request = lambda do
-        get "/checkout/payment/adyen", checkout_params, headers
-        expect(response).to have_http_status :redirect
+        capture_request
       end
+    end
+  end
 
-      capture_request = lambda do
-        expect do
-          post "/adyen/notify", capture_params, headers
-        end.
-        to change { order.payments.last.reload.state }.
-        from("processing").
-        to("completed")
+  context "no psp reference in redirect" do
+    describe "full redirect, auth, capture flow", truncation: true do
+      let(:checkout_params) do
+        {
+          "merchantReference" => "R207199925",
+          "skinCode" => "xxxxxxxx",
+          "shopperLocale" => "en",
+          "paymentMethod" => "amex",
+          "authResult" => "AUTHORISED",
+          "merchantReturnData" => "adKbcFeXxOVE76UJRDF88g|#{payment_method.id}",
+          "merchantSig" => "SBdhua18U+8xkPmK/a/8VprF230="
+        }
       end
 
-      VCR.use_cassette "adyen capture" do
-        expect do
-          # these come in at the same time
-          [
-            Thread.new(&authorize_request),
-            Thread.new(&redirect_request)
-          ].map(&:join)
-          # typically get a duplicate auth notification
-          authorize_request.call
-        end.
-        to change { order.payments.count }.by(1).
-        and change { order.reload.state}.to("complete").
-        and change { AdyenNotification.count }.by(1)
+      it "adds in psp reference to payment" do
+        VCR.use_cassette "adyen capture" do
+          expect { initial_authorization }.
+          to change { order.payments.count }.by(1).
+          and change { order.reload.state}.to("complete").
+          and change { AdyenNotification.count }.by(1)
 
-        capture_request.call
+          capture_request
+          expect(order.payments.first.response_code).to eq "7914483013255061"
+        end
       end
     end
   end
+
+  def initial_authorization
+    # these come in at the same time
+    [
+      Thread.new { authorize_request },
+      Thread.new { redirect_request }
+    ].map(&:join)
+    # typically get a duplicate auth notification
+    authorize_request
+  end
+
+  def authorize_request
+    post "/adyen/notify", auth_params, headers
+    expect(response).to have_http_status :ok
+    expect(response.body).to eq "[accepted]"
+  end
+
+  def redirect_request
+    response_code = get "/checkout/payment/adyen", checkout_params, headers
+    expect(response_code).to eq 302
+  end
+
+  def capture_request
+    expect do
+      post "/adyen/notify", capture_params, headers
+    end.
+    to change { order.payments.last.reload.state }.
+    from("processing").
+    to("completed")
+  end
 end

data/spec/models/adyen_notification_spec.rb

@@ -25,6 +25,24 @@ RSpec.describe AdyenNotification do
       let(:attr) { :psp_reference }
       include_examples "finds the payment"
     end
+
+    context "payment with no reference" do
+      let!(:payment) { create :payment, response_code: nil }
+
+      context "normal notification" do
+        let!(:notification) {
+          described_class.new :merchant_reference => payment.order.number
+        }
+        include_examples "finds the payment"
+      end
+    end
+
+    context "no connected order" do
+      let!(:notification) {
+        described_class.new :merchant_reference => "notarealorder"
+      }
+      it { is_expected.to eq nil }
+    end
   end
 
   describe "#build" do

data/spec/models/spree/adyen/hpp_source_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Spree::Adyen::HppSource do
     create :hpp_source,
       psp_reference: "999999999",
       merchant_reference: "R11111111",
-      payment: create(:hpp_payment)
+      payment: create(:hpp_payment, amount: 1)
   end
 
   describe ".actions" do

data/spec/models/spree/adyen/notification_processor_spec.rb

@@ -200,6 +200,11 @@ RSpec.describe Spree::Adyen::NotificationProcessor do
             from(0).
             to(1)
         end
+
+        it "creates a refund of the correct value" do
+          subject
+          expect(payment.reload.refunds.last.amount).to eq 23.99
+        end
       end
 
       context "when refunded from Solidus" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus-adyen
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Dylan Kendal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adyen
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  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: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: better_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: better_errors
+  name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: binding_of_caller
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -308,14 +294,15 @@ description: Adyen HPP payments for Solidus Stores
 email:
 - dylan@stembolt.com
 executables:
+- bootstrap.sh
 - checkout.rb
-- regen.sh
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -353,8 +340,8 @@ files:
 - app/views/spree/adyen/communication/_communication.html.erb
 - app/views/spree/adyen/hpps/directory.html.erb
 - app/views/spree/checkout/payment/_adyen.html.erb
+- bin/bootstrap.sh
 - bin/checkout.rb
-- bin/regen.sh
 - config/initializers/solidus_adyen.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -368,10 +355,11 @@ files:
 - lib/solidus-adyen.rb
 - lib/spree/adyen.rb
 - lib/spree/adyen/engine.rb
-- lib/spree/adyen/form.rb
+- lib/spree/adyen/hpp.rb
 - lib/spree/adyen/hpp_check.rb
 - lib/spree/adyen/url.rb
 - lib/spree/adyen/version.rb
+- lib/tasks/solidus-adyen/factory_girl.rake
 - solidus-adyen.gemspec
 - spec/cassettes/adyen_capture.yml
 - spec/controllers/concerns/spree/adyen/admin/refunds_controller_spec.rb
@@ -415,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adyen HPP payments for Solidus Stores

data/bin/regen.sh

@@ -1 +0,0 @@
-rm -rf spec/dummy && bundle install && rake test_app && cd spec/dummy && rake db:migrate && rails s