Skip to content

Commit

Permalink
Merge pull request #32 from aldesantis/sprockets
Browse files Browse the repository at this point in the history
Fix issues with test runs
  • Loading branch information
aldesantis authored Dec 16, 2019
2 parents 13980a1 + e4bca8c commit 54cdba6
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
11 changes: 10 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,14 @@ gem 'solidus_core', github: 'solidusio/solidus', branch: branch
gemspec

gem 'solidus_extension_dev_tools', github: 'solidusio-contrib/solidus_extension_dev_tools'
gem 'sprockets', '~> 3'
gem 'sprockets-rails'
gem 'sqlite3'

case ENV['DB']
when 'postgresql'
gem 'pg'
when 'mysql'
gem 'mysql2'
else
gem 'sqlite3'
end
12 changes: 12 additions & 0 deletions spec/support/dummy_app/database.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
<% if ENV['DB'] == 'postgresql' %>
test:
adapter: postgresql
database: circle_test
username: root
<% elsif ENV['DB'] == 'mysql' %>
test:
adapter: mysql2
database: circle_test
username: root
<% else %>
test:
adapter: sqlite3
database: ':memory:'
timeout: 10000
<% end %>

0 comments on commit 54cdba6

Please sign in to comment.