Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/check disabled ro #259

Merged
merged 6 commits into from
Jun 18, 2019
Merged

Feature/check disabled ro #259

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e17942
Also check whether input is disabled
Jun 17, 2019
df830fc
Also check whether input is readonly
Jun 17, 2019
b8a1fd3
We do not support pseudo elements in defaults
Jun 17, 2019
2fa9dc1
Fix wrong location of button
Jun 17, 2019
7297288
Update GM accordingly
Jun 17, 2019
9a5226b
Rename as suggested by reviewer
roesslerj Jun 18, 2019
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
16 changes: 7 additions & 9 deletions src/main/resources/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ all:
- caption-side: top
- column-fill: balance
- direction: ltr
- disabled: false
- display: block
- empty-cells: show
- flex-direction: row
Expand Down Expand Up @@ -98,13 +99,14 @@ body:
- margin-left: 8px
- margin-right: 8px
- margin-top: 8px

button:
- tab-index: 0

br:
- border-image-width: 1
- display: inline

button:
- tab-index: 0
- read-only: false

caption:
- display: table-caption
Expand Down Expand Up @@ -231,6 +233,7 @@ input:
- margin-bottom: 3px
- margin-top: 3px
- tab-index: 0
- read-only: false

img:
- border-image-width: 1
Expand Down Expand Up @@ -299,12 +302,6 @@ pre:
q:
- display: inline

q::after:
- content: close-quote

q::before:
- content: open-quote

rt:
- line-height: normal

Expand Down Expand Up @@ -373,6 +370,7 @@ td:

textarea:
- tab-index: 0
- read-only: false

tfoot:
- display: table-footer-group
Expand Down
17 changes: 17 additions & 0 deletions src/main/resources/javascript/getAllElementsByPath.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,19 @@ function addCoordinates(extractedAttributes, node) {
}
}

function getDisabled(node) {
roesslerj marked this conversation as resolved.
Show resolved Hide resolved
if (!node.disabled) {
return false;
}
if (node.disabled === "") {
return false;
}
if (node.disabled === "disabled") {
return true;
}
return node.disabled;
}

function transform(node) {
var extractedAttributes = {
"tagName": node.tagName.toLowerCase(),
Expand All @@ -73,6 +86,10 @@ function transform(node) {
var attributeValue = attrs[i].value;
extractedAttributes[attributeName] = attributeValue;
}

// overwrite empty attributes (e.g. 'disabled')
extractedAttributes["disabled"] = getDisabled(node);
extractedAttributes["read-only"] = node.readOnly;

// extract *given* CSS style attributes
var style = window.getComputedStyle(node);
Expand Down
26 changes: 17 additions & 9 deletions ...test/recheck/de.retest.web.it.PageFrameIT/page-frame-ChromeDriver.open.recheck/retest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1127,7 +1127,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1234,7 +1234,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">somerandomstring</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1538,7 +1538,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1645,7 +1645,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">somedisablingstring</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -2770,7 +2770,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>display</key>
Expand Down Expand Up @@ -5238,7 +5238,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>display</key>
Expand Down Expand Up @@ -6628,6 +6628,10 @@
<key>padding-top</key>
<value xsi:type="xsd:string">1px</value>
</entry>
<entry>
<key>read-only</key>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>readonly</key>
<value xsi:type="xsd:string">readonly</value>
Expand Down Expand Up @@ -7075,7 +7079,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">foo</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -7207,6 +7211,10 @@
<key>column-rule-color</key>
<value xsi:type="xsd:string">rgb(84, 84, 84)</value>
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
<value xsi:type="xsd:string">Arial</value>
Expand Down Expand Up @@ -7343,7 +7351,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">qwerty</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down
26 changes: 17 additions & 9 deletions ...est/recheck/de.retest.web.it.PageFrameIT/page-frame-FirefoxDriver.open.recheck/retest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1265,7 +1265,7 @@
<attributes>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1332,7 +1332,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">somerandomstring</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1584,7 +1584,7 @@
<attributes>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1651,7 +1651,7 @@
<attributes>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">somedisablingstring</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -2912,7 +2912,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>display</key>
Expand Down Expand Up @@ -5888,7 +5888,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>display</key>
Expand Down Expand Up @@ -7698,6 +7698,10 @@
<key>padding-top</key>
<value xsi:type="xsd:string">1px</value>
</entry>
<entry>
<key>read-only</key>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>readonly</key>
<value xsi:type="xsd:string">readonly</value>
Expand Down Expand Up @@ -8197,7 +8201,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">foo</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>display</key>
Expand Down Expand Up @@ -8345,6 +8349,10 @@
<key>column-rule-color</key>
<value xsi:type="xsd:string">rgb(109, 109, 109)</value>
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>display</key>
<value xsi:type="xsd:string">inline</value>
Expand Down Expand Up @@ -8493,7 +8501,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">qwerty</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>display</key>
Expand Down
26 changes: 17 additions & 9 deletions ...t/recheck/de.retest.web.it.SimpleAutocheckingDriverShowcaseIT/index.00.recheck/retest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1145,7 +1145,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1252,7 +1252,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">somerandomstring</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1556,7 +1556,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -1663,7 +1663,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">somedisablingstring</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -2788,7 +2788,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>display</key>
Expand Down Expand Up @@ -5256,7 +5256,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">disabled</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>display</key>
Expand Down Expand Up @@ -6646,6 +6646,10 @@
<key>padding-top</key>
<value xsi:type="xsd:string">1px</value>
</entry>
<entry>
<key>read-only</key>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>readonly</key>
<value xsi:type="xsd:string">readonly</value>
Expand Down Expand Up @@ -7093,7 +7097,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">foo</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down Expand Up @@ -7225,6 +7229,10 @@
<key>column-rule-color</key>
<value xsi:type="xsd:string">rgb(84, 84, 84)</value>
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
<value xsi:type="xsd:string">Arial</value>
Expand Down Expand Up @@ -7361,7 +7369,7 @@
</entry>
<entry>
<key>disabled</key>
<value xsi:type="xsd:string">qwerty</value>
<value xsi:type="xsd:string">true</value>
</entry>
<entry>
<key>font-family</key>
Expand Down
Loading