Skip to content
Extraits de code Groupes Projets
Valider f141537d rédigé par Maxwell Salzberg's avatar Maxwell Salzberg
Parcourir les fichiers

jasmine ci does not need to re-load jammit, so we can rescue out of any...

jasmine ci does not need to re-load jammit, so we can rescue out of any failures in the auto-reload patch
parent 7d325cb2
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -7,7 +7,14 @@ require 'json' ...@@ -7,7 +7,14 @@ require 'json'
require 'jasmine' require 'jasmine'
require 'rspec' require 'rspec'
jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb')) 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 jasmine_config = Jasmine::Config.new
spec_builder = Jasmine::SpecBuilder.new(jasmine_config) spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter