diff --git a/geminstaller.yml b/geminstaller.yml index 780400c..a89fb78 100644 --- a/geminstaller.yml +++ b/geminstaller.yml @@ -18,6 +18,8 @@ gems: version: 1.2.9 - name: selenium-client version: 1.2.17 +- name: rest-client + version: 1.0.3 - name: saucelabs-adapter version: 0.3.2 install_options: --source=http://gems.pivotallabs.com diff --git a/lib/jasmine-0.10.0.js b/lib/jasmine-0.10.0.js index d5abe6a..bfb4494 100644 --- a/lib/jasmine-0.10.0.js +++ b/lib/jasmine-0.10.0.js @@ -501,10 +501,8 @@ var xdescribe = function(description, specDefinitions) { }; -jasmine.XmlHttpRequest = XMLHttpRequest; - // Provide the XMLHttpRequest class for IE 5.x-6.x: -if (typeof XMLHttpRequest == "undefined") jasmine.XmlHttpRequest = function() { +jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() { try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch(e) { @@ -522,7 +520,7 @@ if (typeof XMLHttpRequest == "undefined") jasmine.XmlHttpRequest = function() { } catch(e) { } 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 @@ -2257,5 +2255,5 @@ jasmine.version_= { "major": 0, "minor": 10, "build": 0, - "revision": 1261424713 + "revision": 1261582590 };