Merge pull request spree-contrib#211 from spree-contrib/rails_6_spree_4

Rails 6 spree 4

.travis.yml

@@ -5,37 +5,50 @@ language: ruby
 
 script:
   - bundle exec rake test_app
-  - travis_retry bundle exec rake spec
+  - bundle exec rake spec
 
 env:
   - DB=mysql
   - DB=postgres
 
+addons:
+  chrome: stable
+  postgresql: 9.4
+
 rvm:
-  - 2.3.7
+  - 2.3.8
   - 2.4.4
   - 2.5.1
 
 gemfile:
-  - gemfiles/spree_3_2.gemfile
-  - gemfiles/spree_3_3.gemfile
-  - gemfiles/spree_3_4.gemfile
   - gemfiles/spree_3_5.gemfile
   - gemfiles/spree_3_7.gemfile
+  - gemfiles/spree_4_0.gemfile
   - gemfiles/spree_master.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
 
 matrix:
   exclude:
-    - rvm: 2.5.1
-      gemfile: gemfiles/spree_3_2.gemfile
-    - rvm: 2.5.1
-      gemfile: gemfiles/spree_3_3.gemfile
-    - rvm: 2.5.1
-      gemfile: gemfiles/spree_3_4.gemfile
     - rvm: 2.5.1
       gemfile: gemfiles/spree_3_5.gemfile
+    - rvm: 2.4.4
+      gemfile: gemfiles/spree_4_0.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/spree_4_0.gemfile
+    - rvm: 2.4.4
+      gemfile: gemfiles/spree_master.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/spree_master.gemfile
   allow_failures:
         - gemfile: gemfiles/spree_master.gemfile
+
+before_install:
+  - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
+  - wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
+  - unzip ~/chromedriver_linux64.zip -d ~/
+  - rm ~/chromedriver_linux64.zip
+  - sudo mv -f ~/chromedriver /usr/local/share/
+  - sudo chmod +x /usr/local/share/chromedriver
+  - sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver

Appraisals

@@ -1,18 +1,3 @@
-appraise 'spree-3-2' do
-  gem 'spree', '~> 3.2.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-3-3' do
-  gem 'spree', '~> 3.3.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-3-4' do
-  gem 'spree', '~> 3.4.0'
-  gem 'rails-controller-testing'
-end
-
 appraise 'spree-3-5' do
   gem 'spree', '~> 3.5.0'
   gem 'rails-controller-testing'
@@ -23,6 +8,11 @@ appraise 'spree-3-7' do
   gem 'rails-controller-testing'
 end
 
+appraise 'spree-4-0' do
+  gem 'spree', '~> 4.0.0.rc2'
+  gem 'rails-controller-testing'
+end
+
 appraise 'spree-master' do
   gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'rails-controller-testing'

app/controllers/spree/admin/payments_controller_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Admin::PaymentsController.class_eval do
+module Spree::Admin::PaymentsControllerDecorator
   def paypal_refund
     if request.get?
       if @payment.source.state == 'refunded'
@@ -16,4 +16,6 @@ def paypal_refund
       end
     end
   end
-end
+end
+
+Spree::Admin::PaymentsController.prepend Spree::Admin::PaymentsControllerDecorator

app/models/spree/gateway/pay_pal_express.rb

@@ -81,7 +81,7 @@ def refund(payment, amount)
         :RefundSource => "any" })
       refund_transaction_response = provider.refund_transaction(refund_transaction)
       if refund_transaction_response.success?
-        payment.source.update_attributes({
+        payment.source.update({
           :refunded_at => Time.now,
           :refund_transaction_id => refund_transaction_response.RefundTransactionID,
           :state => "refunded",

gemfiles/spree_3_7.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "spree", "~> 3.7.0"
 gem "rails-controller-testing"
+gem "sass-rails"
 
 gemspec path: "../"

gemfiles/spree_3_2.gemfile → gemfiles/spree_4_0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "spree", "~> 3.2.0"
+gem "spree", "~> 4.0.0.rc2"
 gem "rails-controller-testing"
 
 gemspec path: "../"