Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions lib/ae_page_objects/node.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ def current_url_without_params
class_eval <<-RUBY
def #{m}(*args, &block)
node.send(:#{m}, *args, &block)
rescue Capybara::ElementNotFound => e
raise LoadingElementFailed, e.message
end
RUBY
end
Expand Down Expand Up @@ -89,7 +87,7 @@ def loaded_locator

def ensure_loaded!
if locator = loaded_locator
find(*eval_locator(locator))
node.find(*eval_locator(locator))
end

self
Expand Down
2 changes: 1 addition & 1 deletion test/test_helpers/node_interface_tests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def test_node_method_wraps_not_found
error = Capybara::ElementNotFound.new("The message")
capybara_stub.session.expects(method).with(:args).raises(error)

raised = assert_raises AePageObjects::LoadingElementFailed do
raised = assert_raises error do
subject.send(method, :args)
end

Expand Down
6 changes: 3 additions & 3 deletions test/unit/document_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ def loaded_locator
end
some_document_class.expects(:can_load_from_current_url?).returns(true)

element_error = LoadingElementFailed.new("Twas an error")
some_document_class.any_instance.expects(:find).with("#hello").raises(element_error)
capybara_error = Capybara::ElementNotFound.new("Twas an error")
capybara_stub.session.expects(:find).with("#hello").raises(capybara_error)

raised = assert_raises LoadingPageFailed do
some_document_class.new
end

assert_equal element_error.message, raised.message
assert_equal capybara_error.message, raised.message
end

def test_stale
Expand Down