From e9126fdd9b8837f3d3c15e47d92dfea37932b157 Mon Sep 17 00:00:00 2001
From: xian <xian@emidev2.local>
Date: Fri, 14 Aug 2009 18:04:52 -0700
Subject: [PATCH] Fix some problems with merge.

---
 lib/TrivialReporter.js             | 4 ++--
 spec/runner.html                   | 4 ++++
 spec/suites/TrivialReporterTest.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/TrivialReporter.js b/lib/TrivialReporter.js
index 3092dd6c..98da1e33 100644
--- a/lib/TrivialReporter.js
+++ b/lib/TrivialReporter.js
@@ -59,7 +59,7 @@ jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
 
 jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
   var results = suite.getResults();
-  var status = results.passed() ? 'passed' : 'failed';
+  var status = results.passed ? 'passed' : 'failed';
   if (results.totalCount == 0) { // todo: change this to check results.skipped
     status = 'skipped';
   }
@@ -68,7 +68,7 @@ jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
 
 jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
   var results = spec.getResults();
-  var status = results.passed() ? 'passed' : 'failed';
+  var status = results.passed ? 'passed' : 'failed';
   if (results.skipped) {
     status = 'skipped';
   }
diff --git a/spec/runner.html b/spec/runner.html
index af398889..919565e1 100644
--- a/spec/runner.html
+++ b/spec/runner.html
@@ -20,6 +20,9 @@
   <script type="text/javascript" src="../src/Suite.js"></script>
   <script type="text/javascript" src="../src/mock-timeout.js"></script>
 
+  <script type="text/javascript" src="../lib/TrivialReporter.js"></script>
+
+
   <script type="text/javascript">
     jasmine.include('suites/EnvTest.js', true);
     jasmine.include('suites/ExceptionsTest.js', true);
@@ -31,6 +34,7 @@
     jasmine.include('suites/RunnerTest.js', true);
     jasmine.include('suites/SpecRunningTest.js', true);
     jasmine.include('suites/SpyTest.js', true);
+    jasmine.include('suites/TrivialReporterTest.js', true);
   </script>
 
   <link href="../lib/jasmine.css" rel="stylesheet"/>
diff --git a/spec/suites/TrivialReporterTest.js b/spec/suites/TrivialReporterTest.js
index d1db5479..0ee96c1e 100644
--- 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) ];
       }
     });