Permalink
Browse files

Drop in database.yml before running specs

  • Loading branch information...
1 parent 81165a1 commit 585f69eb126d797892efbbe802a2a73173a29127 @mikepack mikepack committed Jun 16, 2012
View
@@ -6,7 +6,6 @@ mercury.ids
# Local config files
Gemfile.lock
-database.yml
mongoid.yml
# Script files
@@ -17,7 +16,7 @@ distro/build
pkg/
# Databases
-db/
+spec/dummy/db/*.sqlite3
# Logs
log/
View
@@ -1,7 +1,6 @@
rvm:
- 1.9.3
before_script:
- - 'cp spec/dummy/config/database.travisci.yml spec/dummy/config/database.yml'
- 'sh -e /etc/init.d/xvfb start'
env:
- DISPLAY=':99.0' CUCUMBER_OPTS='-f progress'
@@ -1,25 +0,0 @@
-# SQLite version 3.x
-# gem install sqlite3
-#
-# Ensure the SQLite 3 gem is defined in your Gemfile
-# gem 'sqlite3'
-development:
- adapter: sqlite3
- database: db/development.sqlite3
- pool: 5
- timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
- adapter: sqlite3
- database: db/test.sqlite3
- pool: 5
- timeout: 5000
-
-production:
- adapter: sqlite3
- database: db/production.sqlite3
- pool: 5
- timeout: 5000
@@ -1,4 +0,0 @@
-test:
- adapter: sqlite3
- database: ":memory:"
- timeout: 500
@@ -0,0 +1,10 @@
+development:
+ adapter: sqlite3
+ database: db/development.sqlite3
+ pool: 5
+ timeout: 5000
+
+test:
+ adapter: sqlite3
+ database: ":memory:"
+ timeout: 500
View
No changes.

0 comments on commit 585f69e

Please sign in to comment.