Skip to content

Commit 65083d9

Browse files
committed
Delegate methods to browser
1 parent 5a2b01d commit 65083d9

File tree

1 file changed

+7
-50
lines changed

1 file changed

+7
-50
lines changed

lib/capybara/cuprite/driver.rb

Lines changed: 7 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ class Driver < Capybara::Driver::Base
1010

1111
extend Forwardable
1212

13-
delegate %i(restart quit status_code timeout timeout=) => :browser
13+
delegate %i(restart quit status_code timeout timeout= current_url title body
14+
window_handles close_window switch_to_window within_window window_handle
15+
back forward refresh wait_for_reload) => :browser
16+
alias_method :html, :body
17+
alias_method :current_window_handle, :window_handle
18+
alias_method :go_back, :back
19+
alias_method :go_forward, :forward
1420

1521
attr_reader :app, :options, :screen_size
1622

@@ -43,27 +49,14 @@ def visit(url)
4349
browser.visit(url)
4450
end
4551

46-
def current_url
47-
browser.current_url
48-
end
49-
5052
def frame_url
5153
evaluate_script("window.location.href")
5254
end
5355

54-
def html
55-
browser.body
56-
end
57-
alias_method :body, :html
58-
5956
def source
6057
browser.source.to_s
6158
end
6259

63-
def title
64-
browser.title
65-
end
66-
6760
def frame_title
6861
evaluate_script("document.title")
6962
end
@@ -110,33 +103,13 @@ def switch_to_frame(locator)
110103
browser.switch_to_frame(handle)
111104
end
112105

113-
def current_window_handle
114-
browser.window_handle
115-
end
116-
117-
def window_handles
118-
browser.window_handles
119-
end
120-
121-
def close_window(handle)
122-
browser.close_window(handle)
123-
end
124-
125106
def open_new_window
126107
target = browser.default_context.create_target
127108
target.maybe_sleep_if_new_window
128109
target.page = Page.new(target.id, browser)
129110
target.page
130111
end
131112

132-
def switch_to_window(handle)
133-
browser.switch_to_window(handle)
134-
end
135-
136-
def within_window(name, &block)
137-
browser.within_window(name, &block)
138-
end
139-
140113
def no_such_window_error
141114
Ferrum::NoSuchPageError
142115
end
@@ -360,22 +333,6 @@ def invalid_element_errors
360333
Ferrum::NodeNotFoundError]
361334
end
362335

363-
def go_back
364-
browser.back
365-
end
366-
367-
def go_forward
368-
browser.forward
369-
end
370-
371-
def refresh
372-
browser.refresh
373-
end
374-
375-
def wait_for_reload(*args)
376-
browser.wait_for_reload(*args)
377-
end
378-
379336
def accept_modal(type, options = {})
380337
case type
381338
when :alert, :confirm

0 commit comments

Comments
 (0)