Merge pull request #31 from jhawthorn/solidus-2_0

Add support for Solidus 2.0 and Rails 5

.travis.yml

@@ -1,17 +1,21 @@
 sudo: false
 cache: bundler
 language: ruby
+rvm:
+  - 2.3.1
 env:
   matrix:
-    - SOLIDUS_BRANCH=v1.0   DB=mysql
-    - SOLIDUS_BRANCH=v1.0   DB=postgres
-    - SOLIDUS_BRANCH=v1.1   DB=mysql
-    - SOLIDUS_BRANCH=v1.1   DB=postgres
-    - SOLIDUS_BRANCH=v1.2   DB=mysql
-    - SOLIDUS_BRANCH=v1.2   DB=postgres
-    - SOLIDUS_BRANCH=v1.3   DB=mysql
-    - SOLIDUS_BRANCH=v1.3   DB=postgres
-    - SOLIDUS_BRANCH=master DB=mysql
+    - SOLIDUS_BRANCH=v1.0 DB=postgres
+    - 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
-rvm:
-  - 2.3.0
+    - SOLIDUS_BRANCH=v1.0 DB=mysql
+    - 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

@@ -1,16 +1,18 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'v1.0')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
-gem 'sqlite3'
-gem 'factory_girl_rails', '~> 4.5.0', group: :test
+branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+gem "solidus", github: "solidusio/solidus", branch: branch
 
-group :development, :test do
-  gem 'ffaker'
-  gem 'capybara-screenshot'
+if branch == 'master' || branch >= "v2.0"
+  gem "rails-controller-testing", group: :test
 end
 
+gem 'sqlite3'
 gem 'pg'
 gem 'mysql2'
 
+group :development, :test do
+  gem "pry-rails"
+end
+
 gemspec

solidus_active_shipping.gemspec

@@ -16,16 +16,18 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency('solidus', '~> 1.0')
-  s.add_dependency('active_shipping', '~> 1.7.0')
+  s.add_dependency 'solidus', ['> 1.0', '<3']
+  s.add_dependency 'active_shipping', '~> 1.8.0'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
+  s.add_development_dependency 'rspec-rails', '~> 3.5'
   s.add_development_dependency 'rspec-activemodel-mocks'
   s.add_development_dependency 'database_cleaner', '~> 1.2'
   s.add_development_dependency 'capybara', '~> 2.7'
   s.add_development_dependency 'poltergeist', '~> 1.9'
   s.add_development_dependency 'vcr'
+  s.add_development_dependency 'factory_girl_rails'
+  s.add_development_dependency 'capybara-screenshot'
   s.add_dependency 'carmen', '~> 1.0.0'
 end

spec/spec_helper.rb

@@ -6,6 +6,7 @@
 require 'rspec/rails'
 require 'webmock/rspec'
 require 'factory_girl'
+require 'ffaker'
 require 'database_cleaner'
 require 'vcr'
 require 'pry'