Merge pull request #36 from jhawthorn/solidus_2-0

Add support for Solidus 2.0 and Rails 5

.travis.yml

@@ -1,14 +1,19 @@
 sudo: false
 cache: bundler
 language: ruby
-env:
- - SOLIDUS_BRANCH=v1.1 DB=mysql
- - SOLIDUS_BRANCH=v1.2 DB=mysql
- - SOLIDUS_BRANCH=v1.3 DB=mysql
- - SOLIDUS_BRANCH=master DB=mysql
- - SOLIDUS_BRANCH=v1.1 DB=postgres
- - SOLIDUS_BRANCH=v1.2 DB=postgres
- - SOLIDUS_BRANCH=v1.3 DB=postgres
- - SOLIDUS_BRANCH=master DB=postgres
 rvm:
- - 2.1.8
+ - 2.3.1
+env:
+ matrix:
+ - SOLIDUS_BRANCH=v1.1 DB=postgres
+ - SOLIDUS_BRANCH=v1.2 DB=postgres
+ - SOLIDUS_BRANCH=v1.3 DB=postgres
+ - SOLIDUS_BRANCH=v1.4 DB=postgres
+ - SOLIDUS_BRANCH=v2.0 DB=postgres
+ - SOLIDUS_BRANCH=master DB=postgres
+ - SOLIDUS_BRANCH=v1.1 DB=mysql
+ - SOLIDUS_BRANCH=v1.2 DB=mysql
+ - SOLIDUS_BRANCH=v1.3 DB=mysql
+ - SOLIDUS_BRANCH=v1.4 DB=mysql
+ - SOLIDUS_BRANCH=v2.0 DB=mysql
+ - SOLIDUS_BRANCH=master DB=mysql

Gemfile

@@ -3,11 +3,15 @@ source "https://rubygems.org"
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem "solidus", github: "solidusio/solidus", branch: branch
 
-group :development, :test do
- gem "pry-rails"
+if branch == 'master' || branch >= "v2.0"
+ gem "rails-controller-testing", group: :test
 end
 
 gem 'pg'
 gem 'mysql2'
 
+group :development, :test do
+ gem "pry-rails"
+end
+
 gemspec

solidus_gateway.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
  s.require_path = "lib"
  s.requirements << "none"
 
- s.add_dependency "solidus_core", "~> 1.1"
+ s.add_dependency "solidus_core", [">= 1.1", "< 3"]
 
  # ActiveMerchant v1.58 through v1.59 introduced a breaking change
  # to the stripe gateway.