From f141537d0d0cdc53360ea3a8cdef75304468d75b Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg <maxwell@joindiaspora.com> Date: Tue, 7 Feb 2012 14:07:50 -0800 Subject: [PATCH] jasmine ci does not need to re-load jammit, so we can rescue out of any failures in the auto-reload patch --- spec/javascripts/support/jasmine_runner.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spec/javascripts/support/jasmine_runner.rb b/spec/javascripts/support/jasmine_runner.rb index 1e38f7f0a7..dffb486c83 100644 --- a/spec/javascripts/support/jasmine_runner.rb +++ b/spec/javascripts/support/jasmine_runner.rb @@ -7,7 +7,14 @@ require 'json' require 'jasmine' require 'rspec' jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb')) -require jasmine_config_overrides if File.exists?(jasmine_config_overrides) + +begin + require jasmine_config_overrides if File.exists?(jasmine_config_overrides) +rescue Exception => e + #we do this because when we are locally developing JS, our local jammit + # helps us re-run jasmine tests by jammiting every time. + #on ci, this causes problems, but we only need to jammit once +end jasmine_config = Jasmine::Config.new spec_builder = Jasmine::SpecBuilder.new(jasmine_config) -- GitLab