diff options
| author |   Joachim Filip Ignacy Bartosik <jbartosik@gmail.com> | 2011-07-13 13:41:59 +0200 |
|---|---|---|
| committer | Joachim Filip Ignacy Bartosik <jbartosik@gmail.com> | 2011-07-13 17:39:29 +0200 |
| commit | 6efba915f69c00063b290f1620c9a12e6f4428f7 (patch) | |
| tree | 553baf2f641ad333d2879b3b472c7ada3183917f | |
| parent | Show hint on timelimits format (on AgendaItem edit page) (diff) | |
| download | council-webapp-6efba915f69c00063b290f1620c9a12e6f4428f7.tar.gz council-webapp-6efba915f69c00063b290f1620c9a12e6f4428f7.tar.bz2 council-webapp-6efba915f69c00063b290f1620c9a12e6f4428f7.zip | |
Fix code that produced warnings when running rake tasks
| -rw-r--r-- | site/Rakefile | 1 | ||||
| -rw-r--r-- | site/spec/spec_helper.rb | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/site/Rakefile b/site/Rakefile index 25101e4..e22d6a7 100644 --- a/site/Rakefile +++ b/site/Rakefile @@ -4,4 +4,5 @@ require File.expand_path('../config/application', __FILE__) require 'rake' +include Rake::DSL Council::Application.load_tasks diff --git a/site/spec/spec_helper.rb b/site/spec/spec_helper.rb index 47ed37e..770b158 100644 --- a/site/spec/spec_helper.rb +++ b/site/spec/spec_helper.rb @@ -3,8 +3,7 @@ require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'factories.rb' -RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT) -environment_path = File.expand_path(File.join(RAILS_ROOT, 'config', 'environment')) +environment_path = File.expand_path(File.join(::Rails.root.to_s, 'config', 'environment')) require(environment_path) # Requires supporting ruby files with custom matchers and macros, etc, |