Merge pull request #219 from gsmendoza/gsmendoza/eng-336-fix-solidus_auth_devise-build

Fix build

Author: jarednorman

.circleci/config.yml

@@ -1,6 +1,8 @@
 version: 2.1
 
 orbs:
+  browser-tools: circleci/browser-tools@1.1
+
   # Always take the latest version of the orb, this allows us to
   # run specs against Solidus supported versions only without the need
   # to change this configuration every time a Solidus version is released
@@ -11,10 +13,12 @@ jobs:
   run-specs-with-postgres:
     executor: solidusio_extensions/postgres
     steps:
+      - browser-tools/install-browser-tools
       - solidusio_extensions/run-tests
   run-specs-with-mysql:
     executor: solidusio_extensions/mysql
     steps:
+      - browser-tools/install-browser-tools
       - solidusio_extensions/run-tests
 
 workflows:

.gitignore

@@ -7,6 +7,7 @@
 .project
 .sass-cache
 coverage
+Gemfile-local
 Gemfile.lock
 tmp
 nbproject

Gemfile

@@ -4,12 +4,16 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
 
-# Needed to help Bundler figure out how to resolve dependencies,
-# otherwise it takes forever to resolve them.
-# See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
+git "https://github.com/solidusio/solidus.git", branch: branch do
+  gem 'solidus_api'
+  gem 'solidus_backend'
+  gem 'solidus_core'
+  gem 'solidus_frontend'
+  gem 'solidus_sample'
+end
+
+gem 'rails', ENV.fetch('RAILS_VERSION', nil)
 
 case ENV['DB']
 when 'mysql'