diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-02-08 18:53:07 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-02-08 18:53:07 +0000 |
| commit | 9482831313024635e47c2a434020f6e20c0a9d4a (patch) | |
| tree | 480be7c55c341ca18af31c093794be2aa51e4005 /config/environments | |
| parent | 597725d77ce07c1e297e83f2a3594bbe1902ab2e (diff) | |
| download | redmine-9482831313024635e47c2a434020f6e20c0a9d4a.tar.gz redmine-9482831313024635e47c2a434020f6e20c0a9d4a.zip | |
Removed the duplicated configuration in the different test environments.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3397 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/test_pgsql.rb | 30 | ||||
| -rw-r--r-- | config/environments/test_sqlite3.rb | 30 |
2 files changed, 2 insertions, 58 deletions
diff --git a/config/environments/test_pgsql.rb b/config/environments/test_pgsql.rb index 0d1b42e5b..45cb09bdd 100644 --- a/config/environments/test_pgsql.rb +++ b/config/environments/test_pgsql.rb @@ -1,29 +1 @@ -# Settings specified here will take precedence over those in config/environment.rb - -# The test environment is used exclusively to run your application's -# test suite. You never need to work with it otherwise. Remember that -# your test database is "scratch space" for the test suite and is wiped -# and recreated between test runs. Don't rely on the data there! -config.cache_classes = true - -# Log error messages when you accidentally call methods on nil. -config.whiny_nils = true - -# Show full error reports and disable caching -config.action_controller.consider_all_requests_local = true -config.action_controller.perform_caching = false - -config.action_mailer.perform_deliveries = true -config.action_mailer.delivery_method = :test - -config.action_controller.session = { - :session_key => "_test_session", - :secret => "some secret phrase for the tests." -} - -# Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application -config.action_controller.allow_forgery_protection = false - -config.gem "thoughtbot-shoulda", :lib => "shoulda", :source => "http://gems.github.com" -config.gem "nofxx-object_daddy", :lib => "object_daddy", :source => "http://gems.github.com" -config.gem "mocha" +instance_eval File.read(File.join(File.dirname(__FILE__), 'test.rb')) diff --git a/config/environments/test_sqlite3.rb b/config/environments/test_sqlite3.rb index 0d1b42e5b..45cb09bdd 100644 --- a/config/environments/test_sqlite3.rb +++ b/config/environments/test_sqlite3.rb @@ -1,29 +1 @@ -# Settings specified here will take precedence over those in config/environment.rb - -# The test environment is used exclusively to run your application's -# test suite. You never need to work with it otherwise. Remember that -# your test database is "scratch space" for the test suite and is wiped -# and recreated between test runs. Don't rely on the data there! -config.cache_classes = true - -# Log error messages when you accidentally call methods on nil. -config.whiny_nils = true - -# Show full error reports and disable caching -config.action_controller.consider_all_requests_local = true -config.action_controller.perform_caching = false - -config.action_mailer.perform_deliveries = true -config.action_mailer.delivery_method = :test - -config.action_controller.session = { - :session_key => "_test_session", - :secret => "some secret phrase for the tests." -} - -# Skip protect_from_forgery in requests http://m.onkey.org/2007/9/28/csrf-protection-for-your-existing-rails-application -config.action_controller.allow_forgery_protection = false - -config.gem "thoughtbot-shoulda", :lib => "shoulda", :source => "http://gems.github.com" -config.gem "nofxx-object_daddy", :lib => "object_daddy", :source => "http://gems.github.com" -config.gem "mocha" +instance_eval File.read(File.join(File.dirname(__FILE__), 'test.rb')) |