diff options
author | jessib <jessib@riseup.net> | 2012-10-08 11:05:17 -0700 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2012-10-08 11:05:17 -0700 |
commit | 8f100d3c03a6f554e703c5d0b2fe221958424c26 (patch) | |
tree | 77e90f53d05fecefa91adf89a3c35f19e277996b /help/test | |
parent | f77301824c42bdd4559a0b0e58b8f3c26f239643 (diff) | |
parent | f5aea5347601c3500bb3670971d44995c35c3c7b (diff) |
Merge branch 'release-0.1.0' into help_develop
Conflicts:
.gitignore
Diffstat (limited to 'help/test')
-rw-r--r-- | help/test/test_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/help/test/test_helper.rb b/help/test/test_helper.rb index 1e26a31..3381f44 100644 --- a/help/test/test_helper.rb +++ b/help/test/test_helper.rb @@ -1,7 +1,7 @@ # Configure Rails Environment ENV["RAILS_ENV"] = "test" -require File.expand_path("../dummy/config/environment.rb", __FILE__) +require File.expand_path('../../../test/dummy/config/environment', __FILE__) require "rails/test_help" Rails.backtrace_cleaner.remove_silencers! |