aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAlban Peignier2012-04-30 17:39:21 +0200
committerAlban Peignier2012-04-30 17:39:21 +0200
commit6cda9242b3d72063bca0da9e85849702181543d2 (patch)
treea69d0b172860a2351a5c9d95271633c67ef3ee5c /config
parent0734804c6b5b559b6609aa9b04c032def72055ed (diff)
downloadchouette-core-6cda9242b3d72063bca0da9e85849702181543d2.tar.bz2
Fixes Chouette::Loader.chouette_command in development and test. Refs #15
Diffstat (limited to 'config')
-rw-r--r--config/environments/development.rb4
-rw-r--r--config/environments/test.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6c39bf8eb..c5b965a99 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -31,8 +31,8 @@ ChouetteIhm::Application.configure do
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
config.to_prepare do
- # Chouette::Loader.chouette_command = "true"
- Chouette::Loader.chouette_command = "tmp/chouette-command/chouette"
+ Chouette::Loader.chouette_command = "true"
+ # Chouette::Loader.chouette_command = "tmp/chouette-command/chouette"
end
end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 65af28c5c..33c54b4f4 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -36,4 +36,8 @@ ChouetteIhm::Application.configure do
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
+
+ config.to_prepare do
+ Chouette::Loader.chouette_command = "true"
+ end
end