Skip to content

Commit

Permalink
Move all necessary dependencies into default Gemfile
Browse files Browse the repository at this point in the history
Gemfiles other than the default one now only test against alternate
Rails versions but they skip Sequel, DM, and Mongo tests.
  • Loading branch information
mislav committed Feb 25, 2020
1 parent f4e504f commit 0bd9e56
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
8 changes: 7 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ gem 'rspec', '~> 2.99'
gem 'mocha', '~> 0.9.8'

gem 'sqlite3', '~> 1.4.0'

gem 'mysql2', '~> 0.5.2', :group => :mysql
gem 'pg', '~> 0.18.4', :group => :pg

gem 'sequel', '~> 5.29'
gem 'dm-core'
gem 'dm-aggregates'
gem 'dm-migrations'
gem 'dm-sqlite-adapter'
gem 'mongoid', '~> 7.0.4'

group :development do
gem 'debugger', :platforms => :mri_19
end
7 changes: 0 additions & 7 deletions Gemfile.rails5.2
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ gem 'rspec', '~> 2.99'
gem 'mocha', '~> 0.9.8'

gem 'sqlite3', '~> 1.3.6'
gem 'sequel', '~> 5.29'
gem 'dm-core'
gem 'dm-aggregates'
gem 'dm-migrations'
gem 'dm-sqlite-adapter'
gem 'mongoid', '~> 7.0.4'

gem 'mysql2', '~> 0.5.2', :group => :mysql
gem 'pg', '~> 0.18.4', :group => :pg

Expand Down
2 changes: 1 addition & 1 deletion script/test_all
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ -z "$BUNDLE_GEMFILE" ]; then
BUNDLE_GEMFILE="$(bundle config gemfile | grep BUNDLE_GEMFILE | head -1 | cut -d'"' -f2)"
fi

if [[ -n "$BUNDLE_GEMFILE" && "${BUNDLE_GEMFILE##*/}" != 'Gemfile.rails5.2' ]]; then
if [[ -n "$BUNDLE_GEMFILE" && "${BUNDLE_GEMFILE##*/}" != 'Gemfile' ]]; then
export SKIP_NONRAILS_TESTS=1
fi

Expand Down

0 comments on commit 0bd9e56

Please sign in to comment.