Skip to content

Commit

Permalink
Rebuild jasmine, add rest-client to geminstaller (req'd by saucelabs-…
Browse files Browse the repository at this point in the history
…adapter
  • Loading branch information
ragaskar committed Dec 23, 2009
1 parent dd5e97b commit ba8c16a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 2 additions & 0 deletions geminstaller.yml
Expand Up @@ -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
8 changes: 3 additions & 5 deletions lib/jasmine-0.10.0.js
Expand Up @@ -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) {
Expand All @@ -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
Expand Down Expand Up @@ -2257,5 +2255,5 @@ jasmine.version_= {
"major": 0,
"minor": 10,
"build": 0,
"revision": 1261424713
"revision": 1261582590
};

0 comments on commit ba8c16a

Please sign in to comment.