build: switch progress spinner e2e to MDC

Removes the e2e app entry for the legacy progress spinner and renames the MDC progress spinner.

Author: crisbeto

.github/CODEOWNERS

@@ -249,7 +249,6 @@
 /src/e2e-app/expansion/**                                   @andrewseguin
 /src/e2e-app/grid-list/**                                   @andrewseguin
 /src/e2e-app/icon/**                                        @andrewseguin
-/src/e2e-app/legacy-progress-spinner/**                     @andrewseguin @crisbeto
 /src/e2e-app/legacy-radio/**                                @andrewseguin @devversion
 /src/e2e-app/legacy-slide-toggle/**                         @devversion
 /src/e2e-app/legacy-tabs/**                                 @andrewseguin
@@ -261,7 +260,7 @@
 /src/e2e-app/input/**                                       @devversion
 /src/e2e-app/menu/**                                        @crisbeto
 /src/e2e-app/progress-bar/**                                @crisbeto
-/src/e2e-app/mdc-progress-spinner/**                        @mmalerba
+/src/e2e-app/progress-spinner/**                            @mmalerba
 /src/e2e-app/mdc-radio/**                                   @mmalerba
 /src/e2e-app/mdc-slide-toggle/**                            @crisbeto
 /src/e2e-app/mdc-slider/**                                  @andrewseguin

src/e2e-app/BUILD.bazel

@@ -52,7 +52,6 @@ ng_module(
         "//src/material/input",
         "//src/material/legacy-form-field",
         "//src/material/legacy-list",
-        "//src/material/legacy-progress-spinner",
         "//src/material/legacy-radio",
         "//src/material/legacy-slide-toggle",
         "//src/material/legacy-tabs",

src/e2e-app/e2e-app/e2e-app-layout.ts

@@ -39,6 +39,5 @@ export class E2eAppLayout {
     {path: 'mdc-slide-toggle', title: 'MDC Slide Toggle'},
     {path: 'mdc-table', title: 'MDC Table'},
     {path: 'mdc-tabs', title: 'MDC Tabs'},
-    {path: 'mdc-progress-spinner', title: 'MDC Progress spinner'},
   ];
 }

src/e2e-app/legacy-progress-spinner/legacy-progress-spinner-e2e-module.ts

@@ -11,7 +11,6 @@ import {E2eAppModule} from './e2e-app/e2e-app-module';
 import {ExpansionE2eModule} from './expansion/expansion-e2e-module';
 import {GridListE2eModule} from './grid-list/grid-list-e2e-module';
 import {IconE2eModule} from './icon/icon-e2e-module';
-import {LegacyProgressSpinnerE2eModule} from './legacy-progress-spinner/legacy-progress-spinner-e2e-module';
 import {LegacyRadioE2eModule} from './legacy-radio/legacy-radio-e2e-module';
 import {LegacySlideToggleE2eModule} from './legacy-slide-toggle/legacy-slide-toggle-e2e-module';
 import {LegacyTabsE2eModule} from './legacy-tabs/legacy-tabs-e2e-module';
@@ -21,7 +20,7 @@ import {CheckboxE2eModule} from './checkbox/checkbox-e2e-module';
 import {DialogE2eModule} from './dialog/dialog-e2e-module';
 import {MenuE2eModule} from './menu/menu-e2e-module';
 import {ProgressBarE2eModule} from './progress-bar/progress-bar-e2e-module';
-import {MdcProgressSpinnerE2eModule} from './mdc-progress-spinner/mdc-progress-spinner-module';
+import {ProgressSpinnerE2eModule} from './progress-spinner/progress-spinner-module';
 import {MdcRadioE2eModule} from './mdc-radio/mdc-radio-e2e-module';
 import {MdcSlideToggleE2eModule} from './mdc-slide-toggle/mdc-slide-toggle-e2e-module';
 import {MdcSliderE2eModule} from './mdc-slider/mdc-slider-e2e-module';
@@ -51,7 +50,6 @@ const enableAnimations = window.location.search.includes('animations=true');
     ExpansionE2eModule,
     GridListE2eModule,
     IconE2eModule,
-    LegacyProgressSpinnerE2eModule,
     LegacyRadioE2eModule,
     LegacySlideToggleE2eModule,
     LegacyTabsE2eModule,
@@ -61,7 +59,7 @@ const enableAnimations = window.location.search.includes('animations=true');
     DialogE2eModule,
     MenuE2eModule,
     ProgressBarE2eModule,
-    MdcProgressSpinnerE2eModule,
+    ProgressSpinnerE2eModule,
     MdcRadioE2eModule,
     MdcSliderE2eModule,
     MdcSlideToggleE2eModule,

src/e2e-app/legacy-progress-spinner/legacy-progress-spinner-e2e.html

@@ -9,10 +9,10 @@
 import {Component} from '@angular/core';
 
 @Component({
-  selector: 'mdc-progress-spinner-e2e',
-  templateUrl: 'mdc-progress-spinner-e2e.html',
+  selector: 'progress-spinner-e2e',
+  templateUrl: 'progress-spinner-e2e.html',
 })
-export class MdcProgressSpinnerE2e {
+export class ProgressSpinnerE2e {
   value = 65;
   diameter = 37;
   strokeWidth = 6;

src/e2e-app/legacy-progress-spinner/legacy-progress-spinner-e2e.ts

@@ -8,10 +8,10 @@
 
 import {NgModule} from '@angular/core';
 import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
-import {MdcProgressSpinnerE2e} from './mdc-progress-spinner-e2e';
+import {ProgressSpinnerE2e} from './progress-spinner-e2e';
 
 @NgModule({
   imports: [MatProgressSpinnerModule],
-  declarations: [MdcProgressSpinnerE2e],
+  declarations: [ProgressSpinnerE2e],
 })
-export class MdcProgressSpinnerE2eModule {}
+export class ProgressSpinnerE2eModule {}

src/e2e-app/main-module.ts

@@ -7,7 +7,6 @@ import {Home} from './e2e-app/e2e-app-layout';
 import {ExpansionE2e} from './expansion/expansion-e2e';
 import {GridListE2E} from './grid-list/grid-list-e2e';
 import {IconE2E} from './icon/icon-e2e';
-import {LegacyProgressSpinnerE2e} from './legacy-progress-spinner/legacy-progress-spinner-e2e';
 import {LegacyRadioE2e} from './legacy-radio/legacy-radio-e2e';
 import {LegacySlideToggleE2e} from './legacy-slide-toggle/legacy-slide-toggle-e2e';
 import {LegacyTabsE2e} from './legacy-tabs/legacy-tabs-e2e';
@@ -18,7 +17,7 @@ import {DialogE2E} from './dialog/dialog-e2e';
 import {InputE2E} from './input/input-e2e';
 import {MenuE2e} from './menu/menu-e2e';
 import {ProgressBarE2E} from './progress-bar/progress-bar-e2e';
-import {MdcProgressSpinnerE2e} from './mdc-progress-spinner/mdc-progress-spinner-e2e';
+import {ProgressSpinnerE2e} from './progress-spinner/progress-spinner-e2e';
 import {MdcRadioE2e} from './mdc-radio/mdc-radio-e2e';
 import {MdcSlideToggleE2e} from './mdc-slide-toggle/mdc-slide-toggle-e2e';
 import {MdcSliderE2e} from './mdc-slider/mdc-slider-e2e';
@@ -43,14 +42,13 @@ export const E2E_APP_ROUTES: Routes = [
   {path: 'input', component: InputE2E},
   {path: 'menu', component: MenuE2e},
   {path: 'progress-bar', component: ProgressBarE2E},
-  {path: 'legacy-progress-spinner', component: LegacyProgressSpinnerE2e},
+  {path: 'progress-spinner', component: ProgressSpinnerE2e},
   {path: 'legacy-radio', component: LegacyRadioE2e},
   {path: 'legacy-slide-toggle', component: LegacySlideToggleE2e},
   {path: 'legacy-tabs', component: LegacyTabsE2e},
   {path: 'list', component: ListE2e},
   {path: 'button', component: ButtonE2e},
   {path: 'dialog', component: DialogE2E},
-  {path: 'mdc-progress-spinner', component: MdcProgressSpinnerE2e},
   {path: 'mdc-radio', component: MdcRadioE2e},
   {path: 'mdc-slide-toggle', component: MdcSlideToggleE2e},
   {path: 'mdc-slider', component: MdcSliderE2e},

src/e2e-app/mdc-progress-spinner/mdc-progress-spinner-e2e.html renamed to src/e2e-app/progress-spinner/progress-spinner-e2e.html

@@ -1,7 +1,5 @@
-load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
 load(
     "//tools:defaults.bzl",
-    "ng_e2e_test_library",
     "ng_module",
     "ng_test_library",
     "ng_web_test_suite",
@@ -48,10 +46,7 @@ sass_binary(
 
 ng_test_library(
     name = "unit_test_sources",
-    srcs = glob(
-        ["**/*.spec.ts"],
-        exclude = ["**/*.e2e.spec.ts"],
-    ),
+    srcs = glob(["**/*.spec.ts"]),
     deps = [
         ":legacy-progress-spinner",
         "//src/cdk/platform",
@@ -65,22 +60,6 @@ ng_web_test_suite(
     deps = [":unit_test_sources"],
 )
 
-ng_e2e_test_library(
-    name = "e2e_test_sources",
-    srcs = glob(["**/*.e2e.spec.ts"]),
-    deps = [
-        "//src/cdk/testing/private/e2e",
-    ],
-)
-
-e2e_test_suite(
-    name = "e2e_tests",
-    deps = [
-        ":e2e_test_sources",
-        "//src/cdk/testing/private/e2e",
-    ],
-)
-
 filegroup(
     name = "source-files",
     srcs = glob(["**/*.ts"]),

src/e2e-app/mdc-progress-spinner/mdc-progress-spinner-e2e.ts renamed to src/e2e-app/progress-spinner/progress-spinner-e2e.ts

@@ -1,7 +1,7 @@
 import {browser, by, element} from 'protractor';
 
-describe('MDC-based progress-spinner', () => {
-  beforeEach(async () => await browser.get('/mdc-progress-spinner'));
+describe('progress-spinner', () => {
+  beforeEach(async () => await browser.get('/progress-spinner'));
 
   it('should render a determinate progress spinner', async () => {
     expect(await element(by.css('mat-progress-spinner')).isPresent()).toBe(true);