kotovalexarian-likes-github
/
capybara-webkit
mirror of https://github.com/thoughtbot/capybara-webkit
1
0
Fork 0
Code Releases Activity

Improve failure message when trying to click invisible elements 

When not ignoring invisible elements, the message didn't explain that
the click failed because the element was invisible.
This commit is contained in:
Joe Ferris 2013-07-12 12:10:01 -04:00
parent 264bcaf70f
commit e6e2351a15
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/integration/session_spec.rb
View File

@ -446,7 +446,7 @@ describe Capybara::Session do
subject.execute_script "document.getElementById('foo').style.display = 'none'"
lambda { subject.click_link "Click Me" }.should raise_error(
Capybara::Webkit::ClickFailed,
/\[@id='foo'\]/
/\[@id='foo'\].*visible/
)
ensure
Capybara.ignore_hidden_elements = ignore_hidden_elements

20
src/capybara.js
View File

@ -181,7 +181,8 @@ Capybara = {
return CapybaraInvocation.clickPosition(node, rect.left, rect.top, rect.width, rect.height);
}
throw new Capybara.UnpositionedElement(this.pathForNode(node));
var visible = this.isNodeVisible(node);
throw new Capybara.UnpositionedElement(this.pathForNode(node), visible);
},
click: function (index, action) {
@ -220,13 +221,16 @@ Capybara = {
},
visible: function (index) {
var element = this.nodes[index];
while (element) {
var style = element.ownerDocument.defaultView.getComputedStyle(element, null);
if (style.getPropertyValue("display") == 'none' || style.getPropertyValue("visibility") == 'hidden')
return this.isNodeVisible(this.nodes[index]);
},
isNodeVisible: function(node) {
while (node) {
var style = node.ownerDocument.defaultView.getComputedStyle(node, null);
if (style.getPropertyValue('display') == 'none' || style.getPropertyValue('visibility') == 'hidden')
return false;
element = element.parentElement;
node = node.parentElement;
}
return true;
},
@ -376,9 +380,11 @@ Capybara.ClickFailed = function(expectedPath, actualPath, position) {
Capybara.ClickFailed.prototype = new Error();
Capybara.ClickFailed.prototype.constructor = Capybara.ClickFailed;
Capybara.UnpositionedElement = function(path) {
Capybara.UnpositionedElement = function(path, visible) {
this.name = 'Capybara.ClickFailed';
this.message = 'Failed to find position for element ' + path;
if (!visible)
this.message += ' because it is not visible';
};
Capybara.UnpositionedElement.prototype = new Error();
Capybara.UnpositionedElement.prototype.constructor = Capybara.UnpositionedElement;