Raise ElementNotDisplayedError also for #drag_to and #select_option when they are invisible.
This commit is contained in:
parent
04a1baaf2a
commit
43c70e4045
|
@ -37,6 +37,7 @@ class Capybara::Driver::Webkit
|
||||||
end
|
end
|
||||||
|
|
||||||
def select_option
|
def select_option
|
||||||
|
check_visibility(self)
|
||||||
invoke "selectOption"
|
invoke "selectOption"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -50,14 +51,13 @@ class Capybara::Driver::Webkit
|
||||||
end
|
end
|
||||||
|
|
||||||
def click
|
def click
|
||||||
if visible?
|
check_visibility(self)
|
||||||
invoke "click"
|
invoke "click"
|
||||||
else
|
|
||||||
raise ElementNotDisplayedError, "This element is not visible so it may not be interacted with"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def drag_to(element)
|
def drag_to(element)
|
||||||
|
check_visibility(self)
|
||||||
|
check_visibility(element)
|
||||||
invoke 'dragTo', element.native
|
invoke 'dragTo', element.native
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -126,5 +126,9 @@ class Capybara::Driver::Webkit
|
||||||
def multiple_select?
|
def multiple_select?
|
||||||
self.tag_name == "select" && self["multiple"] == "multiple"
|
self.tag_name == "select" && self["multiple"] == "multiple"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def check_visibility(element)
|
||||||
|
raise(ElementNotDisplayedError, "This element is not visible so it may not be interacted with") unless element.visible?
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -614,10 +614,13 @@ describe Capybara::Driver::Webkit do
|
||||||
<div id="change">Change me</div>
|
<div id="change">Change me</div>
|
||||||
<div id="mouseup">Push me</div>
|
<div id="mouseup">Push me</div>
|
||||||
<div id="mousedown">Release me</div>
|
<div id="mousedown">Release me</div>
|
||||||
|
<div id="invisible-mouseup" style="display:none;">You can't push me</div>
|
||||||
|
<div id="invisible-mousedown" style="display:none;">You can't release me</div>
|
||||||
<form action="/" method="GET">
|
<form action="/" method="GET">
|
||||||
<select id="change_select" name="change_select">
|
<select id="change_select" name="change_select">
|
||||||
<option value="1" id="option-1" selected="selected">one</option>
|
<option value="1" id="option-1" selected="selected">one</option>
|
||||||
<option value="2" id="option-2">two</option>
|
<option value="2" id="option-2">two</option>
|
||||||
|
<option value="2" id="invisible-option" style="display:none;">three</option>
|
||||||
</select>
|
</select>
|
||||||
</form>
|
</form>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
@ -658,12 +661,6 @@ describe Capybara::Driver::Webkit do
|
||||||
subject.find("//*[@class='triggered']").should_not be_empty
|
subject.find("//*[@class='triggered']").should_not be_empty
|
||||||
end
|
end
|
||||||
|
|
||||||
it "raises error when it tries to click an invisible element" do
|
|
||||||
expect {
|
|
||||||
subject.find("//*[@id='hidden']").first.click
|
|
||||||
}.to raise_error(Capybara::Driver::Webkit::Node::ElementNotDisplayedError)
|
|
||||||
end
|
|
||||||
|
|
||||||
it "fires a non-mouse event" do
|
it "fires a non-mouse event" do
|
||||||
subject.find("//*[@id='change']").first.trigger("change")
|
subject.find("//*[@id='change']").first.trigger("change")
|
||||||
subject.find("//*[@class='triggered']").should_not be_empty
|
subject.find("//*[@class='triggered']").should_not be_empty
|
||||||
|
@ -686,6 +683,39 @@ describe Capybara::Driver::Webkit do
|
||||||
|
|
||||||
subject.find("//*[@class='triggered']").size.should == 1
|
subject.find("//*[@class='triggered']").size.should == 1
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "raises error when" do
|
||||||
|
it "tries to click an invisible element" do
|
||||||
|
expect {
|
||||||
|
subject.find("//*[@id='hidden']").first.click
|
||||||
|
}.to raise_error(Capybara::Driver::Webkit::Node::ElementNotDisplayedError)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "tries to drag an invisible element to a visible one" do
|
||||||
|
draggable = subject.find("//*[@id='invisible-mousedown']").first
|
||||||
|
container = subject.find("//*[@id='mouseup']").first
|
||||||
|
|
||||||
|
expect {
|
||||||
|
draggable.drag_to(container)
|
||||||
|
}.to raise_error(Capybara::Driver::Webkit::Node::ElementNotDisplayedError)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "tries to drag a visible element to an invisible one" do
|
||||||
|
draggable = subject.find("//*[@id='mousedown']").first
|
||||||
|
container = subject.find("//*[@id='invisible-mouseup']").first
|
||||||
|
|
||||||
|
expect {
|
||||||
|
draggable.drag_to(container)
|
||||||
|
}.to raise_error(Capybara::Driver::Webkit::Node::ElementNotDisplayedError)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "tries to select an invisible option" do
|
||||||
|
option = subject.find("//option[@id='invisible-option']").first
|
||||||
|
expect {
|
||||||
|
option.select_option
|
||||||
|
}.to raise_error(Capybara::Driver::Webkit::Node::ElementNotDisplayedError)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "nesting app" do
|
context "nesting app" do
|
||||||
|
|
Loading…
Reference in New Issue