Fix some problems with merge.

2009-08-14 18:04:52 -07:00
parent ab65914233
commit e9126fdd9b
3 changed files with 7 additions and 3 deletions
--- a/spec/suites/TrivialReporterTest.js
+++ b/spec/suites/TrivialReporterTest.js
@@ -23,7 +23,7 @@ describe("TrivialReporter", function() {
    trivialReporter = new jasmine.TrivialReporter({ body: body });
    trivialReporter.reportRunnerStarting({
      getAllSuites: function() {
-        return [ new jasmine.Suite(null, "suite 1", null, null) ];
+        return [ new jasmine.Suite({}, "suite 1", null, null) ];
      }
    });