Skip to content

Commit 14222f4

Browse files
Liviu RauDevtools-frontend LUCI CQ
Liviu Rau
authored and
Devtools-frontend LUCI CQ
committed
[cleanup] Move resource folder to the non-hosted parent
Drive-by: fixed some round-about imports (see comment) Skip-Flake-Detection: test/e2e_non_hosted/application/manifest_test.ts Skip-Flake-Detection: test/e2e_non_hosted/console/command-line-api_test.ts Skip-Flake-Detection: test/e2e_non_hosted/console/console-errors_test.ts Skip-Flake-Detection: test/e2e_non_hosted/console/console-fetch-logging_test.ts Skip-Flake-Detection: test/e2e_non_hosted/console/console-filter_test.ts Skip-Flake-Detection: test/e2e_non_hosted/console/console-uncaught-promise_test.ts Skip-Flake-Detection: test/e2e_non_hosted/elements/adornment_test.ts Skip-Flake-Detection: test/e2e_non_hosted/elements/at-property-sections_test.ts Skip-Flake-Detection: test/e2e_non_hosted/extensions/debugger-language-plugins_test.ts Skip-Flake-Detection: test/e2e_non_hosted/issues/cookie-attribute-exceeds-max-size-issues_test.ts Skip-Flake-Detection: test/e2e_non_hosted/issues/quirks-mode-issues_test.ts Skip-Flake-Detection: test/e2e_non_hosted/layers/layers_test.ts Skip-Flake-Detection: test/e2e_non_hosted/network/network-conditions_test.ts Skip-Flake-Detection: test/e2e_non_hosted/network/network-datagrid_test.ts Skip-Flake-Detection: test/e2e_non_hosted/network/network-filter_test.ts Skip-Flake-Detection: test/e2e_non_hosted/network/network-request-view_test.ts Skip-Flake-Detection: test/e2e_non_hosted/network/network-search_test.ts Skip-Flake-Detection: test/e2e_non_hosted/performance/multiple-traces_test.ts Skip-Flake-Detection: test/e2e_non_hosted/performance/recording_test.ts Skip-Flake-Detection: test/e2e_non_hosted/performance/timeline/treeview_test.ts Skip-Flake-Detection: test/e2e_non_hosted/performance/wasm/performance_profiling_test.ts Skip-Flake-Detection: test/e2e_non_hosted/recorder/recorder_test.ts Skip-Flake-Detection: test/e2e_non_hosted/recorder/replay_test.ts Skip-Flake-Detection: test/e2e_non_hosted/recorder/ui_test.ts Skip-Flake-Detection: test/e2e_non_hosted/security/privacy_test.ts Skip-Flake-Detection: test/e2e_non_hosted/snippets/name_test.ts Skip-Flake-Detection: test/e2e_non_hosted/snippets/snippets_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/authored-deployed-grouping_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/breakpoint-javascript_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/breakpoints-sidebarpane_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/can-handle-special-characters_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/can-show-multiple-workers_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/debug-raw-wasm_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/header-overrides_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/icon-row-bucket_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/ignore-list_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/inline-breakpoint_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/inline-variable_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/navigator-view_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/script-in-multiple-workers_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/sources-list_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/sourceurl_test.ts Skip-Flake-Detection: test/e2e_non_hosted/sources/worker-relative-sourcemap_test.ts Bypass-Check-License: files moved Bug: 455490657 Change-Id: I0e8f8f3e8bfcb30e3d8432c81a0f5adad18ad050 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7168424 Reviewed-by: Simon Zünd <[email protected]> Auto-Submit: Liviu Rau <[email protected]> Commit-Queue: Simon Zünd <[email protected]>
1 parent df163f3 commit 14222f4

File tree

562 files changed

+237
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

562 files changed

+237
-279
lines changed

‎eslint.config.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default defineConfig([
6060
'scripts/protocol_typescript/*.js',
6161
'scripts/deps/tests/fixtures',
6262
'test/**/fixtures/',
63-
'test/e2e/**/*.js',
63+
'test/e2e_non_hosted/**/*.js',
6464
'test/shared/**/*.js',
6565
]),
6666
{

‎test/BUILD.gn‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ group("test") {
99
deps = [
1010
":run",
1111
":unittests",
12-
"e2e",
1312
"e2e_non_hosted",
1413
"perf",
1514
"shared",

‎test/e2e/BUILD.gn‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎test/e2e/mocharc.ts‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎test/e2e/tsconfig.json‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎test/e2e_non_hosted/BUILD.gn‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ group("e2e_non_hosted") {
99
deps = [
1010
":test_inputs",
1111
":tests",
12+
"resources",
1213
]
1314
}
1415

‎test/e2e/README.md‎ renamed to ‎test/e2e_non_hosted/README.md‎

File renamed without changes.

‎test/e2e_non_hosted/application/manifest_test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ describe('The Manifest Page', () => {
3636
assert.strictEqual(fieldNames[3], 'Computed App ID');
3737
assert.strictEqual(
3838
fieldValues[3],
39-
`https://localhost:${inspectedPage.serverPort}/test/e2e/resources/application/some_start_url` +
39+
`https://localhost:${inspectedPage.serverPort}/test/e2e_non_hosted/resources/application/some_start_url` +
4040
'Learn moreNote: id is not specified in the manifest, start_url is used instead. To specify an ' +
41-
'App ID that matches the current identity, set the id field to /test/e2e/resources/application/some_start_url .',
41+
'App ID that matches the current identity, set the id field to /test/e2e_non_hosted/resources/application/some_start_url .',
4242
);
4343
await devToolsPage.waitFor('button[title="Copy suggested ID to clipboard"]');
4444
});

‎test/e2e_non_hosted/console/command-line-api_test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import type {DevToolsPage} from '../../e2e_non_hosted/shared/frontend-helper.js';
6-
import type {InspectedPage} from '../../e2e_non_hosted/shared/target-helper.js';
75
import {
86
checkCommandResultFunction,
97
navigateToConsoleTab,
108
} from '../helpers/console-helpers.js';
9+
import type {DevToolsPage} from '../shared/frontend-helper.js';
10+
import type {InspectedPage} from '../shared/target-helper.js';
1111

1212
async function openConsoleOnTestPage(devToolsPage: DevToolsPage, inspectedPage: InspectedPage) {
1313
await inspectedPage.goToResource('../resources/console/command-line-api.html');

‎test/e2e_non_hosted/console/console-errors_test.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('The Console\'s errors', function() {
6666
assert.deepEqual(messages, [
6767
{
6868
message: `GET https://localhost:${
69-
inspectedPage.serverPort}/test/e2e/resources/console/non-existent-xhr 404 (Not Found)`,
69+
inspectedPage.serverPort}/test/e2e_non_hosted/resources/console/non-existent-xhr 404 (Not Found)`,
7070
messageClasses: 'console-message',
7171
repeatCount: null,
7272
source: 'resource-errors.html:20',
@@ -77,7 +77,7 @@ step2 @ resource-errors.html:12`,
7777
},
7878
{
7979
message: `GET https://localhost:${
80-
inspectedPage.serverPort}/test/e2e/resources/missing.css net::ERR_ABORTED 404 (Not Found)`,
80+
inspectedPage.serverPort}/test/e2e_non_hosted/resources/missing.css net::ERR_ABORTED 404 (Not Found)`,
8181
messageClasses: 'console-message',
8282
repeatCount: null,
8383
source: 'resource-errors-iframe.html:3',
@@ -86,7 +86,7 @@ step2 @ resource-errors.html:12`,
8686
},
8787
{
8888
message: `GET https://localhost:${
89-
inspectedPage.serverPort}/test/e2e/resources/non-existent-iframe.html 404 (Not Found)`,
89+
inspectedPage.serverPort}/test/e2e_non_hosted/resources/non-existent-iframe.html 404 (Not Found)`,
9090
messageClasses: 'console-message',
9191
repeatCount: null,
9292
source: 'resource-errors-iframe.html:8',
@@ -95,7 +95,8 @@ step2 @ resource-errors.html:12`,
9595
},
9696
{
9797
message: `GET https://localhost:${
98-
inspectedPage.serverPort}/test/e2e/resources/non-existent-script.js net::ERR_ABORTED 404 (Not Found)`,
98+
inspectedPage
99+
.serverPort}/test/e2e_non_hosted/resources/non-existent-script.js net::ERR_ABORTED 404 (Not Found)`,
99100
messageClasses: 'console-message',
100101
repeatCount: null,
101102
source: 'resource-errors-iframe.html:4',

0 commit comments

Comments
 (0)