Fixed Travis/spec_helper.

OregonDigital · Aug 12, 2014 · 2a47ab4 · 2a47ab4
1 parent 9fb85f2
commit 2a47ab4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
   - gem install bundler bundle_cache
   - bundle_cache_install
 script:
-  - "bundle exec rake db:migrate && bundle exec rake sets:content:sync && bundle exec rspec $TESTFOLDER"
+  - "bundle exec rake jetty:start && bundle exec rake db:migrate && bundle exec rake sets:content:sync && bundle exec rspec $TESTFOLDER"
 after_script:
   - bundle_cache
 notifications:

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -24,7 +24,7 @@
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 # Require all the webmocks
 Dir[Rails.root.join("spec/webmocks/**/*.rb")].each { |f| require f }
-ROOT_PATH = File.dirname(__FILE__)
+ROOT_PATH = Rails.root.join("spec")
 DUMMY_PATH = File.join(ROOT_PATH,"dummies")
 
 # Allow http connections on localhost