Merge pull request solidusio-contrib#10 from solidusio-contrib/solidu…

…s-2-0

Add support for Solidus 2.0 and Rails 5

.travis.yml

@@ -1,11 +1,21 @@
 sudo: false
+cache: bundler
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.3.1
 env:
   matrix:
-    - SOLIDUS_BRANCH=v1.0
-    - SOLIDUS_BRANCH=v1.1
-    - SOLIDUS_BRANCH=v1.2
-    - SOLIDUS_BRANCH=v1.3
-    - SOLIDUS_BRANCH=master
+    - 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
+    - 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,8 +1,18 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+gem "solidus", github: "solidusio/solidus", branch: branch
+gem "solidus_auth_devise"
 
-gem 'solidus_auth_devise'
+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_comments.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |s|
   s.require_path  = 'lib'
   s.requirements << 'none'
 
-  s.add_runtime_dependency 'solidus_core', ["~> 1.0"]
-  s.add_runtime_dependency 'solidus_backend', ["~> 1.0"]
-  s.add_runtime_dependency 'solidus_api', ["~> 1.0"]
+  solidus_version = ['>= 1.0', '< 3']
+  s.add_runtime_dependency 'solidus_core', solidus_version
+  s.add_runtime_dependency 'solidus_backend', solidus_version
+  s.add_runtime_dependency 'solidus_api', solidus_version
   s.add_runtime_dependency 'deface'
   s.add_dependency 'acts_as_commentable', '4.0.1'
   s.add_development_dependency 'rspec-rails'

spec/features/admin/order_comments_spec.rb

@@ -9,7 +9,7 @@
 
   it "adding comments" do
     visit spree.comments_admin_order_path(order)
-    expect(page).to have_text('NO COMMENTS FOUND')
+    expect(page).to have_text(/No Comments found/i)
 
     fill_in 'Comment', with: 'A test comment.'
     click_button 'Add Comment'