fix(material/dialog): remove dialog deps on legacy-dialog

angular · Sep 8, 2022 · 5e34770 · 5e34770
1 parent 1ade334
commit 5e34770
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 34 deletions.
diff --git a/src/material/dialog/dialog.md b/src/material/dialog/dialog.md
@@ -65,7 +65,7 @@ To access the data in your dialog component, you have to use the MAT_DIALOG_DATA
 
 ```ts
 import {Component, Inject} from '@angular/core';
-import {MAT_DIALOG_DATA} from '@angular/material/legacy-dialog';
+import {MAT_DIALOG_DATA} from '@angular/material/dialog';
 
 @Component({
   selector: 'your-dialog',

diff --git a/src/material/dialog/testing/BUILD.bazel b/src/material/dialog/testing/BUILD.bazel
@@ -30,9 +30,9 @@ ng_test_library(
         exclude = ["shared.spec.ts"],
     ),
     deps = [
+        ":harness_tests_lib",
         ":testing",
         "//src/material/dialog",
-        "//src/material/legacy-dialog/testing:harness_tests_lib",
         "@npm//@angular/platform-browser",
     ],
 )
@@ -43,3 +43,16 @@ ng_web_test_suite(
         ":unit_tests_lib",
     ],
 )
+
+ng_test_library(
+    name = "harness_tests_lib",
+    srcs = ["shared.spec.ts"],
+    deps = [
+        ":testing",
+        "//src/cdk/overlay",
+        "//src/cdk/testing",
+        "//src/cdk/testing/testbed",
+        "//src/material/dialog",
+        "@npm//@angular/platform-browser",
+    ],
+)
diff --git a/src/material/dialog/testing/dialog-harness.spec.ts b/src/material/dialog/testing/dialog-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatDialog, MatDialogModule} from '@angular/material/dialog';
-import {runHarnessTests} from '@angular/material/legacy-dialog/testing/shared.spec';
+import {runHarnessTests} from './shared.spec';
 import {MatDialogHarness} from './dialog-harness';
 
 describe('MDC-based MatDialog', () => {
-  runHarnessTests(MatDialogModule, MatDialogHarness as any, MatDialog as any);
+  runHarnessTests(MatDialogModule, MatDialogHarness, MatDialog);
 });
diff --git a/...rial/legacy-dialog/testing/shared.spec.ts → src/material/dialog/testing/shared.spec.ts b/...rial/legacy-dialog/testing/shared.spec.ts → src/material/dialog/testing/shared.spec.ts
@@ -2,19 +2,15 @@ import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component, TemplateRef, ViewChild} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {
-  MatLegacyDialog,
-  MatLegacyDialogModule,
-  MatLegacyDialogConfig,
-} from '@angular/material/legacy-dialog';
+import {MatDialog, MatDialogModule, MatDialogConfig} from '@angular/material/dialog';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MatLegacyDialogHarness} from './dialog-harness';
+import {MatDialogHarness} from './dialog-harness';
 
 /** Shared tests to run on both the original and MDC-based dialog's. */
 export function runHarnessTests(
-  dialogModule: typeof MatLegacyDialogModule,
-  dialogHarness: typeof MatLegacyDialogHarness,
-  dialogService: typeof MatLegacyDialog,
+  dialogModule: typeof MatDialogModule,
+  dialogHarness: typeof MatDialogHarness,
+  dialogService: typeof MatDialog,
 ) {
   let fixture: ComponentFixture<DialogHarnessTest>;
   let loader: HarnessLoader;
@@ -25,9 +21,7 @@ export function runHarnessTests(
     // the existing instance of the specified dialog service. This allows us to run these
     // tests for the MDC-based version of the dialog too.
     const providers =
-      dialogService !== MatLegacyDialog
-        ? [{provide: MatLegacyDialog, useExisting: dialogService}]
-        : undefined;
+      dialogService !== MatDialog ? [{provide: MatDialog, useExisting: dialogService}] : undefined;
     await TestBed.configureTestingModule({
       imports: [dialogModule, NoopAnimationsModule],
       declarations: [DialogHarnessTest],
@@ -138,9 +132,9 @@ export function runHarnessTests(
   class DialogHarnessTest {
     @ViewChild(TemplateRef) dialogTmpl: TemplateRef<any>;
 
-    constructor(readonly dialog: MatLegacyDialog) {}
+    constructor(readonly dialog: MatDialog) {}
 
-    open(config?: MatLegacyDialogConfig) {
+    open(config?: MatDialogConfig) {
       return this.dialog.open(this.dialogTmpl, config);
     }
   }

diff --git a/src/material/legacy-dialog/testing/BUILD.bazel b/src/material/legacy-dialog/testing/BUILD.bazel
@@ -25,28 +25,15 @@ filegroup(
     srcs = glob(["**/*.ts"]),
 )
 
-ng_test_library(
-    name = "harness_tests_lib",
-    srcs = ["shared.spec.ts"],
-    deps = [
-        ":testing",
-        "//src/cdk/overlay",
-        "//src/cdk/testing",
-        "//src/cdk/testing/testbed",
-        "//src/material/legacy-dialog",
-        "@npm//@angular/platform-browser",
-    ],
-)
-
 ng_test_library(
     name = "unit_tests_lib",
     srcs = glob(
         ["**/*.spec.ts"],
         exclude = ["shared.spec.ts"],
     ),
     deps = [
-        ":harness_tests_lib",
         ":testing",
+        "//src/material/dialog/testing:harness_tests_lib",
         "//src/material/legacy-dialog",
         "@npm//@angular/platform-browser",
     ],

diff --git a/src/material/legacy-dialog/testing/dialog-harness.spec.ts b/src/material/legacy-dialog/testing/dialog-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatLegacyDialog, MatLegacyDialogModule} from '@angular/material/legacy-dialog';
-import {runHarnessTests} from '@angular/material/legacy-dialog/testing/shared.spec';
+import {runHarnessTests} from '@angular/material/dialog/testing/shared.spec';
 import {MatLegacyDialogHarness} from './dialog-harness';
 
 describe('Non-MDC-based MatDialogHarness', () => {
-  runHarnessTests(MatLegacyDialogModule, MatLegacyDialogHarness, MatLegacyDialog);
+  runHarnessTests(MatLegacyDialogModule, MatLegacyDialogHarness as any, MatLegacyDialog as any);
 });