Permalink
Browse files

Updating all the latest and getting rid of stuff we don't really need

  • Loading branch information...
awebneck committed Apr 6, 2012
1 parent 3d62166 commit c279bebccba273a9c2e10a4271d823923bc738f1
Showing with 2 additions and 7 deletions.
  1. +1 −2 object_daddy.gemspec
  2. +0 −3 spec/resources/config/database.yml
  3. +1 −2 spec/spec_helper.rb
View
@@ -19,8 +19,7 @@ Gem::Specification.new do |s|
"spec/object_daddy_spec.rb",
"spec/spec_helper.rb",
"spec/generators/object_daddy_generator_spec.rb",
"spec/resources/schema",
"spec/resources/config/database.yml"
"spec/resources/schema"
]
s.homepage = "http://github.com/awebneck/object_daddy"
s.rdoc_options = ["--charset=UTF-8"]

This file was deleted.

Oops, something went wrong.
View
@@ -15,8 +15,7 @@ def setup_rails_database
ENV["RAILS_ENV"] ||= "test"
db = YAML::load(IO.read("#{dir}/resources/config/database.yml"))
ActiveRecord::Base.configurations = {'test' => db['sqlite3']}
ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => dir + '/tmp/object_daddy.db'}}
ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
ActiveRecord::Migration.verbose = false
load "#{dir}/resources/schema"

0 comments on commit c279beb

Please sign in to comment.