Skip to content

Commit

Permalink
Revert "Update axe-core to v3.3.2"
Browse files Browse the repository at this point in the history
This reverts commit 0f435b6.

Reason for revert: https://ci.chromium.org/p/chromium/builders/ci/Deterministic%20Linux/24718

Original change's description:
> Update axe-core to v3.3.2
> 
> This change updates the version of axe-core to the latest released
> version. As part of picking up the latest version, the following
> additional changes were made:
> 
> 1) axe-core removed the 'href-no-hash' rule, so that been removed
>    from the test list.
> 
> 2) Several 'link-in-text-block' tests started failing with
>    axe-core v3.0.2 (and later). These tests do pass in v3.0.1, but
>    are disabled as part of this change.
>      - CrManagementA11yTest.SimpleTest_link_in_text_block
>      - CrManagementA11yTestWithExtension.
>                                 ExtensionSection_link_in_text_block
>      - CrostiniAccessibilityTest.CROSTINI_link_in_text_block
>      - CrExtensionsA11yTest.NoExtensions_link_in_text_block
>      - MultideviceA11yTest.MULTIDEVICE_link_in_text_block
>      - MultideviceFeaturesA11yTest.
>               MULTIDEVICE_FEATURES_ACCESSIBILITY_link_in_text_block
> 
> 3) One 'heading-order' test started failing in v3.0.0 (and later).
>    This tests does pass in V2.4.2, but is disabled as part of this
>    change.
>      - CrExtensionsA11yTestWithMultipleExensions.
>                                        WithExtensions_heading_order
> 
> I spent some time investigating the test failures, and it looks
> like axe-core is highlighting legitimate product issues.
> 
> Change-Id: I99c1f85087aea873e29b413dca967864fc93c786
> Bug: 984817
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790125
> Reviewed-by: Hector Carmona <hcarmona@chromium.org>
> Reviewed-by: Alice Boxhall <aboxhall@chromium.org>
> Commit-Queue: Mike Jackson <mjackson@microsoft.com>
> Cr-Commit-Position: refs/heads/master@{#695885}

TBR=aboxhall@chromium.org,hcarmona@chromium.org,mjackson@microsoft.com

Change-Id: Icd7234920d116eb88ccab6eacbb298a0c8eeab2f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 984817
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1798076
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695928}
  • Loading branch information
Takuto Ikuta authored and Commit Bot committed Sep 12, 2019
1 parent bd33cf0 commit 986dc59
Show file tree
Hide file tree
Showing 12 changed files with 3,181 additions and 10,081 deletions.
2 changes: 0 additions & 2 deletions chrome/test/data/webui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ js2gtest("browser_tests_js_webui") {
"webui_resource_async_browsertest.js",
]

gen_include_files = [ "a11y/accessibility_audit_rules.js" ]

extra_js_files = [
"test_browser_proxy.js",
"settings/test_password_manager_proxy.js",
Expand Down
1 change: 1 addition & 0 deletions chrome/test/data/webui/a11y/accessibility_audit_rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ AccessibilityTest.ruleIds = [
'frame-title',
'heading-order',
'hidden-content',
'href-no-hash',
'html-has-lang',
'html-lang-valid',
'image-alt',
Expand Down
18 changes: 1 addition & 17 deletions chrome/test/data/webui/extensions/a11y/extensions_a11y_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,6 @@ var CrExtensionsA11yTest = class extends PolymerTest {
return parentNode && parentNode.host &&
parentNode.host.tagName == 'CR-TOGGLE';
},

// TODO(crbug.com/1002620): this filter can be removed after
// addressing the bug
'heading-order': function(nodeResult) {
// Filter out 'Heading levels do not increase by one' error when
// enumerating extensions
const expectedMarkup = '<div id="name" role="heading" aria-level="3" \
class="clippable-flex-text">My extension 1</div>';
return nodeResult['html'] === expectedMarkup;
},
};
}

Expand Down Expand Up @@ -95,13 +85,7 @@ AccessibilityTest.define('CrExtensionsA11yTest', {
name: 'NoExtensions',

/** @override */
// TODO(crbug.com/1002627): when bug is addressed, this should be replaced
// with axeOptions: CrExtensionsA11yTest.axeOptions,
axeOptions: Object.assign({}, CrExtensionsA11yTest.axeOptions, {
'rules': Object.assign({}, CrExtensionsA11yTest.axeOptions.rules, {
'link-in-text-block': {enabled: false},
})
}),
axeOptions: CrExtensionsA11yTest.axeOptions,

/** @override */
violationFilter: CrExtensionsA11yTest.violationFilter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ var CrManagementA11yTest = class extends PolymerTest {
'skip-link': {enabled: false},
// TODO(crbug.com/761461): enable after addressing flaky tests.
'color-contrast': {enabled: false},
// TODO(crbug.com/1002623): remove this line after addressing bug
'link-in-text-block': {enabled: false},
},
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ AccessibilityTest.define('CrostiniAccessibilityTest', {
/** @override */
name: 'CROSTINI',
/** @override */
axeOptions: SettingsAccessibilityTest.axeOptionsExcludeLinkInTextBlock,
axeOptions: SettingsAccessibilityTest.axeOptions,
/** @override */
setup: function() {
settings.router.navigateTo(settings.routes.CROSTINI);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AccessibilityTest.define('MultideviceA11yTest', {
/** @override */
name: 'MULTIDEVICE',
/** @override */
axeOptions: SettingsAccessibilityTest.axeOptionsExcludeLinkInTextBlock,
axeOptions: SettingsAccessibilityTest.axeOptions,
/** @override */
setup: function() {
settings.router.navigateTo(settings.routes.MULTIDEVICE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AccessibilityTest.define('MultideviceFeaturesA11yTest', {
/** @override */
name: 'MULTIDEVICE_FEATURES_ACCESSIBILITY',
/** @override */
axeOptions: SettingsAccessibilityTest.axeOptionsExcludeLinkInTextBlock,
axeOptions: SettingsAccessibilityTest.axeOptions,
/** @override */
setup: function() {
settings.router.navigateTo(settings.routes.MULTIDEVICE_FEATURES);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@ SettingsAccessibilityTest.axeOptions = {
}
};

// TODO(crbug.com/1002627): This block prevents generation of a
// link-in-text-block browser-test. This can be removed once the bug is
// addressed, and usage should be replaced with
// SettingsAccessibilityTest.axeOptions
SettingsAccessibilityTest.axeOptionsExcludeLinkInTextBlock =
Object.assign({}, SettingsAccessibilityTest.axeOptions, {
'rules': Object.assign({}, SettingsAccessibilityTest.axeOptions.rules, {
'link-in-text-block': {enabled: false},
})
});

// Default accessibility audit options. Specify in test definition to use.
SettingsAccessibilityTest.violationFilter = {
// Polymer components use aria-active-attribute.
Expand Down
6 changes: 3 additions & 3 deletions third_party/axe-core/README.chromium
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Name: AXE-CORE Accessibility Audit
Short Name: axe-core
URL: https://github.com/dequelabs/axe-core/
Version: 3.3.2
Date: Thur Aug 22 12:45:00 2019
Revision: 281653df3794f429b71327fe3afa37ca0fadb1c7
Version: 0
Date: Mon Jul 24 12:17:05 2017
Revision: d02dba3223fefe525438330e40b5da5de81eeeb5
License: MPL 2.0
License File: LICENSE
Security Critical: no
Expand Down
Loading

0 comments on commit 986dc59

Please sign in to comment.