diff --git a/.pullapprove.yml b/.pullapprove.yml index 8477de32ec..e81307c268 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -978,26 +978,6 @@ groups: - ~framework-global-approvers - # ========================================================= - # Material CI - # ========================================================= - material-ci: - conditions: - - > - contains_any_globs(files, [ - 'tools/components-repo-ci/**' - ]) - reviewers: - users: - - alxhub - - AndrewKushnir - - kara - - mhevery - - pkozlowski-opensource - teams: - - ~framework-global-approvers - - # ========================================================= # Public API # ========================================================= diff --git a/scripts/ci/run_angular_components_unit_tests.sh b/scripts/ci/run_angular_components_unit_tests.sh index 8c2691acc6..e71c0caeba 100755 --- a/scripts/ci/run_angular_components_unit_tests.sh +++ b/scripts/ci/run_angular_components_unit_tests.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash set -u -e -o pipefail -# Script that runs all unit tests of the `angular/components` repository. The script also -# sets up the test blocklist from `tools/components-repo-ci`. +# Script that runs all unit tests of the `angular/components` repository. # Path to the Angular project. angular_dir=$(pwd) @@ -11,10 +10,6 @@ angular_dir=$(pwd) # repository has been cloned into. cd ${COMPONENTS_REPO_TMP_DIR} -# Copy the test blocklist into the `angular/components` repository. The unit tests will -# automatically pick up the blocklist and disable the specified tests. -cp ${angular_dir}/tools/components-repo-ci/test-blocklist.ts ${COMPONENTS_REPO_TMP_DIR}/test/ - # Create a symlink for the Bazel binary installed through NPM, as running through Yarn introduces OOM errors. ./scripts/circleci/setup_bazel_binary.sh diff --git a/tools/components-repo-ci/instructions.md b/tools/components-repo-ci/instructions.md deleted file mode 100644 index 0f04f096d5..0000000000 --- a/tools/components-repo-ci/instructions.md +++ /dev/null @@ -1,32 +0,0 @@ -### Unit tests for `angular/components` - -Currently, all changes to Ivy are validated against the test suite of the -`angular/components` repository. Known failing tests are skipped based on -the blocklist in `tools/components-repo-ci/test-blocklist.ts`. - -Whenever the root cause of a known failure is identified, the `notes` field -for the corresponding tests should be updated. Whenever a failure is resolved, -the corresponding tests should be removed from the blocklist. - -### Debugging - -Information on debugging can be found [here](../../docs/DEBUG_COMPONENTS_REPO_IVY.md). - -### Excluding new tests - -In case there are any tests in the components test suite that fail due to -recent changes in the framework and you want to exclude the tests temporarily, -a new entry can be added to the `test-blocklist.ts` file. - -Each property in the blocklist object corresponds to a test in the components -repository. The name of the property **must** match the exact test name. Additionally -it's **recommended** that every entry has a field with a note on why the test is disabled. - -```ts -export const testBlocklist: any = { - 'MatSlider should be able to drag thumb': { - error: 'Cannot register event "dragstart".', - notes: 'Breaking change where HammerJS module needs to be imported.' - } -} -``` \ No newline at end of file diff --git a/tools/components-repo-ci/test-blocklist.ts b/tools/components-repo-ci/test-blocklist.ts deleted file mode 100644 index 84540fb3a4..0000000000 --- a/tools/components-repo-ci/test-blocklist.ts +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @license - * Copyright Google Inc. 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.io/license - */ - -// clang-format off -// tslint:disable - -interface BlocklistEntry { - /** Description on why the given test is disabled. */ - notes: string; - /** Optional error that has been thrown in the test. */ - error?: string; -} - -/** - * List of tests that should not run in the Angular component test suites. This should - * be empty in the components repository, but the file will be overwritten if the framework - * repository runs the Angular component test suites against the latest snapshots. This is - * helpful because sometimes breaking changes that break individual tests land in the framework - * repository. It should be possible to disable these tests until the component repository - * migrated the broken tests. - */ -export const testBlocklist: {[testName: string]: BlocklistEntry} = {}; - -// clang-format on