workarea-afterpay 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d2341faa66d7dc64d2f2e35c09eb19e50d03510df064837d33e6e58b59d3e88
-  data.tar.gz: ae475910f6cf7a6a7cca2064be7ebdd9054cc4d56f0a88342650cbc4546ab6f7
+  metadata.gz: 7f170109c4e7aadf5517d681dae21220ff6cbe1e35126ab58aa54180cd02884d
+  data.tar.gz: 900b3992335bbf4f70be4b1a521d6aa484b9a1a319fced02a44b257aa490f951
 SHA512:
-  metadata.gz: b42ac45e815c6cfba6dece3000240245bca5264adb0517492a9ede0c1113a1610455aa8b1e98374de5aebbcefc5d667aadc4ee697374af5985fae06520a19b8a
-  data.tar.gz: b02488f73667dcb0a76b33c1e899fb46e2617299837b46f9035e5434179c165d87cb36991c0f66c5d0fc957f03c4ec731f98d79c445469eb99ae9f0e3c37ce2d
+  metadata.gz: 92464c1f313772dfe084620492874c17fe712f957cdd0591da6a5fa3615e583e95a537f3fe10e75a600e03d2a5348818c88416408ee94c926198ecfbb729ee7f
+  data.tar.gz: 45a8347a3823439093570d7c8f85388b0a89ee685f79131a4bf15e3df00eec4f6a7366ab033a9674c213f71388b037087e2afd244a9ab77210611bd59d9b07a3

data/.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+name: CI
+on: [push]
+
+jobs:
+  static_analysis:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: workarea-commerce/ci/bundler-audit@v1
+    - uses: workarea-commerce/ci/rubocop@v1
+
+  admin_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:admin
+
+  core_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:core
+
+  storefront_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:storefront
+
+  plugins_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:plugins

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_from:
+  - https://raw.githubusercontent.com/workarea-commerce/workarea/master/.rubocop.yml

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+Workarea Afterpay 2.1.1 (2020-05-04)
+--------------------------------------------------------------------------------
+
+*   Respect payment declined in authorize transactions
+
+
+    Ben Crouse
+
+*   Respect decline payment responses in capture and purchase operations
+
+    Fixes #3
+
+    Ben Crouse
+
+*   Add CI and rubocop linting
+
+
+    Jeff Yucis
+
+
+
 Workarea Afterpay 2.1.0 (2019-11-12)
 --------------------------------------------------------------------------------
 

data/Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
-git_source(:github) { |repo| "git@github.com:#{repo}.git" }
-
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 # Declare your gem's dependencies in workarea-afterpay.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
@@ -14,4 +13,4 @@ gemspec
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
 
-gem 'workarea'
+gem 'workarea', github: 'workarea-commerce/workarea', branch: 'v3.5-stable'

data/Rakefile

@@ -37,10 +37,9 @@ task :release do
   Rake::Task['workarea:changelog'].execute
   system 'git add CHANGELOG.md'
   system 'git commit -m "Update CHANGELOG"'
-  system 'git push origin HEAD'
 
   system "git tag -a v#{Workarea::Afterpay::VERSION} -m 'Tagging #{Workarea::Afterpay::VERSION}'"
-  system 'git push --tags'
+  system 'git push origin HEAD --follow-tags'
 
   system "gem build workarea-afterpay.gemspec"
   system "gem push workarea-afterpay-#{Workarea::Afterpay::VERSION}.gem"

data/app/models/workarea/payment/authorize/afterpay.rb

@@ -8,7 +8,7 @@ module Workarea
 
         def complete!
           response = authorize
-          if response.success?
+          if response.success? && response.body['status'] == 'APPROVED'
             transaction.response = ActiveMerchant::Billing::Response.new(
               true,
               I18n.t(

data/app/models/workarea/payment/capture/afterpay.rb

@@ -8,7 +8,7 @@ module Workarea
 
         def complete!
           response = capture
-          if response.success?
+          if response.success? && response.body['status'] == 'APPROVED'
             transaction.response = ActiveMerchant::Billing::Response.new(
               true,
               I18n.t(

data/app/models/workarea/payment/purchase/afterpay.rb

@@ -8,7 +8,7 @@ module Workarea
 
         def complete!
           response = purchase
-          if response.success?
+          if response.success? && response.body['status'] == 'APPROVED'
             transaction.response = ActiveMerchant::Billing::Response.new(
               true,
               I18n.t(

data/app/services/workarea/afterpay/order_builder.rb

@@ -1,7 +1,6 @@
 module Workarea
   module Afterpay
     class OrderBuilder
-
       module ProductUrl
         include Workarea::I18n::DefaultUrlOptions
         include Storefront::Engine.routes.url_helpers

data/app/view_models/workarea/storefront/afterpay_view_model.rb

@@ -1,7 +1,6 @@
 module Workarea
   module Storefront
     class AfterpayViewModel < ApplicationViewModel
-
     # Orders must be between the min and max order total to qualify.
     def order_total_in_range?
       return unless afterpay_configuration.present?

data/lib/workarea/afterpay/bogus_gateway.rb

@@ -1,7 +1,6 @@
 module Workarea
   module Afterpay
     class BogusGateway
-
       def initialize(*)
       end
 
@@ -93,7 +92,11 @@ module Workarea
       end
 
       def capture(payment_id, amount, request_id)
-        Response.new(response(payment_response_body, 200))
+        if payment_id == 'declined'
+          Response.new(response(payment_response_body(status: 'DECLINED'), 200))
+        else
+          Response.new(response(payment_response_body, 200))
+        end
       end
 
       def authorize(token, order_id = "", request_id)
@@ -101,6 +104,8 @@ module Workarea
           Response.new(response(capture_error_response_body, 402))
         elsif token == "timeout_token"
           Response.new(response(nil, 502))
+        elsif token == 'declined'
+          Response.new(response(payment_response_body(status: 'DECLINED'), 200))
         else
           Response.new(response(payment_response_body, 200))
         end
@@ -109,6 +114,8 @@ module Workarea
       def purchase(token, order_id = "", request_id)
         if token == "error_token"
           Response.new(response(capture_error_response_body, 402))
+        elsif token == 'declined'
+          Response.new(response(payment_response_body(status: 'DECLINED'), 200))
         else
           Response.new(response(payment_response_body, 200))
         end
@@ -153,11 +160,11 @@ module Workarea
           }
         end
 
-        def payment_response_body
+        def payment_response_body(status: 'APPROVED')
           {
             "id": "12345678",
              "token": "q54l9qd907m6iqqqlcrm5tpbjjsnfo47vsm59gqrfnd2rqefk9hu",
-             "status": "APPROVED",
+             "status": status,
              "created": "2015-07-14T10:08:14.123Z",
              "totalAmount": {
                 "amount": "21.85",

data/lib/workarea/afterpay/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module Afterpay
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.1.1'.freeze
   end
 end

data/test/models/workarea/payment/afterpay_payment_integration_test.rb

@@ -2,7 +2,6 @@ require 'test_helper'
 
 module Workarea
   class AfterpayPaymentIntegrationTest < Workarea::TestCase
-
     def test_auth_capture
       transaction = tender.build_transaction(action: 'authorize')
       Payment::Purchase::Afterpay.new(tender, transaction).complete!
@@ -21,18 +20,59 @@ module Workarea
       assert(capture_transaction.valid?)
     end
 
+    def test_capture_decline
+      transaction = tender.build_transaction(action: 'authorize')
+      Payment::Authorize::Afterpay.new(tender, transaction).complete!
+
+      # To force a decline response from capture API
+      transaction.update!(
+        response: ActiveMerchant::Billing::Response.new(
+          true,
+          'test',
+          transaction.response.params.merge('id' => 'declined')
+        )
+      )
+
+      capture = Payment::Capture.new(payment: payment)
+      capture.allocate_amounts!(total: 5.to_m)
+      assert(capture.valid?)
+      refute(capture.complete!)
+
+      capture_transaction = payment.reload.transactions.detect(&:capture?)
+      refute(capture_transaction.success?)
+      assert_equal('DECLINED', capture_transaction.response.params['status'])
+    end
+
     def test_auth
       transaction = tender.build_transaction(action: 'authorize')
       Payment::Authorize::Afterpay.new(tender, transaction).complete!
       assert(transaction.success?, 'expected transaction to be successful')
     end
 
+    def test_auth_decline
+      tender.token = 'declined'
+      transaction = tender.build_transaction(action: 'authorize')
+      Payment::Authorize::Afterpay.new(tender, transaction).complete!
+
+      refute(transaction.success?)
+      assert_equal('DECLINED', transaction.response.params['status'])
+    end
+
     def test_purchase
       transaction = tender.build_transaction(action: 'purchase')
       Payment::Purchase::Afterpay.new(tender, transaction).complete!
       assert(transaction.success?)
     end
 
+    def test_purchase_decline
+      tender.token = 'declined'
+      transaction = tender.build_transaction(action: 'purchase')
+      Payment::Purchase::Afterpay.new(tender, transaction).complete!
+
+      refute(transaction.success?)
+      assert_equal('DECLINED', transaction.response.params['status'])
+    end
+
     def test_auth_void
       transaction = tender.build_transaction(action: 'authorize')
       operation = Payment::Authorize::Afterpay.new(tender, transaction)
@@ -85,7 +125,8 @@ module Workarea
             payment.set_address(first_name: 'Ben', last_name: 'Crouse')
 
             payment.build_afterpay(
-              token: '12345'
+              token: '12345',
+              amount: 5.to_m
             )
 
             payment.afterpay

data/test/services/workarea/afterpay/order_builder_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 module Workarea
   module Afterpay
     class OrderBuilderTest < Workarea::TestCase
-
       def test_build
         create_order_total_discount
         order = create_order

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-afterpay
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jeff Yucis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2020-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -49,7 +49,9 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation-request.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -141,7 +143,6 @@ files:
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/new_framework_defaults.rb
-- test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/workarea.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Workarea Commerce Platform Afterpay integration

data/test/dummy/config/initializers/session_store.rb

@@ -1,3 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-Rails.application.config.session_store :cookie_store, key: '_dummy_session'