mirror of
https://github.com/angular/angular.git
synced 2026-09-14 13:54:52 +08:00
build: remove rules_nodejs based protractor tooling (#62649)
Remove the protractor setup based on rules_nodejs PR Close #62649
This commit is contained in:
Joey Perrott
committed by
Kirill Cherkashin
Kirill Cherkashin
parent
b5486184d0
commit
e25e6342f2
@@ -89,7 +89,6 @@ yarn_install(
|
||||
"//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch",
|
||||
"//tools/esm-interop:patches/npm/@bazel+concatjs+5.8.1.patch",
|
||||
"//tools/esm-interop:patches/npm/@bazel+esbuild+5.7.1.patch",
|
||||
"//tools/esm-interop:patches/npm/@bazel+protractor+5.7.1.patch",
|
||||
"//tools/esm-interop:patches/npm/rxjs+6.6.7.patch",
|
||||
],
|
||||
# Currently disabled due to:
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google LLC All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.dev/license
|
||||
*/
|
||||
|
||||
const protractorUtils = require('@bazel/protractor/protractor-utils');
|
||||
const protractor = require('protractor');
|
||||
|
||||
module.exports = async function (config) {
|
||||
const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []);
|
||||
const serverUrl = `http://localhost:${port}`;
|
||||
|
||||
protractor.browser.baseUrl = serverUrl;
|
||||
};
|
||||
@@ -1,21 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google LLC All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.dev/license
|
||||
*/
|
||||
|
||||
const protractorUtils = require('@bazel/protractor/protractor-utils');
|
||||
const protractor = require('protractor');
|
||||
|
||||
/**
|
||||
* Helper function to start up a server for testing using Protractor utils.
|
||||
* Used as a part of the `protractor_web_test_suite` rule configuration.
|
||||
*/
|
||||
module.exports = async function (config) {
|
||||
const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []);
|
||||
const serverUrl = `http://localhost:${port}`;
|
||||
|
||||
protractor.browser.baseUrl = serverUrl;
|
||||
};
|
||||
@@ -1,17 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google LLC All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.dev/license
|
||||
*/
|
||||
|
||||
const protractorUtils = require('@bazel/protractor/protractor-utils');
|
||||
const protractor = require('protractor');
|
||||
|
||||
module.exports = async function (config) {
|
||||
const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []);
|
||||
const serverUrl = `http://localhost:${port}`;
|
||||
|
||||
protractor.browser.baseUrl = serverUrl;
|
||||
};
|
||||
@@ -1,17 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google LLC All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.dev/license
|
||||
*/
|
||||
|
||||
const protractorUtils = require('@bazel/protractor/protractor-utils');
|
||||
const protractor = require('protractor');
|
||||
|
||||
module.exports = async function (config) {
|
||||
const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []);
|
||||
const serverUrl = `http://localhost:${port}`;
|
||||
|
||||
protractor.browser.baseUrl = serverUrl;
|
||||
};
|
||||
@@ -1,17 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google LLC All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.dev/license
|
||||
*/
|
||||
|
||||
const protractorUtils = require('@bazel/protractor/protractor-utils');
|
||||
const protractor = require('protractor');
|
||||
|
||||
module.exports = async function (config) {
|
||||
const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []);
|
||||
const serverUrl = `http://localhost:${port}`;
|
||||
|
||||
protractor.browser.baseUrl = serverUrl;
|
||||
};
|
||||
@@ -1,17 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google LLC All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.dev/license
|
||||
*/
|
||||
|
||||
const protractorUtils = require('@bazel/protractor/protractor-utils');
|
||||
const protractor = require('protractor');
|
||||
|
||||
module.exports = async function (config) {
|
||||
const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []);
|
||||
const serverUrl = `http://localhost:${port}`;
|
||||
|
||||
protractor.browser.baseUrl = serverUrl;
|
||||
};
|
||||
@@ -1,17 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google LLC All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.dev/license
|
||||
*/
|
||||
|
||||
const protractorUtils = require('@bazel/protractor/protractor-utils');
|
||||
const protractor = require('protractor');
|
||||
|
||||
module.exports = async function (config) {
|
||||
const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []);
|
||||
const serverUrl = `http://localhost:${port}`;
|
||||
|
||||
protractor.browser.baseUrl = serverUrl;
|
||||
};
|
||||
@@ -1,17 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google LLC All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.dev/license
|
||||
*/
|
||||
|
||||
const protractorUtils = require('@bazel/protractor/protractor-utils');
|
||||
const protractor = require('protractor');
|
||||
|
||||
module.exports = async function (config) {
|
||||
const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []);
|
||||
const serverUrl = `http://localhost:${port}`;
|
||||
|
||||
protractor.browser.baseUrl = serverUrl;
|
||||
};
|
||||
@@ -9,7 +9,6 @@ load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", _api_golden_test
|
||||
load("@npm//@angular/build-tooling/bazel/spec-bundling:index.bzl", "spec_bundle")
|
||||
load("@npm//@bazel/concatjs:index.bzl", _ts_config = "ts_config", _ts_library = "ts_library")
|
||||
load("@npm//@bazel/jasmine:index.bzl", _jasmine_node_test = "jasmine_node_test")
|
||||
load("@npm//@bazel/protractor:index.bzl", _protractor_web_test_suite = "protractor_web_test_suite")
|
||||
load("@npm//@bazel/rollup:index.bzl", _rollup_bundle = "rollup_bundle")
|
||||
load("@npm//@bazel/terser:index.bzl", "terser_minified")
|
||||
load("@npm//typescript:index.bzl", "tsc")
|
||||
@@ -157,27 +156,6 @@ def pkg_npm(name, deps = [], validate = True, **kwargs):
|
||||
visibility = visibility,
|
||||
)
|
||||
|
||||
def protractor_web_test_suite(
|
||||
name,
|
||||
deps = [],
|
||||
external = [],
|
||||
browsers = ["@npm//@angular/build-tooling/bazel/browsers/chromium:chromium"],
|
||||
**kwargs):
|
||||
"""Default values for protractor_web_test_suite"""
|
||||
spec_bundle(
|
||||
name = "%s_bundle" % name,
|
||||
deps = deps,
|
||||
platform = "cjs-legacy",
|
||||
external = external + ["protractor"],
|
||||
)
|
||||
|
||||
_protractor_web_test_suite(
|
||||
name = name,
|
||||
deps = [":%s_bundle" % name],
|
||||
browsers = browsers,
|
||||
**kwargs
|
||||
)
|
||||
|
||||
def nodejs_binary(
|
||||
name,
|
||||
templated_args = [],
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/node_modules/@bazel/protractor/protractor_web_test.bzl b/node_modules/@bazel/protractor/protractor_web_test.bzl
|
||||
index 77fcd99..8c65658 100755
|
||||
--- a/node_modules/@bazel/protractor/protractor_web_test.bzl
|
||||
+++ b/node_modules/@bazel/protractor/protractor_web_test.bzl
|
||||
@@ -14,7 +14,7 @@
|
||||
"Run end-to-end tests with Protractor"
|
||||
|
||||
load("@rules_nodejs//nodejs:providers.bzl", "JSModuleInfo")
|
||||
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
|
||||
+load("@angular//tools/esm-interop:index.bzl", "nodejs_binary")
|
||||
load("@build_bazel_rules_nodejs//:providers.bzl", "ExternalNpmPackageInfo", "JSNamedModuleInfo", "node_modules_aspect")
|
||||
load("@build_bazel_rules_nodejs//internal/common:windows_utils.bzl", "create_windows_native_launcher_script", "is_windows")
|
||||
load("@io_bazel_rules_webtesting//web:web.bzl", "web_test_suite")
|
||||
Reference in New Issue
Block a user