diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-01-20 14:24:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-01-20 14:24:19 +0000 |
| commit | 5e2a01656df1b98f82a0565271b6d527d8fefbf4 (patch) | |
| tree | 54d00a6e9708051e99b9078845b63e64be23bb17 | |
| parent | d79c20c4f28f9b43f1bc105cb590d244c1b322f2 (diff) | |
| download | redmine-5e2a01656df1b98f82a0565271b6d527d8fefbf4.tar.gz redmine-5e2a01656df1b98f82a0565271b6d527d8fefbf4.zip | |
Test environments cleanup.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1084 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | config/database.yml.example | 17 | ||||
| -rw-r--r-- | config/environments/test_oracle.rb | 16 | ||||
| -rw-r--r-- | config/environments/test_sqlite3.rb (renamed from config/environments/test_sqlserver.rb) | 0 | ||||
| -rw-r--r-- | vendor/plugins/actionwebservice/init.rb | 2 |
4 files changed, 6 insertions, 29 deletions
diff --git a/config/database.yml.example b/config/database.yml.example index 2f38d81ef..f72844a07 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -29,23 +29,16 @@ test: test_pgsql: adapter: postgresql - database: redmine + database: redmine_test host: localhost username: postgres password: "postgres" -test_oracle: - adapter: oci - host: 192.168.0.14 - username: rails_test - password: "rails" - -test_sqlserver: - adapter: sqlserver - host: localhost,1157 - database: redmine_test +test_sqlite3: + adapter: sqlite3 + dbfile: db/test.db demo: adapter: sqlite3 - dbfile: db/redmine_demo.db + dbfile: db/demo.db diff --git a/config/environments/test_oracle.rb b/config/environments/test_oracle.rb deleted file mode 100644 index 0eb1cd6c1..000000000 --- a/config/environments/test_oracle.rb +++ /dev/null @@ -1,16 +0,0 @@ -# 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 = false - -# 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.delivery_method = :test
\ No newline at end of file diff --git a/config/environments/test_sqlserver.rb b/config/environments/test_sqlite3.rb index 35bb19bee..35bb19bee 100644 --- a/config/environments/test_sqlserver.rb +++ b/config/environments/test_sqlite3.rb diff --git a/vendor/plugins/actionwebservice/init.rb b/vendor/plugins/actionwebservice/init.rb index 582f73717..ade118c0f 100644 --- a/vendor/plugins/actionwebservice/init.rb +++ b/vendor/plugins/actionwebservice/init.rb @@ -4,4 +4,4 @@ require 'action_web_service' Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"] # AWS Test helpers -require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] == 'test' +require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] && ENV['RAILS_ENV'] =~ /^test/ |