Merge pull request #283 from spark-solutions/feature/rails-5-1

Rails 5.1 support

.travis.yml

@@ -20,9 +20,5 @@ rvm:
   - 2.3.1
   - 2.2.7
 
-addons:
-  apt:
-    packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
+before_install:
+  - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"

Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rails-controller-testing'
 gem 'spree', github: 'spree/spree', branch: 'master'
 
 gemspec

db/migrate/20111118164631_create_skrill_transactions.rb

@@ -1,4 +1,4 @@
-class CreateSkrillTransactions < ActiveRecord::Migration
+class CreateSkrillTransactions < SpreeExtension::Migration[4.2]
   def change
     create_table :spree_skrill_transactions do |t|
       t.string :email

db/migrate/20121017004102_update_braintree_payment_method_type.rb

@@ -1,8 +1,8 @@
-class UpdateBraintreePaymentMethodType < ActiveRecord::Migration
+class UpdateBraintreePaymentMethodType < SpreeExtension::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::Braintree").update_all(:type => "Spree::Gateway::BraintreeGateway")
   end
-  
+
   def down
     Spree::PaymentMethod.where(:type => "Spree::Gateway::BraintreeGateway").update_all(:type => "Spree::Gateway::Braintree")
   end

db/migrate/20130213222555_update_stripe_payment_method_type.rb

@@ -1,8 +1,8 @@
-class UpdateStripePaymentMethodType < ActiveRecord::Migration
+class UpdateStripePaymentMethodType < SpreeExtension::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::Stripe").update_all(:type => "Spree::Gateway::StripeGateway")
   end
-  
+
   def down
     Spree::PaymentMethod.where(:type => "Spree::Gateway::StripeGateway").update_all(:type => "Spree::Gateway::Stripe")
   end

db/migrate/20130415222802_update_balanced_payment_method_type.rb

@@ -1,9 +1,9 @@
-class UpdateBalancedPaymentMethodType < ActiveRecord::Migration
+class UpdateBalancedPaymentMethodType < SpreeExtension::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::Balanced").update_all(:type => "Spree::Gateway::BalancedGateway")
   end
-  
+
   def down
     Spree::PaymentMethod.where(:type => "Spree::Gateway::BalancedGateway").update_all(:type => "Spree::Gateway::Balanced")
   end
-end
+end

db/migrate/20131008221012_update_paypal_payment_method_type.rb

@@ -1,8 +1,8 @@
-class UpdatePaypalPaymentMethodType < ActiveRecord::Migration
+class UpdatePaypalPaymentMethodType < SpreeExtension::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::PayPal").update_all(:type => "Spree::Gateway::PayPalGateway")
   end
-  
+
   def down
     Spree::PaymentMethod.where(:type => "Spree::Gateway::PayPalGateway").update_all(:type => "Spree::Gateway::PayPal")
   end

db/migrate/20131112133401_migrate_stripe_preferences.rb

@@ -1,4 +1,4 @@
-class MigrateStripePreferences < ActiveRecord::Migration
+class MigrateStripePreferences < SpreeExtension::Migration[4.2]
   def up
     Spree::Preference.where("#{ActiveRecord::Base.connection.quote_column_name("key")} LIKE 'spree/gateway/stripe_gateway/login%'").each do |pref|
       pref.key = pref.key.gsub('login', 'secret_key')

lib/spree_gateway.rb

@@ -1,3 +1,4 @@
 require 'spree_core'
 require 'spree_gateway/engine'
 require 'sass/rails'
+require 'spree_extension'

spree_gateway.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_gateway'
-  s.version     = '3.2.0'
+  s.version     = '3.3.0.beta'
   s.summary     = 'Additional Payment Gateways for Spree Commerce'
   s.description = s.summary
 
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   spree_version = '>= 3.1.0', '< 4.0'
   s.add_dependency 'spree_core', spree_version
+  s.add_dependency 'spree_extension'
 
   s.add_development_dependency 'braintree'
   s.add_development_dependency 'capybara'