Skip to content

John McEleney / casperjs

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a4caf0d5 a4caf0d5fb148e68913b869ec276956329085d29 by reina.sweet
Options

Removing querySelector, adding the pattern that is actually needed. Adding tests.

1 parent cfd9bca2
Inline Side-by-side
Showing 5 changed files with 42 additions and 30 deletions
......@@ -695,6 +695,20 @@ Casper.prototype.getCurrentUrl = function getCurrentUrl() {
};
/**
* Retrieves the value of an attribute on the first element matching the provided CSS3 selector.
*
* @param String selector A CSS3 selector
* @param String attribute The attribute to lookup
* @return String The requested DOM element
*/
Casper.prototype.getElementAttribute = Casper.prototype.getElementAttr = function getElementAttr(selector, attribute) {
"use strict";
return this.evaluate(function _evaluate(selector, attribute) {
return document.querySelector(selector).getAttribute(attribute);
}, { selector: selector, attribute: attribute });
};
/**
* Retrieves boundaries for a DOM element matching the provided CSS3 selector.
*
* @param String selector A CSS3 selector
......@@ -936,32 +950,6 @@ Casper.prototype.open = function open(location, settings) {
};
/**
* Retrieves a DOM element matching the provided CSS3 selector.
*
* @param String selector A CSS3 selector
* @return HTMLElement The requested DOM element
*/
Casper.prototype.querySelector = function querySelector(selector) {
"use strict";
return this.evaluate(function _evaluate(selector) {
return window.querySelector(selector);
}, { selector: selector });
};
/**
* Retrieves a NodeList of DOM elements matching the provided CSS3 selector.
*
* @param String selector A CSS3 selector
* @return HTMLElement[] The requested NodeList of DOM elements
*/
Casper.prototype.querySelectorAll = function querySelectorAll(selector) {
"use strict";
return this.evaluate(function _evaluate(selector) {
return window.querySelectorAll(selector);
}, { selector: selector });
};
/**
* Reloads current page.
*
* @param Function then a next step function
......
......@@ -572,10 +572,10 @@ var Tester = function Tester(casper, options) {
* @return Array casedata.cases An array of all the failed case objects
*/
this.getFailures = function getFailures() {
return JSON.parse(JSON.stringify({
return {
length: this.testResults.failed,
cases: this.testResults.failures
}));
};
};
/**
......@@ -586,10 +586,10 @@ var Tester = function Tester(casper, options) {
* @return Array casedata.cases An array of all the passed case objects
*/
this.getPasses = function getPasses() {
return JSON.parse(JSON.stringify({
return {
length: this.testResults.passed,
cases: this.testResults.passes
}));
};
};
/**
......
<!DOCTYPE html>
<html>
<body>
<div class="tester testo testme" data-stuff="beautiful string"></div>
</body>
</html>
\ No newline at end of file
casper.start('tests/site/elementattribute.html', function() {
this.test.comment('Casper.getElementAttribute()');
this.test.assertEquals(this.getElementAttribute('.testo','data-stuff'), 'beautiful string', 'Casper.getElementAttribute() works as intended');
});
casper.run(function() {
this.test.done();
});
......@@ -106,6 +106,16 @@ casper.then(function() {
t.assertUrlMatch(/index\.html$/, "Tester.assertUrlMatch() works as expected");
});
casper.then(function() {
t.comment('Tester.getFailures()');
t.assertEquals(typeof t.getFailures().length, "number", "Tester.getFailures() works as expected");
var passCount = t.getPasses().length;
t.comment('Tester.getPasses()');
t.assertEquals(1, 1, "Rogue assertEquals pass case");
t.assertEquals(t.getPasses().length, passCount + 1, "Tester.getPasses() works as expected");
});
casper.run(function() {
t.done();
});
......