cleanup test-related code

chrismccord · Dec 3, 2014 · b9fe954 · b9fe954
1 parent dec9aea
commit b9fe954
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 590 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@
 Gemfile.lock
 .bundle
 .DS_Store
-test/fixtures/test.sqlite3
+test/fixtures/test.sqlite3
+test/dummy/db/*
+test/dummy/log/*
diff --git a/.travis.yml b/.travis.yml
@@ -21,4 +21,4 @@ matrix:
 before_script:
   - cp test/travis/sync.yml config/sync.yml
   - cp test/travis/sync.ru sync.ru
-  - bundle exec rackup sync.ru -E production 2>&1 > test.log &
+  - thin start -R sync.ru -p 9292 -t 1 2>&1 > test.log &
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
@@ -3,6 +3,6 @@
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
-  database: db/test.sqlite3
+  database: ":memory:"
   pool: 5
-  timeout: 5000
+  timeout: 5000
diff --git a/test/dummy/db/test.sqlite3 b/test/dummy/db/test.sqlite3
diff --git a/test/dummy/log/development.log b/test/dummy/log/development.log
diff --git a/test/dummy/log/test.log b/test/dummy/log/test.log
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -15,12 +15,7 @@
 
 def setup_database
   ActiveRecord::Base.send :extend, Sync::Model::ClassMethods
-  # ActiveRecord::Base.establish_connection(
-  #   adapter: "sqlite3",
-  #   database: "test/fixtures/test.sqlite3",
-  #   pool: 5,
-  #   timeout: 5000
-  # )
+
   ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS todos")
   ActiveRecord::Base.connection.execute("CREATE TABLE todos (id INTEGER PRIMARY KEY, name TEXT, complete BOOLEAN, user_id INTEGER)")