diff --git a/packages/platform-browser/test/dom/events/event_manager_spec.ts b/packages/platform-browser/test/dom/events/event_manager_spec.ts
index b294e4e5c0..893e8c7ba3 100644
--- a/packages/platform-browser/test/dom/events/event_manager_spec.ts
+++ b/packages/platform-browser/test/dom/events/event_manager_spec.ts
@@ -296,7 +296,7 @@ import {el} from '../../../testing/src/browser_util';
expect(receivedEvents).toEqual([]);
});
- it('should run blackListedEvents handler outside of ngZone', () => {
+ it('should run blockListedEvents handler outside of ngZone', () => {
const Zone = (window as any)['Zone'];
const element = el('
');
getDOM().appendChild(doc.body, element);
diff --git a/scripts/ci/run_angular_material_unit_tests.sh b/scripts/ci/run_angular_material_unit_tests.sh
index 3eb0d109e6..e22d15e32d 100755
--- a/scripts/ci/run_angular_material_unit_tests.sh
+++ b/scripts/ci/run_angular_material_unit_tests.sh
@@ -28,9 +28,9 @@ cp -r ${angular_dir}/dist/packages-dist-ivy-aot/* /tmp/material2/node_modules/@a
# For angular/angular, we only want to run the local tests.
export TEST_PLATFORM=local
-# Append the test blacklist into angular/material2's karma-test-shim.js.
+# Append the test blocklist into angular/material2's karma-test-shim.js.
# This filters out known-failing tests because the goal is to prevent regressions.
-cat ${angular_dir}/tools/material-ci/angular_material_test_blacklist.js >> /tmp/material2/test/karma-test-shim.js
+cat ${angular_dir}/tools/material-ci/angular_material_test_blocklist.js >> /tmp/material2/test/karma-test-shim.js
# Now actually run the tests.
yarn gulp test:single-run
diff --git a/tools/material-ci/angular_material_test_blacklist.js b/tools/material-ci/angular_material_test_blocklist.js
similarity index 99%
rename from tools/material-ci/angular_material_test_blacklist.js
rename to tools/material-ci/angular_material_test_blocklist.js
index 841c30c08d..359dd4d5dd 100644
--- a/tools/material-ci/angular_material_test_blacklist.js
+++ b/tools/material-ci/angular_material_test_blocklist.js
@@ -7,8 +7,8 @@
*/
/**
- * Blacklist of unit tests from angular/material2 with ivy that are skipped when running on
- * angular/angular. As bugs are resolved, items should be removed from this blacklist.
+ * Blocklist of unit tests from angular/material2 with ivy that are skipped when running on
+ * angular/angular. As bugs are resolved, items should be removed from this blocklist.
*
* The `notes` section should be used to keep track of specific issues associated with the failures.
*/
@@ -16,7 +16,7 @@
// clang-format off
// tslint:disable
-window.testBlacklist = {
+window.testBlocklist = {
"Portals CdkPortalOutlet should load a template into the portal": {
"error": "TypeError: Cannot read property 'createEmbeddedView' of undefined",
"notes": "Unknown"
diff --git a/tools/material-ci/instructions.md b/tools/material-ci/instructions.md
index 073ec5450b..aa56e5aef0 100644
--- a/tools/material-ci/instructions.md
+++ b/tools/material-ci/instructions.md
@@ -1,9 +1,9 @@
### Unit tests for Angular CDK/Material
The unit tests from angular/material2 run on CircleCI under the `material-unit-tests` job.
-Known failing tests are skipped based on the blacklist in
-`tools/material-ci/angular_material_test_blacklist.js`. Whenever the root cause of a known failure
+Known failing tests are skipped based on the blocklist in
+`tools/material-ci/angular_material_test_blocklist.js`. 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 blacklist.
+is resolved, the corresponding tests should be removed from the blocklist.
### Debugging
To debug a failure, you need to work against the angular/material2 repo:
@@ -13,12 +13,12 @@ To debug a failure, you need to work against the angular/material2 repo:
4. Run `scripts/ivy/install-angular.sh path/to/local/angular/repo`
5. Run `gulp test`
-### Regenerating the blacklist
-If a problem has been fixed, you can regenerate the blacklist by:
+### Regenerating the blocklist
+If a problem has been fixed, you can regenerate the blocklist by:
1. Clone `angular/material2`
2. Checkout the `ivy-2019` branch
3. Run `yarn`
4. Run `scripts/ivy/install-angular.sh path/to/local/angular/repo`
5. Run `gulp test`. Let it finish. It will take a few minutes.
-6. Run `scripts/ivy/generate-blacklist.js`
-7. Copy the new blacklist from `dist/angular_material_test_blacklist.js`
+6. Run `scripts/ivy/generate-blocklist.js`
+7. Copy the new blocklist from `dist/angular_material_test_blocklist.js`
diff --git a/tools/tslint/rollupConfigRule.ts b/tools/tslint/rollupConfigRule.ts
index 44b508d24d..e5cfbb086e 100644
--- a/tools/tslint/rollupConfigRule.ts
+++ b/tools/tslint/rollupConfigRule.ts
@@ -17,8 +17,8 @@ function _isRollupPath(path: string) {
return /rollup\.config\.js$/.test(path);
}
-// Regexes to blacklist.
-const sourceFilePathBlacklist = [
+// Regexes to blocklist.
+const sourceFilePathBlocklist = [
/\.spec\.ts$/,
/_spec\.ts$/,
/_perf\.ts$/,
@@ -62,7 +62,7 @@ const packageScopedImportWhitelist: [RegExp, string[]][] = [
// Return true if the file should be linted.
function _pathShouldBeLinted(path: string) {
- return /[/\\]packages[/\\]/.test(path) && sourceFilePathBlacklist.every(re => !re.test(path));
+ return /[/\\]packages[/\\]/.test(path) && sourceFilePathBlocklist.every(re => !re.test(path));
}
@@ -157,7 +157,7 @@ export class Rule extends AbstractRule {
sourceFile, importStatement.getStart(), importStatement.getWidth(),
`Import ${JSON.stringify(modulePath)} could not be found in the rollup config ` +
`at path ${JSON.stringify(rollupFilePath)}.`,
- this.ruleName, );
+ this.ruleName);
}
return null;