Merge branch 'master' of git://github.com/pivotal/jasmine

This commit is contained in:
Daniel Weaver & David Goudreau
2009-10-16 12:19:06 -07:00
29 changed files with 2431 additions and 2284 deletions

View File

@@ -4,7 +4,7 @@
<meta content="text/html;charset=UTF-8" http-equiv="Content-Type"/>
<title>Jasmine suite</title>
<% css_files.each do |css_file| %>
<link rel="stylesheet" href="<%= css_file %>" type="text/css" media="screen" />
<link rel="stylesheet" href="<%= css_file %>" type="text/css" media="screen"/>
<% end %>
<% jasmine_files.each do |jasmine_file| %>
@@ -19,7 +19,7 @@
var jsApiReporter;
(function() {
var jasmineEnv = jasmine.getEnv();
jsApiReporter = new jasmine.JsApiReporter();
var trivialReporter = new jasmine.TrivialReporter();