Fix failing teaspoon tests

Closes #367.
geoblacklight · Jan 8, 2016 · 09e2fe3 · 09e2fe3
1 parent 613d853
commit 09e2fe3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Rakefile b/Rakefile
@@ -29,7 +29,7 @@ end
 
 desc 'Run Teaspoon JavaScript tests'
 task :teaspoon do
-  system("TEASPOON_RAILS_ENV='.internal_test_app/config/environment' teaspoon --require=.internal_test_app/spec/teaspoon_env.rb")
+  system("teaspoon --require=.internal_test_app/spec/teaspoon_env.rb")
 end
 
 desc "Execute Continuous Integration build"

diff --git a/spec/teaspoon_env.rb b/spec/teaspoon_env.rb
@@ -1,3 +1,8 @@
+unless defined?(Rails)
+  ENV["RAILS_ROOT"] = File.expand_path("../../", __FILE__)
+  require File.expand_path("../../config/environment", __FILE__)
+end
+
 Teaspoon.configure do |config|
   # Determines where the Teaspoon routes will be mounted. Changing this to "/jasmine" would allow you to browse to
   # `http://localhost:3000/jasmine` to run your tests.