Merge pull request #148 from tansengming/feature/rails6

Rails 6
tansengming · Sep 18, 2020 · a5b859b · a5b859b
2 parents 418084b + d40421f
commit a5b859b
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 92 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -14,11 +14,8 @@ jobs:
 
     strategy:
       matrix:
-        ruby: [2.4.x, 2.5.x, 2.6.x, 2.7.x]
-        gemfile: [Gemfile, gemfiles/rails51.gemfile, gemfiles/rails52.gemfile, gemfiles/rails4.gemfile]
-        exclude:
-          - ruby: 2.7.x
-            gemfile: gemfiles/rails4.gemfile
+        ruby: [2.5.x, 2.6.x, 2.7.x]
+        gemfile: [Gemfile, gemfiles/rails51.gemfile, gemfiles/rails52.gemfile]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Ruby
@@ -36,8 +33,6 @@ jobs:
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         RUBY_VERSION: ${{ matrix.ruby }}
       run: |
-        gem uninstall bundler
-        gem install bundler -v 1.17.3
         bundle install --jobs 4 --retry 3
         bundle exec rake
         if [ `basename $BUNDLE_GEMFILE` == "Gemfile" ] && [ $RUBY_VERSION == "2.7.x" ] && [ ! -z ${CC_TEST_REPORTER_ID} ] ;

diff --git a/Changelog.md b/Changelog.md
@@ -1,9 +1,21 @@
 ## Unreleased
 
+## 2.0.0 (2020-09-18)
+
+- Everything from on the 2.0.0.pre release
+- includes changes from the 1.10.2 release
+
 ## 1.10.2 (2020-09-18)
 
 - adds missing callback `invoice.paid`. Thanks @SyborgStudios.
 
+## 2.0.0.pre (2020-05-29)
+
+* [Breaking] Updated to work only with Rails >= 5.1
+* [Breaking] It'll only be tested on Ruby 2.7, 2.6 and 2.5.
+* [Breaking] Supports the Stripe gem => 3.15.0 (from 2 years ago)
+* [Breaking] Removes Stripe::PingsController controller.
+
 ## 1.10.1 (2020-05-29)
 
 - adds missing callbacks for `payment_intent`. Thanks @klapperkopp .

diff --git a/Gemfile b/Gemfile
@@ -14,9 +14,9 @@ group :test do
   gem 'simplecov', '< 0.18', require: false
   gem 'stripe-ruby-mock'
   gem 'webmock'
-  # Required for system tests
+  # System tests
   gem 'capybara'
-  gem 'webdrivers'
   gem 'puma'
   gem 'selenium-webdriver'
-end
+  gem 'webdrivers'
+end
diff --git a/app/controllers/stripe/pings_controller.rb b/app/controllers/stripe/pings_controller.rb
diff --git a/app/models/stripe/ping.rb b/app/models/stripe/ping.rb
diff --git a/gemfiles/rails4.gemfile b/gemfiles/rails4.gemfile
diff --git a/lib/stripe/callbacks.rb b/lib/stripe/callbacks.rb
@@ -106,10 +106,6 @@ module Callbacks
     callback 'ping'
     callback 'stripe.event'
 
-    # Deprecated
-    callback 'transfer.failed' # https://stripe.com/docs/upgrades#2017-04-06
-    callback 'transfer.paid'   # https://stripe.com/docs/upgrades#2017-04-06
-
     class << self
       def run_callbacks(evt, target)
         _run_callbacks evt.type, evt, target

diff --git a/lib/stripe/rails/version.rb b/lib/stripe/rails/version.rb
@@ -1,5 +1,5 @@
 module Stripe
   module Rails
-    VERSION = '1.10.2'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end
diff --git a/stripe-rails.gemspec b/stripe-rails.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "stripe-rails"
   gem.require_paths = ["lib"]
   gem.version       = Stripe::Rails::VERSION
-  gem.add_dependency 'rails', '>= 3'
-  gem.add_dependency 'stripe', '>= 1.36.2'
+  gem.add_dependency 'rails', '>= 5.1'
+  gem.add_dependency 'stripe', '>= 3.15.0'
   gem.add_dependency 'responders'
 end
diff --git a/test/pings_controller_spec.rb b/test/pings_controller_spec.rb
diff --git a/test/support/application_system_test_case.rb b/test/support/application_system_test_case.rb
@@ -1,8 +1,3 @@
-require File.expand_path("null_system_test_case", __dir__)
-
-# For Rails 4 compat
-SystemTestCaseKlass = defined?(ActionDispatch::SystemTestCase) ? ActionDispatch::SystemTestCase : NullSystemTestCase
-
-class ApplicationSystemTestCase < SystemTestCaseKlass
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :selenium_chrome_headless
-end
+end
diff --git a/test/support/null_system_test_case.rb b/test/support/null_system_test_case.rb