nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jasmine ci does not need to re-load jammit, so we can rescue out of any failures in the auto-reload patch

Browse source
This commit is contained in:
Maxwell Salzberg 2012-02-07 14:07:50 -08:00
parent 7d325cb29b
commit f141537d0d
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
spec/javascripts/support/jasmine_runner.rb
View file

@ -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)