Commit e4e173c8 authored by Toni Barzic's avatar Toni Barzic Committed by Commit Bot

Welcome screen - missing a11y toggle tests

Added test for enabling and  disabling virtual keyboard and docked
magnifier accessibility features.

BUG=953020

Change-Id: I380baa5ee34bdb3b006751d13e0566470b2f5dcc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1607132Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Commit-Queue: Toni Baržić <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659312}
parent a510e88b
......@@ -15,6 +15,7 @@
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
#include "chrome/browser/ui/webui/chromeos/login/welcome_screen_handler.h"
#include "chromeos/dbus/constants/dbus_switches.h"
#include "ui/accessibility/accessibility_switches.h"
namespace chromeos {
......@@ -96,13 +97,27 @@ class WelcomeScreenSystemDevModeBrowserTest : public WelcomeScreenBrowserTest {
WelcomeScreenSystemDevModeBrowserTest() = default;
~WelcomeScreenSystemDevModeBrowserTest() override = default;
// InProcessBrowserTest:
// WelcomeScreenBrowserTest:
void SetUpCommandLine(base::CommandLine* command_line) override {
WelcomeScreenBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(chromeos::switches::kSystemDevMode);
}
};
class WelcomeScreenWithExperimentalAccessibilityFeaturesTest
: public WelcomeScreenBrowserTest {
public:
WelcomeScreenWithExperimentalAccessibilityFeaturesTest() = default;
~WelcomeScreenWithExperimentalAccessibilityFeaturesTest() override = default;
// WelcomeScreenBrowserTest:
void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(
::switches::kEnableExperimentalAccessibilityFeatures);
WelcomeScreenBrowserTest::SetUpCommandLine(command_line);
}
};
IN_PROC_BROWSER_TEST_F(WelcomeScreenBrowserTest, WelcomeScreenElements) {
welcome_screen_->Show();
OobeScreenWaiter(WelcomeView::kScreenId).Wait();
......@@ -294,6 +309,41 @@ IN_PROC_BROWSER_TEST_F(WelcomeScreenBrowserTest,
ASSERT_FALSE(MagnificationManager::Get()->IsMagnifierEnabled());
}
IN_PROC_BROWSER_TEST_F(WelcomeScreenBrowserTest, A11yDockedMagnifierDisabled) {
welcome_screen_->Show();
OobeScreenWaiter(WelcomeView::kScreenId).Wait();
test::OobeJS().ExpectHiddenPath({"connect", "dockedMagnifierOobeOption"});
}
IN_PROC_BROWSER_TEST_F(WelcomeScreenWithExperimentalAccessibilityFeaturesTest,
A11yDockedMagnifierEnabled) {
welcome_screen_->Show();
OobeScreenWaiter(WelcomeView::kScreenId).Wait();
test::OobeJS().TapOnPath(
{"connect", "welcomeScreen", "accessibilitySettingsButton"});
ASSERT_FALSE(MagnificationManager::Get()->IsDockedMagnifierEnabled());
ToggleAccessibilityFeature("dockedMagnifierOobeOption", true);
ASSERT_TRUE(MagnificationManager::Get()->IsDockedMagnifierEnabled());
ToggleAccessibilityFeature("dockedMagnifierOobeOption", false);
ASSERT_FALSE(MagnificationManager::Get()->IsDockedMagnifierEnabled());
}
IN_PROC_BROWSER_TEST_F(WelcomeScreenBrowserTest, A11yVirtualKeyboard) {
welcome_screen_->Show();
OobeScreenWaiter(WelcomeView::kScreenId).Wait();
test::OobeJS().TapOnPath(
{"connect", "welcomeScreen", "accessibilitySettingsButton"});
ASSERT_FALSE(AccessibilityManager::Get()->IsVirtualKeyboardEnabled());
ToggleAccessibilityFeature("accessibility-virtual-keyboard", true);
ASSERT_TRUE(AccessibilityManager::Get()->IsVirtualKeyboardEnabled());
ToggleAccessibilityFeature("accessibility-virtual-keyboard", false);
ASSERT_FALSE(AccessibilityManager::Get()->IsVirtualKeyboardEnabled());
}
IN_PROC_BROWSER_TEST_F(WelcomeScreenSystemDevModeBrowserTest,
DebuggerModeTest) {
welcome_screen_->Show();
......
......@@ -200,8 +200,7 @@
[[i18nDynamic(locale, 'a11ySettingToggleOptionOff')]]
</span>
</oobe-a11y-option>
<oobe-a11y-option id="accessibility-screen-docked-magnifier"
checked="[[a11yStatus.dockedMagnifierEnabled]]"
<oobe-a11y-option checked="[[a11yStatus.dockedMagnifierEnabled]]"
on-change="onA11yOptionChanged_"
chrome-message="enableDockedMagnifier"
label-for-aria="[[i18nDynamic(locale, 'dockedMagnifierOption')]]"
......@@ -217,7 +216,8 @@
[[i18nDynamic(locale, 'a11ySettingToggleOptionOff')]]
</span>
</oobe-a11y-option>
<oobe-a11y-option checked="[[a11yStatus.virtualKeyboardEnabled]]"
<oobe-a11y-option id="accessibility-virtual-keyboard"
checked="[[a11yStatus.virtualKeyboardEnabled]]"
on-change="onA11yOptionChanged_"
chrome-message="enableVirtualKeyboard"
label-for-aria="[[i18nDynamic(locale, 'virtualKeyboardOption')]]">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment