Tweaks to setup of tests to get things working

tslocke · Nov 11, 2011 · 12b7efe · 12b7efe
1 parent c06ab48
commit 12b7efe
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/hobo/Rakefile b/hobo/Rakefile
@@ -18,7 +18,7 @@ RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).
 RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 
 GEM_ROOT = File.expand_path('../', __FILE__)
-TESTAPP_PATH = File.join Dir.tmpdir, 'hobo_testapp'
+TESTAPP_PATH = ENV['TESTAPP_PATH'] || File.join(Dir.tmpdir, 'hobo_testapp')
 BIN = File.expand_path('../bin/hobo', __FILE__)
 require 'hobo_support/common_tasks'
 include HoboSupport::CommonTasks

diff --git a/hobo/test/doctest/hobo/multi_model_forms.rdoctest b/hobo/test/doctest/hobo/multi_model_forms.rdoctest
@@ -28,10 +28,10 @@ Contents
                                                :host => "localhost",
                                                :username => mysql_user,
                                                :password => mysql_password)
-    >> $:.unshift File.expand_path('../../../../hobo_support/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../hobo_fields/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../dryml/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../../hobo_support/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../../hobo_fields/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../../dryml/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../lib', __FILE__)
     >> gem 'will_paginate', ">= 3.0.pre"
     >> require 'will_paginate'
     >> require 'hobo'

diff --git a/hobo/test/doctest/hobo/scopes.rdoctest b/hobo/test/doctest/hobo/scopes.rdoctest
@@ -67,16 +67,15 @@ We also need to get ActiveRecord set up with a database connection
 Some load path manipulation:
 {.hidden}
 
-    >> $:.unshift File.expand_path('../../../../hobo_support/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../hobo_fields/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../../dryml/lib', __FILE__)
-    >> $:.unshift File.expand_path('../../../lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../../hobo_support/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../../hobo_fields/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../../dryml/lib', __FILE__)
+    >> $:.unshift File.expand_path('../../../../lib', __FILE__)
 {.hidden}
 
 And we'll require hobo:
 {.hidden}
 
-    >> require 'will_paginate'
     >> require 'hobo'
 {.hidden}
 

diff --git a/hobo/test/doctest/prepare_testapp.rb b/hobo/test/doctest/prepare_testapp.rb
@@ -1,6 +1,6 @@
 require 'fileutils'
-system %(rake test:prepare_testapp)
 TESTAPP_PATH = '/tmp/hobo_testapp'
+system %(rake test:prepare_testapp TESTAPP_PATH=#{TESTAPP_PATH})
 FileUtils.chdir TESTAPP_PATH
 require 'config/environment'
 require 'rails/generators'