solidus-adyen 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5a390a36ec18d1af12c1f0d506bbb43d2bb26a
-  data.tar.gz: 7d2ddb172391f7a153bf8208bea04a63f8f3618c
+  metadata.gz: b981dfc62f2ab3ffa76996fe091a6ff639b86d32
+  data.tar.gz: 0372a49ad6ff5763af8c0748315838c7b8976321
 SHA512:
-  metadata.gz: 4a40f1640428be6f878c1ed88cd3c1b560e8d0675ecf04e985f8eaa28524d14e6ac017e5c2ed72f9ad0999e07aa6742349d4c9761c8a42cc23c41127876948d5
-  data.tar.gz: 4824b60671ed21f56d2a0e4d489aafb6154d4c896ddf4e4155fe6903e927190df990c7345b854c2188c3b9210158aacb921ed6f6afaf5b1ef0c8fb2446eaee63
+  metadata.gz: 1a2ec3751f1119a2d271fc03f8ace0a8364d6605ea9f68afe71caca65faca6e2d669b0fd2fb52bddb8d98c726b38a2b5ab6bb0d7f400fb1cc7b90032688f33dc
+  data.tar.gz: 5145598ee3116a7ac02bbdbb7c2eef673f655ec34e52869d0352f4ac0fda0ff0e28f066c0f539138d45397c75db07546912ea49ebc3aeeeee09e67120e8f6d73

data/.gitignore

@@ -4,10 +4,10 @@
 capybara-*.html
 .rspec
 .rvmrc
-/.bundle
-/vendor/bundle
-/log/*
-/tmp/*
+/.bundle/
+/vendor/bundle/
+/log/
+/tmp/
 /db/*.sqlite3
 /public/system/*
 /coverage/
@@ -22,5 +22,4 @@ Gemfile.lock
 spec/dummy
 config/credentials.yml
 
-spec/cassettes
 spec/examples.txt

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 2.2.3
+env:
+  - DB=postgres
+install:
+  - bundle install
+script:
+  - bundle exec rake test_app
+  - bundle exec rspec

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# Changelog
+
+### Unreleased changes

data/Gemfile

@@ -1,9 +1,12 @@
 source "http://rubygems.org"
 
-gemspec
+gem "solidus", "~> 1.0.0"
+gem "solidus_auth_devise", "~> 1.2.0"
 
 group :test do
   gem "timecop"
   gem "webmock"
   gem "vcr"
 end
+
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Solidus-Adyen
+# Solidus-Adyen [![Build Status](https://travis-ci.org/StemboltHQ/solidus-adyen.svg)](https://travis-ci.org/StemboltHQ/solidus-adyen) 
 Adds support for Adyen Hosted Payment Page payments to Solidus stores using the
 [Adyen](https://github.com/wvanbergen/adyen/) gem.
 
@@ -14,7 +14,7 @@ notification is received from Adyen.
 # Installation
 Add this line to your application's Gemfile:
 ```ruby
-gem 'solidus-adyen', github: 'StemboltHQ/solidus-adyen', tag: 'v0.1.1'
+gem 'solidus-adyen', '~> 0.1'
 ```
 
 Then run:

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

@@ -7,6 +7,8 @@ module Spree
         class: "Spree::PaymentMethod",
         id_param: :payment_method_id)
 
+      layout false
+
       def directory
         @brands = Adyen::Form.payment_methods_from_directory(
           @order,

data/app/controllers/spree/adyen_notifications_controller.rb

@@ -6,15 +6,14 @@ module Spree
 
     def notify
       notification = AdyenNotification.build(params)
-
-      if notification.duplicate?
-        accept and return
-      end
-
       notification.save!
 
+      # prevent alteration to associated payment while we're handling the action
       Spree::Adyen::NotificationProcessor.new(notification).process!
       accept
+    rescue ActiveRecord::RecordNotUnique
+      # Notification is a duplicate, ignore it and return a success.
+      accept
     end
 
     protected

data/app/controllers/spree/adyen_redirect_controller.rb

@@ -7,10 +7,17 @@ module Spree
 
     # This is the entry point after an Adyen HPP payment is completed
     def confirm
-      if @order.complete?
-        confirm_order_already_completed
-      else
-        confirm_order_incomplete
+      # Reload order as it might have changed since previously loading it
+      # from an auth notification coming in at the same time.
+      # This and the notification processing need to have a lock on the order
+      # as they both decide what to do based on whether or not the order is
+      # complete.
+      @order.with_lock do
+        if @order.complete?
+          confirm_order_already_completed
+        else
+          confirm_order_incomplete
+        end
       end
     end
 
@@ -52,6 +59,7 @@ module Spree
     # 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)
+
       payment.source.update(source_params)
 
       redirect_to_order
@@ -78,9 +86,7 @@ module Spree
 
       @payment_method = Spree::PaymentMethod.find(payment_method_id)
 
-      @order =
-        Spree::Order.
-        find_by!(guest_token: cookies.signed[:guest_token])
+      @order = Spree::Order.find_by!(number: order_number)
     end
 
     def source_params
@@ -95,6 +101,10 @@ module Spree
         :merchantReturnData)
     end
 
+    def order_number
+      params[:merchantReference]
+    end
+
     def psp_reference
       params[:pspReference]
     end

data/app/models/adyen_notification.rb

@@ -16,7 +16,14 @@
 #      @invoice.set_paid!
 #    end
 class AdyenNotification < ActiveRecord::Base
-  AUTO_CAPTURE_ONLY_METHODS = ["ideal", "c_cash", "directEbanking"].freeze
+  AUTO_CAPTURE_ONLY_METHODS = [
+    "ideal",
+    "c_cash",
+    "directEbanking",
+    "trustly",
+    "giropay",
+    "bcmc"
+  ].freeze
 
   AUTHORISATION = "AUTHORISATION".freeze
   CANCELLATION = "CANCELLATION".freeze
@@ -53,7 +60,6 @@ class AdyenNotification < ActiveRecord::Base
 
   validates_presence_of :event_code
   validates_presence_of :psp_reference
-  validates_uniqueness_of :success, scope: [:psp_reference, :event_code]
 
   # Logs an incoming notification into the database.
   #

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

@@ -7,48 +7,47 @@ module Spree
     # separate classes that are only aware of how to process specific kinds of
     # notifications (auth, capture, refund, etc.).
     class NotificationProcessor
-      attr_accessor :notification, :payment
+      attr_accessor :notification, :payment, :order
 
       def initialize(notification, payment = nil)
         self.notification = notification
+        self.order = notification.order
         self.payment = payment ? payment : notification.payment
-
-        if self.payment.nil?
-          self.payment = create_missing_payment
-        end
       end
 
       # for the given payment, process all notifications that are currently
       # unprocessed in the order that they were dispatched.
       def self.process_outstanding!(payment)
-        Spree::Payment.transaction do
-          payment.
-            source.
-            notifications(true). # bypass caching
-            unprocessed.
-            as_dispatched.
-            map do |notification|
-              new(notification, payment).process!
-            end
-        end
+        payment.
+          source.
+          notifications(true). # bypass caching
+          unprocessed.
+          as_dispatched.
+          map do |notification|
+            new(notification, payment).process!
+          end
       end
 
       # only process the notification if there is a matching payment there's a
       # number of reasons why there may not be a matching payment such as test
       # notifications, reports etc, we just log them and then accept
       def process!
-        Spree::Payment.transaction do
-          if payment
-            if !notification.success?
-              handle_failure
+        return notification if order.nil?
+
+        order.with_lock do
+          if should_create_payment?
+            self.payment = create_missing_payment
+          end
+
+          if !notification.success?
+            handle_failure
 
-            elsif notification.modification_event?
-              handle_modification_event
+          elsif notification.modification_event?
+            handle_modification_event
 
-            elsif notification.normal_event?
-              handle_normal_event
+          elsif notification.normal_event?
+            handle_normal_event
 
-            end
           end
         end
 
@@ -59,8 +58,9 @@ module Spree
 
       def handle_failure
         notification.processed!
-        # ignore failures if the payment was already completed
-        return if payment.completed?
+        # ignore failures if the payment was already completed, or if it doesn't
+        # exist
+        return if payment.nil? || payment.completed?
         # might have to do something else on modification events,
         # namely refunds
         payment.failure!
@@ -135,6 +135,14 @@ module Spree
         order.complete
         payment
       end
+
+      def should_create_payment?
+        notification.authorisation? &&
+        notification.success? &&
+        notification.order.present? &&
+        payment.nil?
+      end
+
     end
   end
 end

data/db/migrate/20151123000000_recreate_adyen_notification_index.rb

@@ -0,0 +1,5 @@
+class RecreateAdyenNotificationIndex < ActiveRecord::Migration
+  def change
+    add_index :adyen_notifications, [:psp_reference, :event_code, :success], unique: true, name: "adyen_notification_uniqueness"
+  end
+end

data/lib/spree/adyen/form.rb

@@ -11,6 +11,10 @@ module Spree
           payment_methods(order, payment_method)
         end
 
+        def pay_url order, payment_method
+          endpoint_url "pay", order, payment_method
+        end
+
         def select_url order, payment_method
           endpoint_url "select", order, payment_method
         end
@@ -118,7 +122,8 @@ module Spree
           { currency_code: order.currency,
             merchant_reference: order.number.to_s,
             country_code: order.billing_address.country.iso,
-            payment_amount: (order.total * 100).to_int
+            payment_amount: (order.total * 100).to_int,
+            shopper_locale: I18n.locale.to_s.gsub("-", "_")
           }
         end
 

data/lib/spree/adyen/version.rb

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

data/solidus-adyen.gemspec

@@ -19,17 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "adyen", "~> 1.4"
-  spec.add_runtime_dependency "solidus_core", "~> 1.0"
+  spec.add_runtime_dependency "solidus_core", "~> 1.0.0"
   spec.add_runtime_dependency "bourbon"
 
-  spec.add_development_dependency "solidus", "~> 1.0"
-  spec.add_development_dependency "solidus_auth_devise", "~> 1.2"
-  spec.add_development_dependency "solidus_sample", "~> 1.0"
-
   spec.add_development_dependency "sass-rails", "~> 4.0.2"
   spec.add_development_dependency "coffee-rails"
 
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "pg"
 
   spec.add_development_dependency "rspec-rails", "~> 3.3"
   spec.add_development_dependency "rspec-activemodel-mocks"
@@ -48,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "poltergeist"
   spec.add_development_dependency "launchy"
+  spec.add_development_dependency "database_cleaner"
 end

data/spec/cassettes/adyen_capture.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://username:password@pal-test.adyen.com/pal/servlet/soap/Payment
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0"?>
+                <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                  <soap:Body>
+                                <payment:capture xmlns:payment="http://payment.services.adyen.com" xmlns:recurring="http://recurring.services.adyen.com" xmlns:common="http://common.services.adyen.com">
+                      <payment:modificationRequest>
+                        <payment:merchantAccount>xxxxxxxxxxxxxxxxxxxxxxxxxx</payment:merchantAccount>
+                        <payment:originalReference>7914483013255061</payment:originalReference>
+                                    <payment:modificationAmount>
+                      <common:currency>EUR</common:currency>
+                      <common:value>11000</common:value>
+                    </payment:modificationAmount>
+
+                      </payment:modificationRequest>
+                    </payment:capture>
+
+                  </soap:Body>
+                </soap:Envelope>
+    headers:
+      Accept:
+      - text/xml
+      Content-Type:
+      - text/xml; charset=utf-8
+      Soapaction:
+      - authorise
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 23 Nov 2015 18:53:15 GMT
+      Server:
+      - Apache
+      Set-Cookie:
+      - JSESSIONID=60F4E60645ADD5B702F8DA2708CB7779.test4e; Path=/pal/; Secure; HttpOnly
+      Last-Modified:
+      - Mon, 23 Nov 2015 18:53:15 GMT
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - text/xml;charset=UTF-8
+    body:
+      encoding: UTF-8
+      string: <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soap:Body><ns1:captureResponse
+        xmlns:ns1="http://payment.services.adyen.com"><ns1:captureResult><additionalData
+        xmlns="http://payment.services.adyen.com" xsi:nil="true" /><pspReference xmlns="http://payment.services.adyen.com">8614483047954094</pspReference><response
+        xmlns="http://payment.services.adyen.com">[capture-received]</response></ns1:captureResult></ns1:captureResponse></soap:Body></soap:Envelope>
+    http_version: 
+  recorded_at: Mon, 23 Nov 2015 18:53:15 GMT
+recorded_with: VCR 2.9.3

data/spec/controllers/spree/adyen_notifications_controller_spec.rb

@@ -24,8 +24,17 @@ describe Spree::AdyenNotificationsController do
   let!(:order) { create :completed_order_with_totals }
 
   let!(:payment) do
-    create :hpp_payment, response_code: reference,
-      payment_method: payment_method, order: order
+    create(
+      :hpp_payment,
+      response_code: reference,
+      payment_method: payment_method,
+      order: order,
+      source: create(
+        :hpp_source,
+        psp_reference: reference,
+        order: order
+      )
+    )
   end
 
   let!(:payment_method) { create :hpp_gateway }

data/spec/controllers/spree/adyen_redirect_controller_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Spree::AdyenRedirectController, type: :controller do
     )
   end
 
-  let!(:store) { Spree::Store.default }
+  let!(:store) { create :store }
   let!(:gateway) { create :hpp_gateway }
 
   before do

data/spec/factories/spree_gateway_adyen_hpp.rb

@@ -3,6 +3,7 @@ FactoryGirl.define do
     class: "Spree::Gateway::AdyenHPP" do
     name "Adyen"
     environment "test"
+    display_on "both"
     preferences(
       skin_code: "XXXXX",
       shared_secret: "1234",
@@ -16,7 +17,7 @@ FactoryGirl.define do
       preferred_api_password { ENV.fetch("ADYEN_API_PASSWORD") }
       preferred_api_username { ENV.fetch("ADYEN_API_USERNAME") }
       preferred_merchant_account { ENV.fetch("ADYEN_MERCHANT_ACCOUNT") }
-      preferred_shared_secret { ENV.fetch("ADYEN_SKIN_CODE") }
+      preferred_shared_secret { ENV.fetch("ADYEN_SHARED_SECRET") }
       preferred_skin_code { ENV.fetch("ADYEN_SKIN_CODE") }
     end
   end

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

@@ -13,6 +13,7 @@ RSpec.describe Spree::Adyen::Form do
      shared_secret: "1234567890",
      days_to_ship: 3}
   }
+  let(:locale) { I18n.locale.to_s.gsub("-", "_") }
 
   describe "directory_url" do
     let(:expected) do
@@ -27,7 +28,8 @@ RSpec.describe Spree::Adyen::Form do
         shared_secret: payment_method.shared_secret,
         country_code: order.billing_address.country.iso,
         merchant_return_data: merchant_return_data,
-        payment_amount: 3998
+        payment_amount: 3998,
+        shopper_locale: locale
       }
 
        ::Adyen::Form.redirect_url(redirect_params)
@@ -183,6 +185,19 @@ RSpec.describe Spree::Adyen::Form do
     end
   end
 
+  describe "pay_url" do
+    subject {
+      described_class.pay_url(order, payment_method)
+    }
+
+    it "calls endpoint url with the expected params" do
+      expect(described_class).
+          to receive(:endpoint_url).
+          with("pay", order, payment_method)
+      subject
+    end
+  end
+
   describe "details_url_with_issuer" do
     let(:issuer_id) { "1654" }
     let(:brand_code) { "paypal" }

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

@@ -0,0 +1,129 @@
+require "spec_helper"
+
+RSpec.describe "Notification processing", type: :request do
+  before do
+    allow_any_instance_of(Spree::AdyenRedirectController).
+      to receive(:check_signature)
+
+    ENV["ADYEN_NOTIFY_USER"] = "spree_user"
+    ENV["ADYEN_NOTIFY_PASSWD"] = "1234"
+
+    order.contents.advance
+    expect(order.state).to eq "payment"
+  end
+
+  let!(:order) { create(:order_with_line_items, number: "R207199925") }
+
+  let!(:payment_method) do
+    create(
+      :hpp_gateway,
+      preferred_api_username: "username",
+      preferred_api_password: "password"
+    )
+  end
+
+  let(:auth_params) do
+    {
+      "originalReference" => "",
+      "reason" => "21633:0002:8/2018",
+      "additionalData.hmacSignature" => "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+      "additionalData.authCode" => "21633",
+      "additionalData.expiryDate" => "8/2018",
+      "additionalData.cardHolderName" => "John Doe",
+      "additionalData.cardSummary" => "0002",
+      "merchantAccountCode" => "xxxxxxxxxxxxxxxxxxxxxxxxxx",
+      "eventCode" => "AUTHORISATION",
+      "operations" => "CANCEL,CAPTURE,REFUND",
+      "additionalData.cardBin" => "370000",
+      "success" => "true",
+      "paymentMethod" => "amex",
+      "currency" => "EUR",
+      "pspReference" => "7914483013255061",
+      "merchantReference" => "R207199925",
+      "value" => "2200",
+      "live" => "false",
+      "eventDate" => "2015-11-23T17:55:25.30Z"
+    }
+  end
+
+  let(:capture_params) do
+    {
+      "originalReference" => "7914483013255061",
+      "reason" => "",
+      "additionalData.hmacSignature" => "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+      "merchantAccountCode" => "xxxxxxxxxxxxxxxxxxxxxxxxxx",
+      "eventCode" => "CAPTURE",
+      "operations" => "",
+      "success" => "true",
+      "paymentMethod" => "amex",
+      "currency" => "EUR",
+      "pspReference" => "8614483013279252",
+      "merchantReference" => "R207199925",
+      "value" => "2200",
+      "live" => "false",
+      "eventDate" => "2015-11-23T17:55:27.00Z"
+    }
+  end
+
+  let(:checkout_params) do
+    {
+      "merchantReference" => "R207199925",
+      "skinCode" => "xxxxxxxx",
+      "shopperLocale" => "en",
+      "paymentMethod" => "amex",
+      "authResult" => "AUTHORISED",
+      "pspReference" => "7914483013255061",
+      "merchantReturnData" => "adKbcFeXxOVE76UJRDF88g|#{payment_method.id}",
+      "merchantSig" => "SBdhua18U+8xkPmK/a/8VprF230="
+    }
+  end
+
+  let(:headers) do
+    {
+      "HTTP_AUTHORIZATION" =>
+      ActionController::HttpAuthentication::Basic.
+        encode_credentials("spree_user", "1234")
+    }
+  end
+
+  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
+
+      redirect_request = lambda do
+        get "/checkout/payment/adyen", checkout_params, headers
+        expect(response).to have_http_status :redirect
+      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")
+      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)
+
+        capture_request.call
+      end
+    end
+  end
+end

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

@@ -3,6 +3,14 @@ require "spec_helper"
 RSpec.describe Spree::Adyen::NotificationProcessor do
   include_context "mock adyen api", success: true
 
+  let!(:order) do
+    # spree factories suck, it's not easy to get something to payment state
+    create(:order_with_line_items).tap do |order|
+      order.contents.advance
+      expect(order.state).to eq "payment"
+    end
+  end
+
   describe "#process" do
     subject { described_class.new(notification).process! }
 
@@ -16,14 +24,6 @@ RSpec.describe Spree::Adyen::NotificationProcessor do
       )
     end
 
-    let!(:order) do
-      # spree factories suck, it's not easy to get something to payment state
-      create(:order_with_line_items).tap do |order|
-        order.contents.advance
-        expect(order.state).to eq "payment"
-      end
-    end
-
     let!(:hpp_gateway) do
       create(:hpp_gateway)
     end
@@ -116,31 +116,6 @@ RSpec.describe Spree::Adyen::NotificationProcessor do
         pending "completes payment"
       end
 
-      # this is for the situation where we can the notification before the
-      # redirect
-      context "and the payment doesn't exist yet" do
-        let!(:payment) { nil }
-
-        it "processes the notification" do
-          expect { subject }.
-            to change { notification.processed }.
-            to true
-        end
-
-        it "completes the order" do
-          subject
-          expect(order.reload).to have_attributes(
-            state: "complete"
-          )
-        end
-
-        it "creates a payment" do
-          expect { subject }.
-            to change { order.payments.count }.
-            to 1
-        end
-      end
-
       context "and payment method was ideal" do
         let(:event_type) { :ideal_auth }
         include_examples "completes payment"
@@ -155,6 +130,43 @@ RSpec.describe Spree::Adyen::NotificationProcessor do
           include_examples "does nothing"
         end
       end
+
+      # this is for the situation where we can the notification before the
+      # redirect
+      context "and the payment doesn't exist yet" do
+        let(:payment) { nil }
+
+        context "an it is not a successful auth notification" do
+          let(:notification) do
+            create(:notification, :auth, success: false, order: order)
+          end
+
+          it "does not create a payment" do
+            expect { subject }.to_not change { order.payments.count }
+          end
+
+          it "does not complete the order" do
+            expect { subject }.to_not change { order.state }
+          end
+        end
+
+        context "and it is a successful auth notification" do
+          let(:notification) do
+            create(:notification, :auth, order: order)
+          end
+
+          it "creates a payment" do
+            expect { subject }.
+              to change { order.payments.count }.
+              to 1
+          end
+
+          it "completes the order" do
+            expect { subject }.
+              to change { order.state }.to "complete"
+          end
+        end
+      end
     end
 
     context "when event is CAPTURE" do
@@ -178,6 +190,8 @@ RSpec.describe Spree::Adyen::NotificationProcessor do
     end
 
     context "when event is REFUND" do
+      before { create :refund_reason }
+
       shared_examples "refund" do
         let(:event_type) { :refund }
         it "creates a refund" do

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ require "vcr"
 require "ffaker"
 require "shoulda/matchers"
 require "pry"
+require "database_cleaner"
 
 require "spree/testing_support/factories"
 require "spree/testing_support/controller_requests"
@@ -41,18 +42,32 @@ RSpec.configure do |config|
   config.color = true
   config.infer_spec_type_from_file_location!
   config.mock_with :rspec
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
   config.example_status_persistence_file_path = "./spec/examples.txt"
 
+  config.include ControllerHelpers, type: :controller
+  config.include Devise::TestHelpers, type: :controller
   config.include Spree::TestingSupport::ControllerRequests, type: :controller
   config.include FactoryGirl::Syntax::Methods
+  config.include Spree::TestingSupport::ControllerRequests, type: :controller
   config.include Spree::TestingSupport::UrlHelpers
 
-  config.filter_run_excluding :external => true
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.strategy =
+      example.metadata[:truncation] ? :truncation : :transaction
+    DatabaseCleaner.start
+    example.run
+    DatabaseCleaner.clean
+  end
 end
 
 VCR.configure do |c|
   # c.allow_http_connections_when_no_cassette = true
+  c.ignore_localhost = true
   c.cassette_library_dir = "spec/cassettes"
   c.hook_into :webmock
 end

data/spec/support/controller_helpers.rb

@@ -0,0 +1,12 @@
+module ControllerHelpers
+  def sign_in(user = double("user"))
+    if user.nil?
+      allow(request.env["warden"]).to receive(:authenticate!).
+        and_throw(:warden, scope: :user)
+      allow(controller).to receive(:current_user).and_return(nil)
+    else
+      allow(request.env["warden"]).to receive(:authenticate!).and_return(user)
+      allow(controller).to receive(:current_user).and_return(user)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus-adyen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dylan Kendal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adyen
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
@@ -52,48 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solidus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: solidus_auth_devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: solidus_sample
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -332,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  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'
 description: Adyen HPP payments for Solidus Stores
 email:
 - dylan@stembolt.com
@@ -344,6 +316,8 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -390,6 +364,7 @@ files:
 - db/migrate/20151007090519_add_days_to_ship_to_config.rb
 - db/migrate/20151020230830_remove_indices_on_adyen_notifications.rb
 - db/migrate/20151106093023_allow_merchant_reference_to_be_null_for_adyen_notification.rb
+- db/migrate/20151123000000_recreate_adyen_notification_index.rb
 - lib/solidus-adyen.rb
 - lib/spree/adyen.rb
 - lib/spree/adyen/engine.rb
@@ -398,6 +373,7 @@ files:
 - lib/spree/adyen/url.rb
 - lib/spree/adyen/version.rb
 - solidus-adyen.gemspec
+- spec/cassettes/adyen_capture.yml
 - spec/controllers/concerns/spree/adyen/admin/refunds_controller_spec.rb
 - spec/controllers/spree/adyen/hpps_controller_spec.rb
 - spec/controllers/spree/adyen_notifications_controller_spec.rb
@@ -408,6 +384,7 @@ files:
 - spec/factories/spree_gateway_adyen_hpp.rb
 - spec/factories/spree_payment.rb
 - spec/lib/spree/adyen/form_spec.rb
+- spec/lib/tasks/requests/notification_processing_spec.rb
 - spec/models/adyen_notification_spec.rb
 - spec/models/concerns/spree/adyen/order_spec.rb
 - spec/models/concerns/spree/adyen/payment_spec.rb
@@ -416,6 +393,7 @@ files:
 - spec/models/spree/adyen/presenters/communication_spec.rb
 - spec/models/spree/gateway/adyen_hpp_spec.rb
 - spec/spec_helper.rb
+- spec/support/controller_helpers.rb
 - spec/support/shared_contexts/mock_adyen_api.rb
 homepage: https://github.com/StemboltHQ/solidus-adyen
 licenses:
@@ -442,6 +420,7 @@ signing_key:
 specification_version: 4
 summary: Adyen HPP payments for Solidus Stores
 test_files:
+- spec/cassettes/adyen_capture.yml
 - spec/controllers/concerns/spree/adyen/admin/refunds_controller_spec.rb
 - spec/controllers/spree/adyen/hpps_controller_spec.rb
 - spec/controllers/spree/adyen_notifications_controller_spec.rb
@@ -452,6 +431,7 @@ test_files:
 - spec/factories/spree_gateway_adyen_hpp.rb
 - spec/factories/spree_payment.rb
 - spec/lib/spree/adyen/form_spec.rb
+- spec/lib/tasks/requests/notification_processing_spec.rb
 - spec/models/adyen_notification_spec.rb
 - spec/models/concerns/spree/adyen/order_spec.rb
 - spec/models/concerns/spree/adyen/payment_spec.rb
@@ -460,4 +440,5 @@ test_files:
 - spec/models/spree/adyen/presenters/communication_spec.rb
 - spec/models/spree/gateway/adyen_hpp_spec.rb
 - spec/spec_helper.rb
+- spec/support/controller_helpers.rb
 - spec/support/shared_contexts/mock_adyen_api.rb