Commit d045d83b authored by James Cook's avatar James Cook Committed by Commit Bot

Use 'var' instead of implicit globals for JS tests using TEST_F

TEST_F('FooTest', ...) requires 'FooTest' to be a variable on the
global object. Instead of using implicit globals, use 'var' and
explicitly suppress the presubmit eslint check that bans 'var'.

Note that accessibility tests are also declared with 'var' because
the AccessibilityTest base class uses TEST_F internally.

Bug: none
Change-Id: Id299de761a47506664e6d4650b5c5a079531f8f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1638738
Commit-Queue: James Cook <jamescook@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665281}
parent 14938294
...@@ -594,7 +594,8 @@ GEN('#endif'); ...@@ -594,7 +594,8 @@ GEN('#endif');
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// View Manager Tests // View Manager Tests
CrElementsViewManagerTest = class extends CrElementsBrowserTest { // eslint-disable-next-line no-var
var CrElementsViewManagerTest = class extends CrElementsBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://resources/cr_elements/cr_view_manager/cr_view_manager.html'; return 'chrome://resources/cr_elements/cr_view_manager/cr_view_manager.html';
......
...@@ -15,7 +15,8 @@ GEN('#include "chrome/browser/ui/webui/extensions/' + ...@@ -15,7 +15,8 @@ GEN('#include "chrome/browser/ui/webui/extensions/' +
* @constructor * @constructor
* @extends {PolymerTest} * @extends {PolymerTest}
*/ */
CrExtensionsA11yTest = class extends PolymerTest { // eslint-disable-next-line no-var
var CrExtensionsA11yTest = class extends PolymerTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://extensions/'; return 'chrome://extensions/';
......
...@@ -36,7 +36,8 @@ const CrExtensionsInteractiveUITest = class extends PolymerInteractiveUITest { ...@@ -36,7 +36,8 @@ const CrExtensionsInteractiveUITest = class extends PolymerInteractiveUITest {
/** Test fixture for Sync Page. */ /** Test fixture for Sync Page. */
CrExtensionsOptionsPageTest = class extends CrExtensionsInteractiveUITest { // eslint-disable-next-line no-var
var CrExtensionsOptionsPageTest = class extends CrExtensionsInteractiveUITest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://extensions/?id=ibbpngabdmdpednkhonkkobdeccpkiff'; return 'chrome://extensions/?id=ibbpngabdmdpednkhonkkobdeccpkiff';
......
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
module.exports = {
'rules': {
'no-var': 'error',
},
};
...@@ -15,7 +15,8 @@ GEN('#include "chrome/browser/ui/webui/management_a11y_browsertest.h"'); ...@@ -15,7 +15,8 @@ GEN('#include "chrome/browser/ui/webui/management_a11y_browsertest.h"');
* @constructor * @constructor
* @extends {PolymerTest} * @extends {PolymerTest}
*/ */
CrManagementA11yTest = class extends PolymerTest { // eslint-disable-next-line no-var
var CrManagementA11yTest = class extends PolymerTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://management/'; return 'chrome://management/';
......
...@@ -45,7 +45,8 @@ const PrintPreviewInteractiveUITest = class extends PolymerInteractiveUITest { ...@@ -45,7 +45,8 @@ const PrintPreviewInteractiveUITest = class extends PolymerInteractiveUITest {
} }
}; };
PrintPreviewPrintHeaderInteractiveTest = // eslint-disable-next-line no-var
var PrintPreviewPrintHeaderInteractiveTest =
class extends PrintPreviewInteractiveUITest { class extends PrintPreviewInteractiveUITest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
...@@ -72,7 +73,8 @@ TEST_F( ...@@ -72,7 +73,8 @@ TEST_F(
print_header_interactive_test.TestNames.FocusPrintOnReady); print_header_interactive_test.TestNames.FocusPrintOnReady);
}); });
PrintPreviewButtonStripInteractiveTest = // eslint-disable-next-line no-var
var PrintPreviewButtonStripInteractiveTest =
class extends PrintPreviewInteractiveUITest { class extends PrintPreviewInteractiveUITest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
...@@ -106,7 +108,8 @@ TEST_F( ...@@ -106,7 +108,8 @@ TEST_F(
button_strip_interactive_test.TestNames.FocusPrintOnReady); button_strip_interactive_test.TestNames.FocusPrintOnReady);
}); });
PrintPreviewDestinationDialogInteractiveTest = // eslint-disable-next-line no-var
var PrintPreviewDestinationDialogInteractiveTest =
class extends PrintPreviewInteractiveUITest { class extends PrintPreviewInteractiveUITest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
...@@ -145,7 +148,9 @@ TEST_F( ...@@ -145,7 +148,9 @@ TEST_F(
destination_dialog_interactive_test.TestNames.EscapeSearchBox); destination_dialog_interactive_test.TestNames.EscapeSearchBox);
}); });
PrintPreviewPagesSettingsTest = class extends PrintPreviewInteractiveUITest { // eslint-disable-next-line no-var
var PrintPreviewPagesSettingsTest =
class extends PrintPreviewInteractiveUITest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://print/ui/pages_settings.html'; return 'chrome://print/ui/pages_settings.html';
...@@ -183,7 +188,8 @@ TEST_F( ...@@ -183,7 +188,8 @@ TEST_F(
pages_settings_test.TestNames.EnterOnInputTriggersPrint); pages_settings_test.TestNames.EnterOnInputTriggersPrint);
}); });
PrintPreviewNumberSettingsSectionInteractiveTest = // eslint-disable-next-line no-var
var PrintPreviewNumberSettingsSectionInteractiveTest =
class extends PrintPreviewInteractiveUITest { class extends PrintPreviewInteractiveUITest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
...@@ -212,7 +218,8 @@ TEST_F( ...@@ -212,7 +218,8 @@ TEST_F(
.BlurResetsEmptyInput); .BlurResetsEmptyInput);
}); });
PrintPreviewScalingSettingsInteractiveTest = // eslint-disable-next-line no-var
var PrintPreviewScalingSettingsInteractiveTest =
class extends PrintPreviewInteractiveUITest { class extends PrintPreviewInteractiveUITest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
......
...@@ -12,7 +12,8 @@ GEN_INCLUDE([ ...@@ -12,7 +12,8 @@ GEN_INCLUDE([
'settings_accessibility_test.js', 'settings_accessibility_test.js',
]); ]);
TtsAccessibilityTest = class extends SettingsAccessibilityTest { // eslint-disable-next-line no-var
var TtsAccessibilityTest = class extends SettingsAccessibilityTest {
/** @override */ /** @override */
get commandLineSwitches() { get commandLineSwitches() {
return ['enable-experimental-a11y-features']; return ['enable-experimental-a11y-features'];
......
...@@ -42,7 +42,8 @@ const OSSettingsBrowserTest = class extends PolymerTest { ...@@ -42,7 +42,8 @@ const OSSettingsBrowserTest = class extends PolymerTest {
}; };
// Test fixture for the Smb Shares page. // Test fixture for the Smb Shares page.
OSSettingsSmbPageTest = class extends OSSettingsBrowserTest { // eslint-disable-next-line no-var
var OSSettingsSmbPageTest = class extends OSSettingsBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return super.browsePreload + 'os_downloads_page/smb_shares_page.html'; return super.browsePreload + 'os_downloads_page/smb_shares_page.html';
......
...@@ -10,7 +10,8 @@ GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']); ...@@ -10,7 +10,8 @@ GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
GEN('#include "chromeos/constants/chromeos_features.h"'); GEN('#include "chromeos/constants/chromeos_features.h"');
// Test fixture for the top-level OS settings UI. // Test fixture for the top-level OS settings UI.
OSSettingsUIBrowserTest = class extends PolymerTest { // eslint-disable-next-line no-var
var OSSettingsUIBrowserTest = class extends PolymerTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://os-settings/'; return 'chrome://os-settings/';
......
...@@ -2557,7 +2557,8 @@ TEST_F('CrSettingsAddUsersTest', 'DISABLED_All', function() { ...@@ -2557,7 +2557,8 @@ TEST_F('CrSettingsAddUsersTest', 'DISABLED_All', function() {
mocha.run(); mocha.run();
}); });
CrSettingsSplitSettingsFlagTest = class extends CrSettingsBrowserTest { // eslint-disable-next-line no-var
var CrSettingsSplitSettingsFlagTest = class extends CrSettingsBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://settings/basic_page/basic_page.html'; return 'chrome://settings/basic_page/basic_page.html';
......
...@@ -14,7 +14,7 @@ GEN('#include "chrome/test/data/webui/signin_browsertest.h"'); ...@@ -14,7 +14,7 @@ GEN('#include "chrome/test/data/webui/signin_browsertest.h"');
* chrome/browser/resources/signin/dice_sync_confirmation/sync_confirmation.html. * chrome/browser/resources/signin/dice_sync_confirmation/sync_confirmation.html.
* This has to be declared as a variable for TEST_F to find it correctly. * This has to be declared as a variable for TEST_F to find it correctly.
*/ */
var SigninSyncConfirmationTest = class extends PolymerTest { SigninSyncConfirmationTest = class extends PolymerTest {
/** @override */ /** @override */
get typedefCppFixture() { get typedefCppFixture() {
return 'SigninBrowserTest'; return 'SigninBrowserTest';
......
...@@ -30,7 +30,9 @@ const OnboardingWelcomeBrowserTest = class extends PolymerTest { ...@@ -30,7 +30,9 @@ const OnboardingWelcomeBrowserTest = class extends PolymerTest {
} }
}; };
OnboardingWelcomeAppChooserTest = class extends OnboardingWelcomeBrowserTest { // eslint-disable-next-line no-var
var OnboardingWelcomeAppChooserTest =
class extends OnboardingWelcomeBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://welcome/google_apps/nux_google_apps.html'; return 'chrome://welcome/google_apps/nux_google_apps.html';
...@@ -51,7 +53,9 @@ TEST_F('OnboardingWelcomeAppChooserTest', 'All', function() { ...@@ -51,7 +53,9 @@ TEST_F('OnboardingWelcomeAppChooserTest', 'All', function() {
mocha.run(); mocha.run();
}); });
OnboardingWelcomeWelcomeAppTest = class extends OnboardingWelcomeBrowserTest { // eslint-disable-next-line no-var
var OnboardingWelcomeWelcomeAppTest =
class extends OnboardingWelcomeBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://welcome/welcome_app.html'; return 'chrome://welcome/welcome_app.html';
...@@ -73,7 +77,9 @@ TEST_F('OnboardingWelcomeWelcomeAppTest', 'All', function() { ...@@ -73,7 +77,9 @@ TEST_F('OnboardingWelcomeWelcomeAppTest', 'All', function() {
mocha.run(); mocha.run();
}); });
OnboardingWelcomeSigninViewTest = class extends OnboardingWelcomeBrowserTest { // eslint-disable-next-line no-var
var OnboardingWelcomeSigninViewTest =
class extends OnboardingWelcomeBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://welcome/signin_view.html'; return 'chrome://welcome/signin_view.html';
...@@ -92,7 +98,8 @@ TEST_F('OnboardingWelcomeSigninViewTest', 'All', function() { ...@@ -92,7 +98,8 @@ TEST_F('OnboardingWelcomeSigninViewTest', 'All', function() {
mocha.run(); mocha.run();
}); });
OnboardingWelcomeNavigationBehaviorTest = // eslint-disable-next-line no-var
var OnboardingWelcomeNavigationBehaviorTest =
class extends OnboardingWelcomeBrowserTest { class extends OnboardingWelcomeBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
...@@ -112,7 +119,8 @@ TEST_F('OnboardingWelcomeNavigationBehaviorTest', 'All', function() { ...@@ -112,7 +119,8 @@ TEST_F('OnboardingWelcomeNavigationBehaviorTest', 'All', function() {
mocha.run(); mocha.run();
}); });
OnboardingWelcomeModuleMetricsTest = // eslint-disable-next-line no-var
var OnboardingWelcomeModuleMetricsTest =
class extends OnboardingWelcomeBrowserTest { class extends OnboardingWelcomeBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
...@@ -132,7 +140,9 @@ TEST_F('OnboardingWelcomeModuleMetricsTest', 'All', function() { ...@@ -132,7 +140,9 @@ TEST_F('OnboardingWelcomeModuleMetricsTest', 'All', function() {
mocha.run(); mocha.run();
}); });
OnboardingWelcomeSetAsDefaultTest = class extends OnboardingWelcomeBrowserTest { // eslint-disable-next-line no-var
var OnboardingWelcomeSetAsDefaultTest =
class extends OnboardingWelcomeBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://welcome/set_as_default/nux_set_as_default.html'; return 'chrome://welcome/set_as_default/nux_set_as_default.html';
...@@ -152,7 +162,8 @@ TEST_F('OnboardingWelcomeSetAsDefaultTest', 'All', function() { ...@@ -152,7 +162,8 @@ TEST_F('OnboardingWelcomeSetAsDefaultTest', 'All', function() {
mocha.run(); mocha.run();
}); });
OnboardingWelcomeNtpBackgroundTest = // eslint-disable-next-line no-var
var OnboardingWelcomeNtpBackgroundTest =
class extends OnboardingWelcomeBrowserTest { class extends OnboardingWelcomeBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
......
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