From 2a3376d11eeb6eeafca0b084881148e8ccd4c21e Mon Sep 17 00:00:00 2001
From: Lee Byrd & Christian Williams <ops+jasmine@pivotallabs.com>
Date: Tue, 22 Jun 2010 17:38:15 -0700
Subject: [PATCH] Removed deprecated jasmine.include(). Removed deprecated
 ExpectationResult.details. Removed deprecated Spec.getResults().

---
 lib/jasmine-0.10.4.js | 97 ++-----------------------------------------
 src/Spec.js           |  5 ---
 src/base.js           | 28 -------------
 3 files changed, 3 insertions(+), 127 deletions(-)

diff --git a/lib/jasmine-0.10.4.js b/lib/jasmine-0.10.4.js
index a6f9b83..ef4c88e 100644
--- a/lib/jasmine-0.10.4.js
+++ b/lib/jasmine-0.10.4.js
@@ -85,9 +85,6 @@ jasmine.ExpectationResult = function(params) {
   this.expected = params.expected;
   this.actual = params.actual;
 
-  /** @deprecated */
-  this.details = params.details;
-
   this.message = this.passed_ ? 'Passed.' : params.message;
   this.trace = this.passed_ ? '' : new Error(this.message);
 };
@@ -577,31 +574,6 @@ jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() {
   }
   throw new Error("This browser does not support XMLHttpRequest.");
 } : XMLHttpRequest;
-
-/**
- * Adds suite files to an HTML document so that they are executed, thus adding them to the current
- * Jasmine environment.
- *
- * @param {String} url path to the file to include
- * @param {Boolean} opt_global
- * @deprecated We suggest you use a different method of including JS source files. <code>jasmine.include</code> will be removed soon.
- */
-jasmine.include = function(url, opt_global) {
-  if (opt_global) {
-    document.write('<script type="text/javascript" src="' + url + '"></' + 'script>');
-  } else {
-    var xhr;
-    try {
-      xhr = new jasmine.XmlHttpRequest();
-      xhr.open("GET", url, false);
-      xhr.send(null);
-    } catch(e) {
-      throw new Error("couldn't fetch " + url + ": " + e);
-    }
-
-    return eval(xhr.responseText);
-  }
-};
 /**
  * @namespace
  */
@@ -1100,25 +1072,11 @@ jasmine.Matchers = function(env, actual, spec, opt_isNot) {
 // todo: @deprecated as of Jasmine 0.11, remove soon [xw]
 jasmine.Matchers.pp = function(str) {
   throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!");
-  this.report();
 };
 
-/** @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. */
+// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw]
 jasmine.Matchers.prototype.report = function(result, failing_message, details) {
-  // todo: report a deprecation warning [xw]
-
-  if (this.isNot) {
-    throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs");
-  }
-  
-  this.reportWasCalled_ = true;
-  var expectationResult = new jasmine.ExpectationResult({
-    passed: result,
-    message: failing_message,
-    details: details
-  });
-  this.spec.addMatcherResult(expectationResult);
-  return result;
+  throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs");
 };
 
 jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) {
@@ -1743,50 +1701,6 @@ jasmine.Queue.prototype.results = function() {
 };
 
 
-/** JasmineReporters.reporter
- *    Base object that will get called whenever a Spec, Suite, or Runner is done.  It is up to
- *    descendants of this object to do something with the results (see json_reporter.js)
- *
- * @deprecated
- */
-jasmine.Reporters = {};
-
-/**
- * @deprecated
- * @param callbacks
- */
-jasmine.Reporters.reporter = function(callbacks) {
-  /**
-   * @deprecated
-   * @param callbacks
-   */
-  var that = {
-    callbacks: callbacks || {},
-
-    doCallback: function(callback, results) {
-      if (callback) {
-        callback(results);
-      }
-    },
-
-    reportRunnerResults: function(runner) {
-      that.doCallback(that.callbacks.runnerCallback, runner);
-    },
-    reportSuiteResults:  function(suite) {
-      that.doCallback(that.callbacks.suiteCallback, suite);
-    },
-    reportSpecResults:   function(spec) {
-      that.doCallback(that.callbacks.specCallback, spec);
-    },
-    log: function (str) {
-      var console = jasmine.getGlobal().console;
-      if (console && console.log) console.log(str);
-    }
-  };
-
-  return that;
-};
-
 /**
  * Runner
  *
@@ -1907,11 +1821,6 @@ jasmine.Spec.prototype.log = function() {
   return this.results_.log(arguments);
 };
 
-/** @deprecated */
-jasmine.Spec.prototype.getResults = function() {
-  return this.results_;
-};
-
 jasmine.Spec.prototype.runs = function (func) {
   var block = new jasmine.Block(this.env, func, this);
   this.addToQueue(block);
@@ -2387,5 +2296,5 @@ jasmine.version_= {
   "major": 0,
   "minor": 10,
   "build": 4,
-  "revision": 1277248808
+  "revision": 1277253444
   };
diff --git a/src/Spec.js b/src/Spec.js
index c74a2e2..f6d6596 100644
--- a/src/Spec.js
+++ b/src/Spec.js
@@ -41,11 +41,6 @@ jasmine.Spec.prototype.log = function() {
   return this.results_.log(arguments);
 };
 
-/** @deprecated */
-jasmine.Spec.prototype.getResults = function() {
-  return this.results_;
-};
-
 jasmine.Spec.prototype.runs = function (func) {
   var block = new jasmine.Block(this.env, func, this);
   this.addToQueue(block);
diff --git a/src/base.js b/src/base.js
index 704df6b..6ac3067 100755
--- a/src/base.js
+++ b/src/base.js
@@ -85,9 +85,6 @@ jasmine.ExpectationResult = function(params) {
   this.expected = params.expected;
   this.actual = params.actual;
 
-  /** @deprecated */
-  this.details = params.details;
-
   this.message = this.passed_ ? 'Passed.' : params.message;
   this.trace = this.passed_ ? '' : new Error(this.message);
 };
@@ -577,28 +574,3 @@ jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() {
   }
   throw new Error("This browser does not support XMLHttpRequest.");
 } : XMLHttpRequest;
-
-/**
- * Adds suite files to an HTML document so that they are executed, thus adding them to the current
- * Jasmine environment.
- *
- * @param {String} url path to the file to include
- * @param {Boolean} opt_global
- * @deprecated We suggest you use a different method of including JS source files. <code>jasmine.include</code> will be removed soon.
- */
-jasmine.include = function(url, opt_global) {
-  if (opt_global) {
-    document.write('<script type="text/javascript" src="' + url + '"></' + 'script>');
-  } else {
-    var xhr;
-    try {
-      xhr = new jasmine.XmlHttpRequest();
-      xhr.open("GET", url, false);
-      xhr.send(null);
-    } catch(e) {
-      throw new Error("couldn't fetch " + url + ": " + e);
-    }
-
-    return eval(xhr.responseText);
-  }
-};