watir 6.10.1 → 6.10.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.document +5 -5
- data/.github/ISSUE_TEMPLATE.md +16 -16
- data/.gitignore +21 -21
- data/.travis.yml +72 -72
- data/CHANGES.md +4 -0
- data/Gemfile +16 -16
- data/LICENSE +23 -23
- data/README.md +106 -106
- data/Rakefile +153 -153
- data/appveyor.yml +13 -13
- data/lib/watir-webdriver.rb +2 -2
- data/lib/watir.rb +158 -158
- data/lib/watir/adjacent.rb +126 -126
- data/lib/watir/after_hooks.rb +132 -132
- data/lib/watir/alert.rb +120 -120
- data/lib/watir/aliases.rb +6 -6
- data/lib/watir/attribute_helper.rb +96 -96
- data/lib/watir/browser.rb +349 -349
- data/lib/watir/capabilities.rb +123 -123
- data/lib/watir/cell_container.rb +25 -25
- data/lib/watir/container.rb +51 -51
- data/lib/watir/cookies.rb +134 -134
- data/lib/watir/element_collection.rb +138 -138
- data/lib/watir/elements/area.rb +12 -12
- data/lib/watir/elements/button.rb +37 -37
- data/lib/watir/elements/cell.rb +17 -17
- data/lib/watir/elements/checkbox.rb +56 -56
- data/lib/watir/elements/dlist.rb +12 -12
- data/lib/watir/elements/element.rb +2 -2
- data/lib/watir/elements/file_field.rb +41 -41
- data/lib/watir/elements/font.rb +25 -25
- data/lib/watir/elements/form.rb +16 -16
- data/lib/watir/elements/hidden.rb +25 -25
- data/lib/watir/elements/html_elements.rb +2035 -2035
- data/lib/watir/elements/iframe.rb +166 -166
- data/lib/watir/elements/image.rb +21 -21
- data/lib/watir/elements/input.rb +15 -15
- data/lib/watir/elements/link.rb +18 -18
- data/lib/watir/elements/list.rb +49 -49
- data/lib/watir/elements/option.rb +72 -72
- data/lib/watir/elements/radio.rb +60 -60
- data/lib/watir/elements/row.rb +17 -17
- data/lib/watir/elements/select.rb +250 -250
- data/lib/watir/elements/svg_elements.rb +613 -613
- data/lib/watir/elements/table.rb +76 -76
- data/lib/watir/elements/table_cell.rb +31 -31
- data/lib/watir/elements/table_row.rb +32 -32
- data/lib/watir/elements/table_section.rb +15 -15
- data/lib/watir/elements/text_area.rb +5 -5
- data/lib/watir/elements/text_field.rb +39 -39
- data/lib/watir/exception.rb +16 -16
- data/lib/watir/extensions/nokogiri.rb +14 -14
- data/lib/watir/generator.rb +3 -3
- data/lib/watir/generator/base.rb +11 -11
- data/lib/watir/generator/base/generator.rb +115 -115
- data/lib/watir/generator/base/idl_sorter.rb +47 -47
- data/lib/watir/generator/base/spec_extractor.rb +138 -138
- data/lib/watir/generator/base/util.rb +21 -21
- data/lib/watir/generator/base/visitor.rb +162 -162
- data/lib/watir/generator/html.rb +15 -15
- data/lib/watir/generator/html/generator.rb +36 -36
- data/lib/watir/generator/html/spec_extractor.rb +50 -50
- data/lib/watir/generator/html/visitor.rb +21 -21
- data/lib/watir/generator/svg.rb +7 -7
- data/lib/watir/generator/svg/generator.rb +38 -38
- data/lib/watir/generator/svg/spec_extractor.rb +53 -53
- data/lib/watir/generator/svg/visitor.rb +21 -21
- data/lib/watir/has_window.rb +68 -68
- data/lib/watir/js_execution.rb +143 -143
- data/lib/watir/js_snippets.rb +16 -16
- data/lib/watir/js_snippets/backgroundColor.js +7 -7
- data/lib/watir/js_snippets/fireEvent.js +31 -31
- data/lib/watir/js_snippets/focus.js +3 -3
- data/lib/watir/js_snippets/getInnerHtml.js +19 -19
- data/lib/watir/js_snippets/getInnerText.js +19 -19
- data/lib/watir/js_snippets/getOuterHtml.js +20 -20
- data/lib/watir/js_snippets/getTextContent.js +19 -19
- data/lib/watir/js_snippets/isImageLoaded.js +3 -3
- data/lib/watir/js_snippets/selectOptionsLabel.js +10 -10
- data/lib/watir/js_snippets/selectOptionsText.js +10 -10
- data/lib/watir/js_snippets/selectOptionsValue.js +10 -10
- data/lib/watir/js_snippets/selectText.js +64 -64
- data/lib/watir/js_snippets/selectedOptions.js +11 -11
- data/lib/watir/js_snippets/setValue.js +3 -3
- data/lib/watir/legacy_wait.rb +126 -126
- data/lib/watir/locators.rb +60 -60
- data/lib/watir/locators/button/locator.rb +31 -31
- data/lib/watir/locators/button/selector_builder.rb +30 -30
- data/lib/watir/locators/button/selector_builder/xpath.rb +29 -29
- data/lib/watir/locators/button/validator.rb +15 -15
- data/lib/watir/locators/cell/locator.rb +15 -15
- data/lib/watir/locators/cell/selector_builder.rb +24 -24
- data/lib/watir/locators/element/selector_builder.rb +150 -150
- data/lib/watir/locators/element/selector_builder/xpath.rb +119 -119
- data/lib/watir/locators/element/validator.rb +18 -18
- data/lib/watir/locators/row/locator.rb +15 -15
- data/lib/watir/locators/row/selector_builder.rb +29 -29
- data/lib/watir/locators/text_area/locator.rb +13 -13
- data/lib/watir/locators/text_area/selector_builder.rb +22 -22
- data/lib/watir/locators/text_field/locator.rb +30 -30
- data/lib/watir/locators/text_field/selector_builder.rb +31 -31
- data/lib/watir/locators/text_field/selector_builder/xpath.rb +17 -17
- data/lib/watir/locators/text_field/validator.rb +12 -12
- data/lib/watir/logger.rb +109 -109
- data/lib/watir/radio_set.rb +231 -231
- data/lib/watir/row_container.rb +36 -36
- data/lib/watir/screenshot.rb +50 -50
- data/lib/watir/user_editable.rb +56 -56
- data/lib/watir/wait.rb +200 -200
- data/lib/watir/wait/timer.rb +52 -52
- data/lib/watir/window.rb +257 -257
- data/lib/watir/xpath_support.rb +20 -20
- data/lib/watirspec.rb +86 -86
- data/lib/watirspec/guards.rb +60 -60
- data/lib/watirspec/implementation.rb +51 -51
- data/lib/watirspec/rake_tasks.rb +115 -115
- data/lib/watirspec/remote_server.rb +38 -38
- data/lib/watirspec/runner.rb +53 -53
- data/lib/watirspec/server.rb +99 -99
- data/lib/watirspec/server/app.rb +76 -76
- data/spec/browser_spec.rb +278 -278
- data/spec/click_spec.rb +19 -19
- data/spec/container_spec.rb +34 -34
- data/spec/element_locator_spec.rb +517 -517
- data/spec/element_spec.rb +158 -158
- data/spec/implementation_spec.rb +24 -24
- data/spec/input_spec.rb +14 -14
- data/spec/locator_spec_helper.rb +55 -55
- data/spec/logger_spec.rb +46 -46
- data/spec/spec_helper.rb +22 -22
- data/spec/special_chars_spec.rb +13 -13
- data/spec/watirspec/adjacent_spec.rb +227 -227
- data/spec/watirspec/after_hooks_spec.rb +182 -182
- data/spec/watirspec/alert_spec.rb +108 -108
- data/spec/watirspec/attributes_spec.rb +16 -16
- data/spec/watirspec/browser_spec.rb +281 -281
- data/spec/watirspec/cookies_spec.rb +154 -154
- data/spec/watirspec/drag_and_drop_spec.rb +49 -49
- data/spec/watirspec/element_hidden_spec.rb +75 -75
- data/spec/watirspec/elements/area_spec.rb +72 -72
- data/spec/watirspec/elements/areas_spec.rb +42 -42
- data/spec/watirspec/elements/button_spec.rb +277 -277
- data/spec/watirspec/elements/buttons_spec.rb +55 -55
- data/spec/watirspec/elements/checkbox_spec.rb +275 -275
- data/spec/watirspec/elements/checkboxes_spec.rb +44 -44
- data/spec/watirspec/elements/collections_spec.rb +52 -52
- data/spec/watirspec/elements/dd_spec.rb +124 -124
- data/spec/watirspec/elements/dds_spec.rb +42 -42
- data/spec/watirspec/elements/del_spec.rb +126 -126
- data/spec/watirspec/elements/dels_spec.rb +40 -40
- data/spec/watirspec/elements/div_spec.rb +245 -245
- data/spec/watirspec/elements/divs_spec.rb +42 -42
- data/spec/watirspec/elements/dl_spec.rb +142 -142
- data/spec/watirspec/elements/dls_spec.rb +43 -43
- data/spec/watirspec/elements/dt_spec.rb +122 -122
- data/spec/watirspec/elements/dts_spec.rb +42 -42
- data/spec/watirspec/elements/element_spec.rb +483 -483
- data/spec/watirspec/elements/elements_spec.rb +47 -47
- data/spec/watirspec/elements/em_spec.rb +96 -96
- data/spec/watirspec/elements/ems_spec.rb +43 -43
- data/spec/watirspec/elements/filefield_spec.rb +170 -170
- data/spec/watirspec/elements/filefields_spec.rb +43 -43
- data/spec/watirspec/elements/font_spec.rb +29 -29
- data/spec/watirspec/elements/form_spec.rb +66 -66
- data/spec/watirspec/elements/forms_spec.rb +46 -46
- data/spec/watirspec/elements/frame_spec.rb +123 -123
- data/spec/watirspec/elements/frames_spec.rb +41 -41
- data/spec/watirspec/elements/hidden_spec.rb +104 -104
- data/spec/watirspec/elements/hiddens_spec.rb +43 -43
- data/spec/watirspec/elements/hn_spec.rb +92 -92
- data/spec/watirspec/elements/hns_spec.rb +38 -38
- data/spec/watirspec/elements/iframe_spec.rb +3 -0
- data/spec/watirspec/elements/iframes_spec.rb +47 -47
- data/spec/watirspec/elements/image_spec.rb +158 -158
- data/spec/watirspec/elements/images_spec.rb +40 -40
- data/spec/watirspec/elements/ins_spec.rb +127 -127
- data/spec/watirspec/elements/inses_spec.rb +40 -40
- data/spec/watirspec/elements/label_spec.rb +75 -75
- data/spec/watirspec/elements/labels_spec.rb +40 -40
- data/spec/watirspec/elements/li_spec.rb +111 -111
- data/spec/watirspec/elements/link_spec.rb +171 -171
- data/spec/watirspec/elements/links_spec.rb +44 -44
- data/spec/watirspec/elements/lis_spec.rb +42 -42
- data/spec/watirspec/elements/list_spec.rb +32 -32
- data/spec/watirspec/elements/map_spec.rb +75 -75
- data/spec/watirspec/elements/maps_spec.rb +41 -41
- data/spec/watirspec/elements/meta_spec.rb +23 -23
- data/spec/watirspec/elements/metas_spec.rb +40 -40
- data/spec/watirspec/elements/ol_spec.rb +87 -87
- data/spec/watirspec/elements/ols_spec.rb +40 -40
- data/spec/watirspec/elements/option_spec.rb +121 -121
- data/spec/watirspec/elements/p_spec.rb +111 -111
- data/spec/watirspec/elements/pre_spec.rb +111 -111
- data/spec/watirspec/elements/pres_spec.rb +40 -40
- data/spec/watirspec/elements/ps_spec.rb +40 -40
- data/spec/watirspec/elements/radio_spec.rb +273 -273
- data/spec/watirspec/elements/radios_spec.rb +43 -43
- data/spec/watirspec/elements/select_list_spec.rb +553 -553
- data/spec/watirspec/elements/select_lists_spec.rb +46 -46
- data/spec/watirspec/elements/span_spec.rb +128 -128
- data/spec/watirspec/elements/spans_spec.rb +40 -40
- data/spec/watirspec/elements/strong_spec.rb +88 -88
- data/spec/watirspec/elements/strongs_spec.rb +43 -43
- data/spec/watirspec/elements/table_nesting_spec.rb +51 -51
- data/spec/watirspec/elements/table_spec.rb +156 -156
- data/spec/watirspec/elements/tables_spec.rb +42 -42
- data/spec/watirspec/elements/tbody_spec.rb +93 -93
- data/spec/watirspec/elements/tbodys_spec.rb +62 -62
- data/spec/watirspec/elements/td_spec.rb +93 -93
- data/spec/watirspec/elements/tds_spec.rb +53 -53
- data/spec/watirspec/elements/text_field_spec.rb +360 -360
- data/spec/watirspec/elements/text_fields_spec.rb +44 -44
- data/spec/watirspec/elements/textarea_spec.rb +26 -26
- data/spec/watirspec/elements/textareas_spec.rb +24 -24
- data/spec/watirspec/elements/tfoot_spec.rb +86 -86
- data/spec/watirspec/elements/tfoots_spec.rb +68 -68
- data/spec/watirspec/elements/thead_spec.rb +86 -86
- data/spec/watirspec/elements/theads_spec.rb +68 -68
- data/spec/watirspec/elements/tr_spec.rb +78 -78
- data/spec/watirspec/elements/trs_spec.rb +61 -61
- data/spec/watirspec/elements/ul_spec.rb +76 -76
- data/spec/watirspec/elements/uls_spec.rb +39 -39
- data/spec/watirspec/html/alerts.html +12 -12
- data/spec/watirspec/html/aria_attributes.html +9 -9
- data/spec/watirspec/html/class_locator.html +8 -8
- data/spec/watirspec/html/clicks.html +19 -19
- data/spec/watirspec/html/closeable.html +12 -12
- data/spec/watirspec/html/collections.html +14 -14
- data/spec/watirspec/html/css/jquery-ui-1.8.17.custom.css +286 -286
- data/spec/watirspec/html/data_attributes.html +9 -9
- data/spec/watirspec/html/definition_lists.html +47 -47
- data/spec/watirspec/html/drag_and_drop.html +106 -106
- data/spec/watirspec/html/font.html +10 -10
- data/spec/watirspec/html/forms_with_input_elements.html +174 -174
- data/spec/watirspec/html/frame_1.html +22 -22
- data/spec/watirspec/html/frame_2.html +15 -15
- data/spec/watirspec/html/frames.html +10 -10
- data/spec/watirspec/html/hover.html +11 -11
- data/spec/watirspec/html/iframe_1.html +22 -22
- data/spec/watirspec/html/iframes.html +12 -12
- data/spec/watirspec/html/images.html +27 -27
- data/spec/watirspec/html/inner_outer.html +4 -4
- data/spec/watirspec/html/javascript/angular.min.js +331 -331
- data/spec/watirspec/html/javascript/helpers.js +16 -16
- data/spec/watirspec/html/javascript/jquery-1.7.1.min.js +3 -3
- data/spec/watirspec/html/javascript/jquery-ui-1.8.17.custom.min.js +67 -67
- data/spec/watirspec/html/keylogger.html +14 -14
- data/spec/watirspec/html/modal_dialog.html +9 -9
- data/spec/watirspec/html/multiple_ids.html +14 -14
- data/spec/watirspec/html/nested_elements.html +33 -33
- data/spec/watirspec/html/nested_frame_2.html +9 -9
- data/spec/watirspec/html/nested_frame_3.html +14 -14
- data/spec/watirspec/html/nested_frames.html +10 -10
- data/spec/watirspec/html/nested_iframe_2.html +12 -12
- data/spec/watirspec/html/nested_iframes.html +13 -13
- data/spec/watirspec/html/nested_tables.html +202 -202
- data/spec/watirspec/html/non_control_elements.html +140 -140
- data/spec/watirspec/html/removed_element.html +24 -24
- data/spec/watirspec/html/right_click.html +10 -10
- data/spec/watirspec/html/special_chars.html +11 -11
- data/spec/watirspec/html/tables.html +120 -120
- data/spec/watirspec/html/timeout_window_location.html +19 -19
- data/spec/watirspec/html/uneven_table.html +20 -20
- data/spec/watirspec/html/wait.html +84 -84
- data/spec/watirspec/html/window_switching.html +11 -11
- data/spec/watirspec/radio_set_spec.rb +336 -336
- data/spec/watirspec/relaxed_locate_spec.rb +99 -99
- data/spec/watirspec/screenshot_spec.rb +29 -29
- data/spec/watirspec/support/raise_exception_matchers.rb +36 -36
- data/spec/watirspec/wait_spec.rb +381 -381
- data/spec/watirspec/window_switching_spec.rb +415 -415
- data/spec/watirspec_helper.rb +161 -161
- data/support/appveyor.cmd +9 -9
- data/support/doctest_helper.rb +101 -101
- data/support/travis.sh +11 -11
- data/support/version_differ.rb +59 -59
- data/watir.gemspec +1 -1
- metadata +169 -3
data/lib/watir/elements/table.rb
CHANGED
@@ -1,76 +1,76 @@
|
|
1
|
-
module Watir
|
2
|
-
class Table < HTMLElement
|
3
|
-
include RowContainer
|
4
|
-
include Enumerable
|
5
|
-
|
6
|
-
#
|
7
|
-
# Yields each TableRow associated with this table.
|
8
|
-
#
|
9
|
-
# @example
|
10
|
-
# table = browser.table
|
11
|
-
# table.each do |row|
|
12
|
-
# puts row.text
|
13
|
-
# end
|
14
|
-
#
|
15
|
-
# @yieldparam [Watir::TableRow] element Iterate through the rows for this table.
|
16
|
-
#
|
17
|
-
|
18
|
-
def each(&block)
|
19
|
-
rows.each(&block)
|
20
|
-
end
|
21
|
-
|
22
|
-
#
|
23
|
-
# Represents table rows as hashes
|
24
|
-
#
|
25
|
-
# @return [Array<Hash>]
|
26
|
-
#
|
27
|
-
|
28
|
-
def hashes
|
29
|
-
all_rows = rows.locate
|
30
|
-
header_row = all_rows.first || raise(Exception::Error, "no rows in table")
|
31
|
-
|
32
|
-
all_rows.entries[1..-1].map do |row|
|
33
|
-
cell_size_check(header_row, row)
|
34
|
-
Hash[headers(header_row).map(&:text).zip(row.cells.map(&:text))]
|
35
|
-
end
|
36
|
-
end
|
37
|
-
|
38
|
-
#
|
39
|
-
# Returns first row of Table with proper subtype
|
40
|
-
#
|
41
|
-
# @return [TableCellCollection]
|
42
|
-
#
|
43
|
-
|
44
|
-
def headers(row = nil)
|
45
|
-
row ||= rows.first
|
46
|
-
header_type = row.th.exist? ? 'th' : 'td'
|
47
|
-
row.send("#{header_type}s")
|
48
|
-
end
|
49
|
-
|
50
|
-
#
|
51
|
-
# Returns row of this table with given index.
|
52
|
-
#
|
53
|
-
# @param [Integer] idx
|
54
|
-
# @return Watir::Row
|
55
|
-
#
|
56
|
-
|
57
|
-
def [](idx)
|
58
|
-
row(index: idx)
|
59
|
-
end
|
60
|
-
|
61
|
-
#
|
62
|
-
# @api private
|
63
|
-
#
|
64
|
-
|
65
|
-
def cell_size_check(header_row, cell_row)
|
66
|
-
header_size = header_row.cells.size
|
67
|
-
row_size = cell_row.cells.size
|
68
|
-
return if header_size == row_size
|
69
|
-
|
70
|
-
index = cell_row.selector[:index]
|
71
|
-
row_id = index ? "row at index #{index - 1}" : 'designated row'
|
72
|
-
raise Exception::Error, "#{row_id} has #{row_size} cells, while header row has #{header_size}"
|
73
|
-
end
|
74
|
-
|
75
|
-
end # Table
|
76
|
-
end # Watir
|
1
|
+
module Watir
|
2
|
+
class Table < HTMLElement
|
3
|
+
include RowContainer
|
4
|
+
include Enumerable
|
5
|
+
|
6
|
+
#
|
7
|
+
# Yields each TableRow associated with this table.
|
8
|
+
#
|
9
|
+
# @example
|
10
|
+
# table = browser.table
|
11
|
+
# table.each do |row|
|
12
|
+
# puts row.text
|
13
|
+
# end
|
14
|
+
#
|
15
|
+
# @yieldparam [Watir::TableRow] element Iterate through the rows for this table.
|
16
|
+
#
|
17
|
+
|
18
|
+
def each(&block)
|
19
|
+
rows.each(&block)
|
20
|
+
end
|
21
|
+
|
22
|
+
#
|
23
|
+
# Represents table rows as hashes
|
24
|
+
#
|
25
|
+
# @return [Array<Hash>]
|
26
|
+
#
|
27
|
+
|
28
|
+
def hashes
|
29
|
+
all_rows = rows.locate
|
30
|
+
header_row = all_rows.first || raise(Exception::Error, "no rows in table")
|
31
|
+
|
32
|
+
all_rows.entries[1..-1].map do |row|
|
33
|
+
cell_size_check(header_row, row)
|
34
|
+
Hash[headers(header_row).map(&:text).zip(row.cells.map(&:text))]
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
#
|
39
|
+
# Returns first row of Table with proper subtype
|
40
|
+
#
|
41
|
+
# @return [TableCellCollection]
|
42
|
+
#
|
43
|
+
|
44
|
+
def headers(row = nil)
|
45
|
+
row ||= rows.first
|
46
|
+
header_type = row.th.exist? ? 'th' : 'td'
|
47
|
+
row.send("#{header_type}s")
|
48
|
+
end
|
49
|
+
|
50
|
+
#
|
51
|
+
# Returns row of this table with given index.
|
52
|
+
#
|
53
|
+
# @param [Integer] idx
|
54
|
+
# @return Watir::Row
|
55
|
+
#
|
56
|
+
|
57
|
+
def [](idx)
|
58
|
+
row(index: idx)
|
59
|
+
end
|
60
|
+
|
61
|
+
#
|
62
|
+
# @api private
|
63
|
+
#
|
64
|
+
|
65
|
+
def cell_size_check(header_row, cell_row)
|
66
|
+
header_size = header_row.cells.size
|
67
|
+
row_size = cell_row.cells.size
|
68
|
+
return if header_size == row_size
|
69
|
+
|
70
|
+
index = cell_row.selector[:index]
|
71
|
+
row_id = index ? "row at index #{index - 1}" : 'designated row'
|
72
|
+
raise Exception::Error, "#{row_id} has #{row_size} cells, while header row has #{header_size}"
|
73
|
+
end
|
74
|
+
|
75
|
+
end # Table
|
76
|
+
end # Watir
|
@@ -1,31 +1,31 @@
|
|
1
|
-
module Watir
|
2
|
-
class TableCell < HTMLElement
|
3
|
-
|
4
|
-
def column_header
|
5
|
-
current_row = parent(tag_name: 'tr')
|
6
|
-
header_row(current_row, index: previous_siblings.size).text
|
7
|
-
end
|
8
|
-
|
9
|
-
def sibling_from_header(opt)
|
10
|
-
current_row = parent(tag_name: 'tr')
|
11
|
-
header = header_row(current_row, opt)
|
12
|
-
index = header.previous_siblings.size
|
13
|
-
|
14
|
-
self.class.new(current_row, tag_name: 'td', index: index)
|
15
|
-
end
|
16
|
-
|
17
|
-
private
|
18
|
-
|
19
|
-
def header_row(current_row, opt)
|
20
|
-
table = self.parent(tag_name: 'table')
|
21
|
-
header_row = table.tr
|
22
|
-
|
23
|
-
table.cell_size_check(header_row, current_row)
|
24
|
-
|
25
|
-
header_type = table.th.exist? ? 'th' : 'tr'
|
26
|
-
opt.merge!(tag_name: header_type)
|
27
|
-
|
28
|
-
Watir.tag_to_class[header_type.to_sym].new(header_row, opt)
|
29
|
-
end
|
30
|
-
end # TableCell
|
31
|
-
end # Watir
|
1
|
+
module Watir
|
2
|
+
class TableCell < HTMLElement
|
3
|
+
|
4
|
+
def column_header
|
5
|
+
current_row = parent(tag_name: 'tr')
|
6
|
+
header_row(current_row, index: previous_siblings.size).text
|
7
|
+
end
|
8
|
+
|
9
|
+
def sibling_from_header(opt)
|
10
|
+
current_row = parent(tag_name: 'tr')
|
11
|
+
header = header_row(current_row, opt)
|
12
|
+
index = header.previous_siblings.size
|
13
|
+
|
14
|
+
self.class.new(current_row, tag_name: 'td', index: index)
|
15
|
+
end
|
16
|
+
|
17
|
+
private
|
18
|
+
|
19
|
+
def header_row(current_row, opt)
|
20
|
+
table = self.parent(tag_name: 'table')
|
21
|
+
header_row = table.tr
|
22
|
+
|
23
|
+
table.cell_size_check(header_row, current_row)
|
24
|
+
|
25
|
+
header_type = table.th.exist? ? 'th' : 'tr'
|
26
|
+
opt.merge!(tag_name: header_type)
|
27
|
+
|
28
|
+
Watir.tag_to_class[header_type.to_sym].new(header_row, opt)
|
29
|
+
end
|
30
|
+
end # TableCell
|
31
|
+
end # Watir
|
@@ -1,32 +1,32 @@
|
|
1
|
-
module Watir
|
2
|
-
class TableRow < HTMLElement
|
3
|
-
include CellContainer
|
4
|
-
include Enumerable
|
5
|
-
|
6
|
-
#
|
7
|
-
# Yields each TableCell associated with this row.
|
8
|
-
#
|
9
|
-
# @example
|
10
|
-
# row = browser.tr
|
11
|
-
# row.each do |cell|
|
12
|
-
# puts cell.text
|
13
|
-
# end
|
14
|
-
#
|
15
|
-
# @yieldparam [Watir::TableCell] element Iterate through the cells for this row.
|
16
|
-
#
|
17
|
-
|
18
|
-
def each(&block)
|
19
|
-
cells.each(&block)
|
20
|
-
end
|
21
|
-
|
22
|
-
#
|
23
|
-
# Get the n'th cell (<th> or <td>) of this row
|
24
|
-
#
|
25
|
-
# @return Watir::Cell
|
26
|
-
#
|
27
|
-
|
28
|
-
def [](idx)
|
29
|
-
cell(index: idx)
|
30
|
-
end
|
31
|
-
end # TableRow
|
32
|
-
end # Watir
|
1
|
+
module Watir
|
2
|
+
class TableRow < HTMLElement
|
3
|
+
include CellContainer
|
4
|
+
include Enumerable
|
5
|
+
|
6
|
+
#
|
7
|
+
# Yields each TableCell associated with this row.
|
8
|
+
#
|
9
|
+
# @example
|
10
|
+
# row = browser.tr
|
11
|
+
# row.each do |cell|
|
12
|
+
# puts cell.text
|
13
|
+
# end
|
14
|
+
#
|
15
|
+
# @yieldparam [Watir::TableCell] element Iterate through the cells for this row.
|
16
|
+
#
|
17
|
+
|
18
|
+
def each(&block)
|
19
|
+
cells.each(&block)
|
20
|
+
end
|
21
|
+
|
22
|
+
#
|
23
|
+
# Get the n'th cell (<th> or <td>) of this row
|
24
|
+
#
|
25
|
+
# @return Watir::Cell
|
26
|
+
#
|
27
|
+
|
28
|
+
def [](idx)
|
29
|
+
cell(index: idx)
|
30
|
+
end
|
31
|
+
end # TableRow
|
32
|
+
end # Watir
|
@@ -1,15 +1,15 @@
|
|
1
|
-
module Watir
|
2
|
-
class TableSection < HTMLElement
|
3
|
-
include RowContainer
|
4
|
-
|
5
|
-
#
|
6
|
-
# Returns table section row with given index.
|
7
|
-
#
|
8
|
-
# @param [Integer] idx
|
9
|
-
#
|
10
|
-
|
11
|
-
def [](idx)
|
12
|
-
row(index: idx)
|
13
|
-
end
|
14
|
-
end # TableSection
|
15
|
-
end # Watir
|
1
|
+
module Watir
|
2
|
+
class TableSection < HTMLElement
|
3
|
+
include RowContainer
|
4
|
+
|
5
|
+
#
|
6
|
+
# Returns table section row with given index.
|
7
|
+
#
|
8
|
+
# @param [Integer] idx
|
9
|
+
#
|
10
|
+
|
11
|
+
def [](idx)
|
12
|
+
row(index: idx)
|
13
|
+
end
|
14
|
+
end # TableSection
|
15
|
+
end # Watir
|
@@ -1,5 +1,5 @@
|
|
1
|
-
module Watir
|
2
|
-
class TextArea < HTMLElement
|
3
|
-
include UserEditable
|
4
|
-
end # TextArea
|
5
|
-
end # Watir
|
1
|
+
module Watir
|
2
|
+
class TextArea < HTMLElement
|
3
|
+
include UserEditable
|
4
|
+
end # TextArea
|
5
|
+
end # Watir
|
@@ -1,39 +1,39 @@
|
|
1
|
-
module Watir
|
2
|
-
class TextField < Input
|
3
|
-
include UserEditable
|
4
|
-
|
5
|
-
NON_TEXT_TYPES = %w[file radio checkbox submit reset image button hidden range color]
|
6
|
-
|
7
|
-
protected
|
8
|
-
|
9
|
-
def selector_string
|
10
|
-
selector = @selector.dup
|
11
|
-
selector[:type] = '(any text type)'
|
12
|
-
selector[:tag_name] = "input"
|
13
|
-
|
14
|
-
if @query_scope.is_a?(Browser) || @query_scope.is_a?(IFrame)
|
15
|
-
super
|
16
|
-
else
|
17
|
-
"#{@query_scope.selector_string} --> #{selector.inspect}"
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end # TextField
|
21
|
-
|
22
|
-
module Container
|
23
|
-
def text_field(*args)
|
24
|
-
TextField.new(self, extract_selector(args).merge(tag_name: "input"))
|
25
|
-
end
|
26
|
-
|
27
|
-
def text_fields(*args)
|
28
|
-
TextFieldCollection.new(self, extract_selector(args).merge(tag_name: "input"))
|
29
|
-
end
|
30
|
-
end # Container
|
31
|
-
|
32
|
-
class TextFieldCollection < InputCollection
|
33
|
-
private
|
34
|
-
|
35
|
-
def element_class
|
36
|
-
TextField
|
37
|
-
end
|
38
|
-
end # TextFieldCollection
|
39
|
-
end # Watir
|
1
|
+
module Watir
|
2
|
+
class TextField < Input
|
3
|
+
include UserEditable
|
4
|
+
|
5
|
+
NON_TEXT_TYPES = %w[file radio checkbox submit reset image button hidden range color]
|
6
|
+
|
7
|
+
protected
|
8
|
+
|
9
|
+
def selector_string
|
10
|
+
selector = @selector.dup
|
11
|
+
selector[:type] = '(any text type)'
|
12
|
+
selector[:tag_name] = "input"
|
13
|
+
|
14
|
+
if @query_scope.is_a?(Browser) || @query_scope.is_a?(IFrame)
|
15
|
+
super
|
16
|
+
else
|
17
|
+
"#{@query_scope.selector_string} --> #{selector.inspect}"
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end # TextField
|
21
|
+
|
22
|
+
module Container
|
23
|
+
def text_field(*args)
|
24
|
+
TextField.new(self, extract_selector(args).merge(tag_name: "input"))
|
25
|
+
end
|
26
|
+
|
27
|
+
def text_fields(*args)
|
28
|
+
TextFieldCollection.new(self, extract_selector(args).merge(tag_name: "input"))
|
29
|
+
end
|
30
|
+
end # Container
|
31
|
+
|
32
|
+
class TextFieldCollection < InputCollection
|
33
|
+
private
|
34
|
+
|
35
|
+
def element_class
|
36
|
+
TextField
|
37
|
+
end
|
38
|
+
end # TextFieldCollection
|
39
|
+
end # Watir
|
data/lib/watir/exception.rb
CHANGED
@@ -1,16 +1,16 @@
|
|
1
|
-
module Watir
|
2
|
-
module Exception
|
3
|
-
class Error < StandardError; end
|
4
|
-
|
5
|
-
# TODO: rename Object -> Element?
|
6
|
-
class UnknownObjectException < Error; end
|
7
|
-
class ObjectDisabledException < Error; end
|
8
|
-
class ObjectReadOnlyException < Error; end
|
9
|
-
class NoValueFoundException < Error; end
|
10
|
-
class UnknownCellException < Error; end
|
11
|
-
class NoMatchingWindowFoundException < Error; end
|
12
|
-
class UnknownFrameException < Error; end
|
13
|
-
class UnknownRowException < Error; end
|
14
|
-
|
15
|
-
end # Exception
|
16
|
-
end # Watir
|
1
|
+
module Watir
|
2
|
+
module Exception
|
3
|
+
class Error < StandardError; end
|
4
|
+
|
5
|
+
# TODO: rename Object -> Element?
|
6
|
+
class UnknownObjectException < Error; end
|
7
|
+
class ObjectDisabledException < Error; end
|
8
|
+
class ObjectReadOnlyException < Error; end
|
9
|
+
class NoValueFoundException < Error; end
|
10
|
+
class UnknownCellException < Error; end
|
11
|
+
class NoMatchingWindowFoundException < Error; end
|
12
|
+
class UnknownFrameException < Error; end
|
13
|
+
class UnknownRowException < Error; end
|
14
|
+
|
15
|
+
end # Exception
|
16
|
+
end # Watir
|
@@ -1,14 +1,14 @@
|
|
1
|
-
require "nokogiri"
|
2
|
-
|
3
|
-
module Watir
|
4
|
-
class Browser
|
5
|
-
|
6
|
-
def text
|
7
|
-
doc = Nokogiri::HTML(body(index: 0).html)
|
8
|
-
doc.css("script").remove # encoding bug in older libxml?
|
9
|
-
|
10
|
-
doc.inner_text
|
11
|
-
end
|
12
|
-
|
13
|
-
end # Browser
|
14
|
-
end # Watir
|
1
|
+
require "nokogiri"
|
2
|
+
|
3
|
+
module Watir
|
4
|
+
class Browser
|
5
|
+
|
6
|
+
def text
|
7
|
+
doc = Nokogiri::HTML(body(index: 0).html)
|
8
|
+
doc.css("script").remove # encoding bug in older libxml?
|
9
|
+
|
10
|
+
doc.inner_text
|
11
|
+
end
|
12
|
+
|
13
|
+
end # Browser
|
14
|
+
end # Watir
|