Merge branch 'master' of git@github.com:emi/jasmine into htmlreporter

Conflicts:
	lib/TrivialReporter.js
	spec/bootstrap.js
	spec/runner.html

src/Matchers.js

@@ -216,6 +216,16 @@ jasmine.Matchers.prototype.toNotContain = function(item) {
     'Expected ' + jasmine.Matchers.pp(this.actual) + ' not to contain ' + jasmine.Matchers.pp(item) + ', but it does.');
 };
 
+jasmine.Matchers.prototype.toBeLessThan = function(expected) {
+  return this.report(this.actual < expected,
+    'Expected ' + jasmine.Matchers.pp(this.actual) + ' to be less than ' + jasmine.Matchers.pp(expected) + ', but it was not.');
+};
+
+jasmine.Matchers.prototype.toBeGreaterThan = function(expected) {
+  return this.report(this.actual > expected,
+    'Expected ' + jasmine.Matchers.pp(this.actual) + ' to be greater than ' + jasmine.Matchers.pp(expected) + ', but it was not.');
+};
+
 /**
  * Matcher that checks that the expected exception was thrown by the actual.
  *

src/Runner.js

@@ -22,6 +22,28 @@ jasmine.Runner.prototype.finishCallback = function() {
   this.env.reporter.reportRunnerResults(this);
 };
 
+jasmine.Runner.prototype.getAllSuites = function() {
+  var suitesToReturn = [];
+
+  function addSuite(suite) {
+    suitesToReturn.push(suite);
+
+    for (var j = 0; j < suite.specs.length; j++) {
+      var spec = suite.specs[j];
+      if (spec instanceof jasmine.Suite) {
+        addSuite(spec);
+      }
+    }
+  }
+
+  for (var i = 0; i < this.suites.length; i++) {
+    var suite = this.suites[i];
+    addSuite(suite);
+  }
+
+  return suitesToReturn;
+};
+
 jasmine.Runner.prototype.getResults = function() {
   var results = new jasmine.NestedResults();
   for (var i = 0; i < this.suites.length; i++) {