Skip to content
This repository has been archived by the owner on Oct 23, 2019. It is now read-only.

Commit

Permalink
Fix factory girl dependency for Solidus < 2.5
Browse files Browse the repository at this point in the history
We need to load a factory_bot version that has factory_girl in it
to support Solidus versions < 2.5

This change also includes conditional logic for the database
interface gems.
  • Loading branch information
jacobherrington committed Oct 3, 2018
1 parent 9c28769 commit 580e812
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,26 @@ source 'https://rubygems.org'
branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
gem 'solidus', github: 'solidusio/solidus', branch: branch

gem 'rails-controller-testing', group: :test
group :test do
gem 'rails-controller-testing'
if branch < "v2.5"
gem 'factory_bot', '4.10.0'
else
gem 'factory_bot', '> 4.10.0'
end
end

if branch == 'master' || branch >= "v2.3"
gem 'rails', '~> 5.1.0' # HACK: broken bundler dependency resolution
elsif branch >= "v2.0"
gem 'rails', '~> 5.0.0' # HACK: broken bundler dependency resolution
end
gem 'pg', '~> 0.21'
gem 'mysql2', '~> 0.4.10'

if ENV['DB'] == 'mysql'
gem 'mysql2', '~> 0.4.10'
else
gem 'pg', '~> 0.21'
end

# Provides basic authentication functionality for testing parts of your engine
gem 'solidus_auth_devise', '~> 1.0'
Expand Down

0 comments on commit 580e812

Please sign in to comment.