spree_gateway 3.10.0 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 056db537dbbb9403df9df6e2822fa462b9c0b2eac0f880548d7ad9deb93e91c5
-  data.tar.gz: aeb658e8f6abfe36b8b84d45bb819a2cc02510f27010cf6ef059c3ae7fc78e30
+  metadata.gz: 49958bc5a2c4bad1a83572b754be89db2f651619d609f88b1ce05d8c2e768ff8
+  data.tar.gz: dc864bbb288ed41b9792c7d67687573057bb2aa31d61caa2e7bc25bd4db42a93
 SHA512:
-  metadata.gz: 9896b8790e3ad9bfd23cd5387fe8718d0e1dcb52edd4dcfce1026fdbe875192bd1287b45613be7a1ec395eeb8279e06817f92d9f45a7ab510dd37b910f27394a
-  data.tar.gz: 3659666f037e516a8ac535d11e5f95d4dcb64f7794e110ddb51b2a8087f699948c0e37c12c0d91bd48ca38633f1ced10dfb31528bbf873bfc09606f4fc994593
+  metadata.gz: bc0d840410c2ae818c51a50e351e14dff012342d389bb3a15dafffc8d07b1bc518289950c1cbc932935cf48d2a99a9b6bc0d5ab11cd1b244b96c88a58bf58800
+  data.tar.gz: 61084fbbe3aaabecbecd7a099eff8438adf3f244110ed290712b15ad8590ead63539ae6ce1468ca5951362fbfef1214734bc8b4decf65d6906af2732b6582458

data/.circleci/config.yml

@@ -0,0 +1,115 @@
+version: 2.1
+
+defaults: &defaults
+  environment: &environment
+    CIRCLE_TEST_REPORTS: /tmp/test-results
+    CIRCLE_ARTIFACTS: /tmp/test-artifacts
+    BUNDLE_JOBS: 4
+    BUNDLE_RETRY: 3
+    BUNDLE_PATH: ~/spree/vendor/bundle
+  working_directory: ~/spree
+  docker:
+    - image: &ruby_image cimg/ruby:3.3-browsers
+
+run_tests: &run_tests
+  <<: *defaults
+  steps:
+    - checkout
+    - restore_cache:
+        keys:
+          - spree-bundle-{{ .Branch }}
+          - spree-bundle
+    - run:
+        name: Add keyserver
+        command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
+    - run:
+        name: Install libvips
+        command: sudo apt-get update && sudo apt-get install libvips
+    - run:
+        name: Set bundle path
+        command: bundle config --local path vendor/bundle
+    - run:
+        name: Ensure bundle Install
+        command: |
+          bundle check || bundle install
+    - run:
+        name: Create test app
+        command: |
+          bundle exec rake test_app
+    - run:
+        name: Run Rspec
+        command: |
+          TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
+          bundle exec rspec --format documentation \
+                            --format RspecJunitFormatter \
+                            -o ~/rspec/rspec.xml \
+                            -- ${TESTFILES}
+    - store_test_results:
+        path: ~/rspec
+    - store_artifacts:
+        path: tmp/capybara
+
+jobs:
+  bundle:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - spree-bundle-{{ .Branch }}
+            - spree-bundle
+      - run:
+          name: Add keyserver
+          command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
+      - run:
+          name: Install libvips
+          command: sudo apt-get update && sudo apt-get install libvips
+      - run:
+          name: Set bundle path
+          command: bundle config --local path vendor/bundle
+      - run:
+          name: Bundle Install
+          command: |
+            bundle check || bundle install
+      - save_cache:
+          paths:
+            - vendor/bundle
+          key: spree-bundle-{{ checksum "Gemfile.lock" }}
+
+  tests_postgres: &tests_postgres
+    <<: *run_tests
+    environment: &postgres_environment
+      <<: *environment
+      DB: postgres
+      DB_HOST: localhost
+      DB_USERNAME: postgres
+    docker:
+      - image: *ruby_image
+      - image: &postgres_image cimg/postgres:16.2
+        environment:
+          POSTGRES_USER: postgres
+
+  tests_mysql: &tests_mysql
+    <<: *run_tests
+    environment: &mysql_environment
+      <<: *environment
+      DB: mysql
+      DB_HOST: 127.0.0.1
+      DB_USERNAME: root
+      COVERAGE: true
+      COVERAGE_DIR: /tmp/workspace/simplecov
+    docker:
+      - image: *ruby_image
+      - image: &mysql_image cimg/mysql:8.0
+
+workflows:
+  version: 2
+  main:
+    jobs:
+      - bundle
+      - tests_postgres:
+          requires:
+            - bundle
+      - tests_mysql:
+          requires:
+            - bundle

data/.gem-release.yml

@@ -0,0 +1,2 @@
+bump:
+  file: 'lib/spree_gateway/version.rb'

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

data/Gemfile

@@ -1,14 +1,22 @@
 source 'https://rubygems.org'
 
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
+  "https://github.com/#{repo_name}.git"
+end
+
 gem 'rails-controller-testing'
 gem 'spree', github: 'spree/spree', branch: 'main'
+gem 'spree_emails', github: 'spree/spree', branch: 'main'
 gem 'spree_backend', github: 'spree/spree_backend', branch: 'main'
-gem 'spree_frontend', github: 'spree/spree_legacy_frontend', branch: 'main'
+gem 'spree_frontend', github: 'spree/spree_rails_frontend', branch: 'main'
 
 if ENV['DB'] == 'mysql'
   gem 'mysql2'
+elsif ENV['DB'] == 'postgres'
+  gem 'pg'
 else
-  gem 'pg', '~> 1.1'
+  gem 'sqlite3', '~> 1.4'
 end
 
 gemspec

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Spree Commerce Inc. and other contributors.
+Copyright (c) 2014-2024 Spree Commerce Inc., Spark Solutions Sp. z o.o. and other contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/lib/spree_gateway/version.rb

@@ -1,5 +1,7 @@
 module SpreeGateway
-  def self.version
-    '3.10.0'
+  VERSION = '3.11.0'.freeze
+
+  def gem_version
+    Gem::Version.new(VERSION)
   end
 end

data/spec/features/admin/stripe_elements_payment_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Admin Panel Stripe elements payment', type: :feature do
+describe 'Admin Panel Stripe elements payment', type: :feature, js: true do
   stub_authorization!
 
   let!(:country) { create(:country, states_required: true) }
@@ -33,7 +33,6 @@ describe 'Admin Panel Stripe elements payment', type: :feature do
     fill_in_stripe_payment(true)
 
     expect(page).to have_content("Credit card Name can't be blank")
-    expect(page).to have_current_path spree.admin_order_payments_path(order.number)
   end
 
   it 'shows an error with an invalid card number' do
@@ -53,14 +52,8 @@ describe 'Admin Panel Stripe elements payment', type: :feature do
   it 'shows an error with an invalid card expiration' do
     fill_in_stripe_payment(false, false, false, true)
 
-    if Spree.version.to_f >= 4.1 || Spree.version.to_f >= 3.7
-      expect(page).to have_content('Credit card Month is not a number')
-      expect(page).to have_content('Credit card Year is not a number')
-      expect(page).to have_current_path spree.admin_order_payments_path(order.number)
-    else
-      expect(page).to have_content("Your card's expiration year is invalid.")
-      expect(page).to have_current_path spree.new_admin_order_payment_path(order.number)
-    end
+    expect(page).to have_content('Credit card Month is not a number')
+    expect(page).to have_content('Credit card Year is not a number')
   end
 
   def fill_in_stripe_payment(invalid_name = false, invalid_number = false, invalid_code = false, invalid_expiration = false)
@@ -78,18 +71,15 @@ describe 'Admin Panel Stripe elements payment', type: :feature do
   end
 
   def fill_in_card_expiration(invalid_expiration)
-    valid_expiry = Spree.version.to_f >= 4.2 ? "01/#{Time.current.year + 1}" : "01 / #{Time.current.year + 1}"
-    invalid_expiry = Spree.version.to_f >= 4.2 ? '01/' : '01 / '
+    card_expiry = invalid_expiration ? '01/' : "01/#{Time.current.year + 1}"
 
-    card_expiry = invalid_expiration ? invalid_expiry : valid_expiry
-    fill_in_field('Expiration *', "#card_expiry#{stripe_elements_payment_method.id}", card_expiry)
+    find('#card_expiry1').fill_in with: card_expiry
   end
 
   def fill_in_cvc(invalid_code)
     value = invalid_code ? '1' : '123'
-    label = Spree.version.to_f >= 4.2 ? 'Card Varification Code (CVC) *' : 'Card Code *'
 
-    fill_in label, with: value
+    find('#card_code1').fill_in with: value
   end
 
   def fill_in_field(field_name, field_id, number)

data/spec/models/gateway/braintree_gateway_spec.rb

@@ -80,7 +80,7 @@ describe Spree::Gateway::BraintreeGateway do
 
   describe 'payment profile failure' do
     before do
-      country = Spree::Country.default
+      country = Spree::Store.default.default_country
       state   = country.states.first
       address = create(:address,
         firstname: 'John',

data/spec/models/gateway/stripe_ach_gateway_spec.rb

@@ -137,13 +137,15 @@ describe Spree::Gateway::StripeAchGateway do
     end
   end
 
-  context 'capture with payment class' do
+  xcontext 'capture with payment class' do
     let(:gateway) do
       gateway = described_class.new(active: true)
       gateway.set_preference :secret_key, secret_key
       gateway.stub(:options_for_purchase_or_auth).and_return(['money', 'check', 'opts'])
       gateway.stub(:provider).and_return provider
       gateway.stub source_required: true
+      gateway.name = 'Stripe ACH'
+      gateway.stores = [Spree::Store.default]
       gateway
     end
 

data/spec/models/gateway/stripe_gateway_spec.rb

@@ -158,6 +158,7 @@ describe Spree::Gateway::StripeGateway do
       gateway.stub(:options_for_purchase_or_auth).and_return(['money','cc','opts'])
       gateway.stub(:provider).and_return provider
       gateway.stub :source_required => true
+      gateway.stores = [Spree::Store.default]
       gateway
     end
 

data/spree_gateway.gemspec

@@ -7,8 +7,8 @@ require 'spree_gateway/version'
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_gateway'
-  s.version     = SpreeGateway.version
-  s.summary     = 'Additional Payment Gateways for Spree Commerce'
+  s.version     = SpreeGateway::VERSION
+  s.summary     = 'Collection of Payment Gateways for Spree Commerce such as Stripe, Braintree, etc.'
   s.description = s.summary
 
   s.author       = 'Spree Commerce'
@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '>= 3.7.0'
+  s.add_dependency 'spree_core', '>= 3.7'
   s.add_dependency 'spree_extension'
 
-  s.add_development_dependency 'braintree', '~> 3.0.0'
+  s.add_development_dependency 'braintree', '~> 4.20'
   s.add_development_dependency 'rspec-activemodel-mocks'
   s.add_development_dependency 'spree_dev_tools'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.0
 platform: ruby
 authors:
 - Spree Commerce
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-01 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.20'
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +80,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Additional Payment Gateways for Spree Commerce
+description: Collection of Payment Gateways for Spree Commerce such as Stripe, Braintree,
+  etc.
 email: gems@spreecommerce.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".gem-release.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
-- Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
@@ -210,9 +212,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_gateway/issues
-  changelog_uri: https://github.com/spree/spree_gateway/releases/tag/v3.10.0
+  changelog_uri: https://github.com/spree/spree_gateway/releases/tag/v3.11.0
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_gateway/tree/v3.10.0
+  source_code_uri: https://github.com/spree/spree_gateway/tree/v3.11.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -229,10 +231,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.9
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
-summary: Additional Payment Gateways for Spree Commerce
+summary: Collection of Payment Gateways for Spree Commerce such as Stripe, Braintree,
+  etc.
 test_files:
 - spec/factories/check_factory.rb
 - spec/features/admin/stripe_elements_payment_spec.rb

data/.travis.yml

@@ -1,39 +0,0 @@
-os: linux
-dist: bionic
-
-cache: bundler
-
-addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
-
-services:
-  - mysql
-  - postgresql
-  - redis-server
-
-language: ruby
-
-rvm:
-  - 2.7
-  - 3.0
-
-env:
-  - DB=mysql
-  - DB=postgres
-
-before_install:
-  - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
-
-before_script:
-  - CHROME_MAIN_VERSION=`google-chrome-stable --version | sed -E 's/(^Google Chrome |\.[0-9]+ )//g'`
-  - CHROMEDRIVER_VERSION=`curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_MAIN_VERSION"`
-  - curl "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip" -O
-  - unzip chromedriver_linux64.zip -d ~/bin
-
-script:
-  - bundle exec rake test_app
-  - bundle exec rake spec

data/Guardfile

@@ -1,9 +0,0 @@
-guard "rspec", cmd: "bundle exec rspec", all_after_pass: false, all_on_start: false do
-  watch("spec/spec_helper.rb")                        { "spec" }
-  watch("config/routes.rb")                           { "spec/controllers" }
-  watch(%r{^spec/(.+)_spec\.rb$})                     { |m| "spec/#{m[1]}_spec.rb"}
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)\.erb$})                          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb" }
-end