Rebuild jasmine, add rest-client to geminstaller (req'd by saucelabs-adapter
This commit is contained in:
parent
dd5e97bf14
commit
ba8c16acd7
@ -18,6 +18,8 @@ gems:
|
|||||||
version: 1.2.9
|
version: 1.2.9
|
||||||
- name: selenium-client
|
- name: selenium-client
|
||||||
version: 1.2.17
|
version: 1.2.17
|
||||||
|
- name: rest-client
|
||||||
|
version: 1.0.3
|
||||||
- name: saucelabs-adapter
|
- name: saucelabs-adapter
|
||||||
version: 0.3.2
|
version: 0.3.2
|
||||||
install_options: --source=http://gems.pivotallabs.com
|
install_options: --source=http://gems.pivotallabs.com
|
||||||
|
@ -501,10 +501,8 @@ var xdescribe = function(description, specDefinitions) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
jasmine.XmlHttpRequest = XMLHttpRequest;
|
|
||||||
|
|
||||||
// Provide the XMLHttpRequest class for IE 5.x-6.x:
|
// Provide the XMLHttpRequest class for IE 5.x-6.x:
|
||||||
if (typeof XMLHttpRequest == "undefined") jasmine.XmlHttpRequest = function() {
|
jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() {
|
||||||
try {
|
try {
|
||||||
return new ActiveXObject("Msxml2.XMLHTTP.6.0");
|
return new ActiveXObject("Msxml2.XMLHTTP.6.0");
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
@ -522,7 +520,7 @@ if (typeof XMLHttpRequest == "undefined") jasmine.XmlHttpRequest = function() {
|
|||||||
} catch(e) {
|
} catch(e) {
|
||||||
}
|
}
|
||||||
throw new Error("This browser does not support XMLHttpRequest.");
|
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
|
* 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,
|
"major": 0,
|
||||||
"minor": 10,
|
"minor": 10,
|
||||||
"build": 0,
|
"build": 0,
|
||||||
"revision": 1261424713
|
"revision": 1261582590
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user