Commit e74e634d authored by Luciano Pacheco's avatar Luciano Pacheco Committed by Chromium LUCI CQ

Files app: Enable tests to run as JS modules

Enable all integration tests to run as JS modules.

I have hand selected some tests to continue to run as non-js-modules to
have some coverage in case we need to flip back to it.

Bug: 1133186
Change-Id: Iddb5b65bd82c62a5288e856bdd0ff5587f80ac24
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2641688Reviewed-by: default avatarJeremie Boulic <jboulic@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Jeremie Boulic <jboulic@chromium.org>
Auto-Submit: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845552}
parent 1d0bc611
...@@ -740,6 +740,7 @@ std::ostream& operator<<(std::ostream& out, ...@@ -740,6 +740,7 @@ std::ostream& operator<<(std::ostream& out,
PRINT_IF_NOT_DEFAULT(tablet_mode) PRINT_IF_NOT_DEFAULT(tablet_mode)
PRINT_IF_NOT_DEFAULT(zip) PRINT_IF_NOT_DEFAULT(zip)
PRINT_IF_NOT_DEFAULT(zip_no_nacl) PRINT_IF_NOT_DEFAULT(zip_no_nacl)
PRINT_IF_NOT_DEFAULT(enable_js_modules)
#undef PRINT_IF_NOT_DEFAULT #undef PRINT_IF_NOT_DEFAULT
...@@ -1715,6 +1716,12 @@ void FileManagerBrowserTestBase::SetUpCommandLine( ...@@ -1715,6 +1716,12 @@ void FileManagerBrowserTestBase::SetUpCommandLine(
disabled_features.push_back(ash::features::kTemporaryHoldingSpace); disabled_features.push_back(ash::features::kTemporaryHoldingSpace);
} }
if (options.enable_js_modules) {
enabled_features.push_back(chromeos::features::kFilesJsModules);
} else {
disabled_features.push_back(chromeos::features::kFilesJsModules);
}
if (command_line->HasSwitch("devtools-code-coverage") && if (command_line->HasSwitch("devtools-code-coverage") &&
options.guest_mode != IN_INCOGNITO) { options.guest_mode != IN_INCOGNITO) {
devtools_code_coverage_dir_ = devtools_code_coverage_dir_ =
......
...@@ -111,6 +111,9 @@ class FileManagerBrowserTestBase : public content::DevToolsAgentHostObserver, ...@@ -111,6 +111,9 @@ class FileManagerBrowserTestBase : public content::DevToolsAgentHostObserver,
// Whether test should enable holding space. // Whether test should enable holding space.
bool enable_holding_space = false; bool enable_holding_space = false;
// Whether test should run Files app UI as JS modules.
bool enable_js_modules = true;
}; };
protected: protected:
......
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