From 331730f8f5409c9842b88ba5a61f302e98c52a08 Mon Sep 17 00:00:00 2001 From: Brian Jenkins & Aaron Peckham Date: Fri, 31 Jul 2009 17:07:47 -0700 Subject: [PATCH 1/6] Changed run.html to expect the jasmine git to be served at /jasmine --- .tylium/bootstrap.rb | 1 + contrib/ruby/run.html | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .tylium/bootstrap.rb diff --git a/.tylium/bootstrap.rb b/.tylium/bootstrap.rb new file mode 100644 index 0000000..7efa85c --- /dev/null +++ b/.tylium/bootstrap.rb @@ -0,0 +1 @@ +require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', '.tylium', 'bootstrap')) diff --git a/contrib/ruby/run.html b/contrib/ruby/run.html index 7ddbe80..c435004 100644 --- a/contrib/ruby/run.html +++ b/contrib/ruby/run.html @@ -3,9 +3,9 @@ Jasmine suite - - - + + + From 457b5a011f6f5f6f7255176f63e7b4c731a91331 Mon Sep 17 00:00:00 2001 From: Christian Williams & Erik Hanson Date: Fri, 7 Aug 2009 14:11:40 -0700 Subject: [PATCH 2/6] Use jasmine CSS, and get rid of HTML in plain text stacktrace --- contrib/ruby/jasmine_spec_builder.rb | 2 +- contrib/ruby/run.html | 2 +- lib/TrivialReporter.js | 2 +- lib/jasmine.css | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/ruby/jasmine_spec_builder.rb b/contrib/ruby/jasmine_spec_builder.rb index 0071a49..591cd10 100644 --- a/contrib/ruby/jasmine_spec_builder.rb +++ b/contrib/ruby/jasmine_spec_builder.rb @@ -121,7 +121,7 @@ module Jasmine out << "\n" unless message["passed"] - stack_trace = message["trace"]["stack"] + stack_trace = message["trace"]["stack"].gsub(/
/, "\n").gsub(/<\/?b>/, " ") STDERR << stack_trace.gsub(/\(.*\)@http:\/\/localhost:[0-9]+\/specs\//, "/spec/") STDERR << "\n" end diff --git a/contrib/ruby/run.html b/contrib/ruby/run.html index c435004..501590d 100644 --- a/contrib/ruby/run.html +++ b/contrib/ruby/run.html @@ -8,7 +8,7 @@ - +