Moved rails into test directory

thumblemonks · Mar 24, 2009 · d877fda · d877fda
1 parent d6a55f8
commit d877fda
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-rails/log/*
-rails/**/*.db
+test/rails/log/*
+test/rails/**/*.db
diff --git a/rails/app/controllers/application.rb → test/rails/app/controllers/application.rb b/rails/app/controllers/application.rb → test/rails/app/controllers/application.rb
diff --git a/rails/config/boot.rb → test/rails/config/boot.rb b/rails/config/boot.rb → test/rails/config/boot.rb
diff --git a/rails/config/database.yml → test/rails/config/database.yml b/rails/config/database.yml → test/rails/config/database.yml
diff --git a/rails/config/environment.rb → test/rails/config/environment.rb b/rails/config/environment.rb → test/rails/config/environment.rb
diff --git a/rails/config/environments/test.rb → test/rails/config/environments/test.rb b/rails/config/environments/test.rb → test/rails/config/environments/test.rb
diff --git a/rails/config/routes.rb → test/rails/config/routes.rb b/rails/config/routes.rb → test/rails/config/routes.rb
diff --git a/rails/db/schema.rb → test/rails/db/schema.rb b/rails/db/schema.rb → test/rails/db/schema.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,9 +1,9 @@
 ENV["RAILS_ENV"] = "test"
-ENV["RAILS_ROOT"] = File.expand_path(File.join(File.dirname(__FILE__), '..', 'rails'))
+ENV["RAILS_ROOT"] = File.expand_path(File.join(File.dirname(__FILE__), '..', 'test', 'rails'))
 require File.expand_path(File.join(ENV["RAILS_ROOT"], 'config', 'environment'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'load_model'))
 require 'test_help'
-load(File.dirname(__FILE__) + "/../rails/db/schema.rb")
+load(File.join(ENV["RAILS_ROOT"], "db", "schema.rb"))
 
 class User < ActiveRecord::Base
   has_many :posts, :conditions => {:published => true}