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

fix(webdriverjs): Recursively find <frame> #209

Merged
merged 7 commits into from
Apr 12, 2021
Merged

fix(webdriverjs): Recursively find <frame> #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24b1d71
Recursively find "frame"s and inject axe.js, not only "iframe"s
yokra9 Mar 14, 2021
429e06f
Merge branch 'develop' into fix-recursively-find-frame
michael-siek Mar 19, 2021
65347ef
Merge branch 'develop' into fix-recursively-find-frame
dylanb Mar 24, 2021
cf98b0f
Merge branch 'develop' into fix-recursively-find-frame
michael-siek Apr 5, 2021
637de84
test(webdriverjs): add unit test for <frame>
yokra9 Apr 6, 2021
f39a9ee
refactor(webdriverjs): remove unused test fixtures
yokra9 Apr 6, 2021
234272e
Merge branch 'develop' into fix-recursively-find-frame
michael-siek Apr 9, 2021
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
10 changes: 7 additions & 3 deletions packages/webdriverjs/src/axe-injector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ export default class AxeInjector {

await this.driver.executeScript(this.script);

const frames = await this.driver.findElements({ tagName: 'iframe' });
const ifs = await this.driver.findElements({ tagName: 'iframe' });
const fs = await this.driver.findElements({ tagName: 'frame' });
const frames = ifs.concat(fs);

for (const childFrames of frames) {
framePath.push(childFrames);
Expand Down Expand Up @@ -171,8 +173,10 @@ export default class AxeInjector {
// XXX: if this `executeScript` fails, we *want* to error, as we cannot run axe-core.
await this.driver.executeScript(this.script);

// Get all of <iframe>s at this level
const frames = await this.driver.findElements({ tagName: 'iframe' });
// Get all of <iframe>s and <frame>s at this level
const ifs = await this.driver.findElements({ tagName: 'iframe' });
const fs = await this.driver.findElements({ tagName: 'frame' });
const frames = ifs.concat(fs);

// Inject the script into all child frames. Handle errors to ensure we don't stop execution if we fail to inject.
for (const childFrame of frames) {
Expand Down
7 changes: 3 additions & 4 deletions packages/webdriverjs/src/test/fixtures/frames/bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<head>
<title>Bar</title>
</head>
<body>
<h1>Bar</h1>
<iframe src="/frames/baz.html"></iframe>
</body>
<frameset>
<frame src="/frames/baz.html">
</frameset>
</html>
7 changes: 3 additions & 4 deletions packages/webdriverjs/src/test/fixtures/frames/foo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<head>
<title>Foo</title>
</head>
<body>
<h1>Foo</h1>
<iframe src="/frames/bar.html"></iframe>
</body>
<frameset>
<frame src="/frames/bar.html">
</frameset>
</html>
10 changes: 0 additions & 10 deletions packages/webdriverjs/src/test/fixtures/frames/recursive.html
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions packages/webdriverjs/src/test/fixtures/iframes/bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>Bar</title>
</head>
<body>
<h1>Bar</h1>
<iframe src="/iframes/baz.html"></iframe>
</body>
</html>
9 changes: 9 additions & 0 deletions packages/webdriverjs/src/test/fixtures/iframes/baz.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<head>
<title>Baz</title>
</head>
<body>
<h1>Baz</h1>
</body>
</html>
10 changes: 10 additions & 0 deletions packages/webdriverjs/src/test/fixtures/iframes/foo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>Foo</title>
</head>
<body>
<h1>Foo</h1>
<iframe src="/iframes/bar.html"></iframe>
</body>
</html>
6 changes: 6 additions & 0 deletions packages/webdriverjs/src/test/fixtures/inner-configure-frame.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!DOCTYPE html>
<html lang="bob">
<head>
<title>Hello</title>
</head>
</html>
16 changes: 0 additions & 16 deletions packages/webdriverjs/src/test/fixtures/multiple-frames.html
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions packages/webdriverjs/src/test/fixtures/nested-frames.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
<head>
<title>Nested Frames</title>
</head>
<body>
<h1>This page has nested frames!</h1>
<br /><br /><br />
<iframe src="/frames/foo.html"></iframe>
</body>
<frameset>
<frame src="/frames/foo.html">
</frameset>
</html>
11 changes: 11 additions & 0 deletions packages/webdriverjs/src/test/fixtures/nested-iframes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<title>Nested Frames</title>
</head>
<body>
<h1>This page has nested frames!</h1>
<br /><br /><br />
<iframe src="/iframes/foo.html"></iframe>
</body>
</html>
6 changes: 3 additions & 3 deletions packages/webdriverjs/src/test/fixtures/outer-configure-frame.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Configure Frame Test</title>
</head>
<body>
<iframe src="inner-configure-frame.html" title="Test inner frame"></iframe>
</body>
<frameset>
<frame src="inner-configure-frame.html" title="Test inner frame">
</frameset>
</html>
9 changes: 9 additions & 0 deletions packages/webdriverjs/src/test/fixtures/outer-configure-iframe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html lang="FFFF">
<head>
<title>Configure Frame Test</title>
</head>
<body>
<iframe src="inner-configure-frame.html" title="Test inner frame"></iframe>
</body>
</html>
12 changes: 0 additions & 12 deletions packages/webdriverjs/src/test/fixtures/recursive-frames.html
View file
Open in desktop

This file was deleted.

42 changes: 39 additions & 3 deletions packages/webdriverjs/src/test/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,26 @@ describe('@axe-core/webdriverjs', () => {
});

describe('configure', () => {
it('should find configured violations in all iframes', async () => {
await driver.get(`${addr}/outer-configure-iframe.html`);
const results = await new AxeBuilder(driver)
.options({
rules: {
'landmark-one-main': { enabled: false },
'page-has-heading-one': { enabled: false },
region: { enabled: false },
'html-lang-valid': { enabled: false },
bypass: { enabled: false }
}
})
.configure(json)
.analyze();

assert.equal(results.violations[0].id, 'dylang');
// the second violation is in a iframe
assert.equal(results.violations[0].nodes.length, 2);
});

it('should find configured violations in all frames', async () => {
await driver.get(`${addr}/outer-configure-frame.html`);
const results = await new AxeBuilder(driver)
Expand Down Expand Up @@ -135,16 +155,32 @@ describe('@axe-core/webdriverjs', () => {
});

describe('iframe tests', () => {
it('injects into nested iframes', async () => {
await driver.get(`${addr}/nested-iframes.html`);
const executeSpy = sinon.spy(driver, 'executeScript');
await new AxeBuilder(driver).analyze();
/**
* Ensure we called execute 4 times
* 1. nested-iframes.html
* 2. iframes/foo.html
* 3. iframes/bar.html
* 4. iframes/baz.html
*/
assert.strictEqual(executeSpy.callCount, 4);
});
});

describe('frame tests', () => {
it('injects into nested frames', async () => {
await driver.get(`${addr}/nested-frames.html`);
const executeSpy = sinon.spy(driver, 'executeScript');
await new AxeBuilder(driver).analyze();
/**
* Ensure we called execute 4 times
* 1. nested-frames.html
* 2. foo.html
* 3. bar.html
* 4. baz.html
* 2. frames/foo.html
* 3. frames/bar.html
* 4. frames/baz.html
*/
assert.strictEqual(executeSpy.callCount, 4);
});
Expand Down