@@ -10,7 +10,13 @@ class Driver < Capybara::Driver::Base
10
10
11
11
extend Forwardable
12
12
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
14
20
15
21
attr_reader :app , :options , :screen_size
16
22
@@ -43,27 +49,14 @@ def visit(url)
43
49
browser . visit ( url )
44
50
end
45
51
46
- def current_url
47
- browser . current_url
48
- end
49
-
50
52
def frame_url
51
53
evaluate_script ( "window.location.href" )
52
54
end
53
55
54
- def html
55
- browser . body
56
- end
57
- alias_method :body , :html
58
-
59
56
def source
60
57
browser . source . to_s
61
58
end
62
59
63
- def title
64
- browser . title
65
- end
66
-
67
60
def frame_title
68
61
evaluate_script ( "document.title" )
69
62
end
@@ -110,33 +103,13 @@ def switch_to_frame(locator)
110
103
browser . switch_to_frame ( handle )
111
104
end
112
105
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
-
125
106
def open_new_window
126
107
target = browser . default_context . create_target
127
108
target . maybe_sleep_if_new_window
128
109
target . page = Page . new ( target . id , browser )
129
110
target . page
130
111
end
131
112
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
-
140
113
def no_such_window_error
141
114
Ferrum ::NoSuchPageError
142
115
end
@@ -360,22 +333,6 @@ def invalid_element_errors
360
333
Ferrum ::NodeNotFoundError ]
361
334
end
362
335
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
-
379
336
def accept_modal ( type , options = { } )
380
337
case type
381
338
when :alert , :confirm
0 commit comments