summaryrefslogtreecommitdiff
path: root/certs/test
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-08 11:05:17 -0700
committerjessib <jessib@riseup.net>2012-10-08 11:05:17 -0700
commit8f100d3c03a6f554e703c5d0b2fe221958424c26 (patch)
tree77e90f53d05fecefa91adf89a3c35f19e277996b /certs/test
parentf77301824c42bdd4559a0b0e58b8f3c26f239643 (diff)
parentf5aea5347601c3500bb3670971d44995c35c3c7b (diff)
Merge branch 'release-0.1.0' into help_develop
Conflicts: .gitignore
Diffstat (limited to 'certs/test')
-rw-r--r--certs/test/test_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/certs/test/test_helper.rb b/certs/test/test_helper.rb
index b268c51..08d4d41 100644
--- a/certs/test/test_helper.rb
+++ b/certs/test/test_helper.rb
@@ -1,5 +1,5 @@
ENV["RAILS_ENV"] = "test"
-require File.expand_path('../dummy/config/environment', __FILE__)
+require File.expand_path('../../../test/dummy/config/environment', __FILE__)
require 'rails/test_help'
require 'mocha'