Skip to content

Commit

Permalink
fix(material-experimental/mdc-snack-bar): use same container selector…
Browse files Browse the repository at this point in the history 
… as non-mdc version (#23075)

(cherry picked from commit fa35251)
  • Loading branch information
@mmalerba @amysorto
mmalerba authored and amysorto committed Jun 28, 2021
1 parent c21da30 commit fe1de10
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-snack-bar/snack-bar-container.ts
View file
Expand Up @@ -44,7 +44,7 @@ const MDC_SNACKBAR_LABEL_CLASS = 'mdc-snackbar__label';
* @docs-private
*/
@Component({
selector: 'mat-mdc-snack-bar-container',
selector: 'mat-snack-bar-container',
templateUrl: 'snack-bar-container.html',
styleUrls: ['snack-bar-container.css'],
// In Ivy embedded views will be change detected from their declaration place, rather than
Expand Down
32 changes: 16 additions & 16 deletions src/material-experimental/mdc-snack-bar/snack-bar.spec.ts
View file
Expand Up @@ -68,7 +68,7 @@ describe('MatSnackBar', () => {
snackBar.open('Snack time!', 'Chew');
viewContainerFixture.detectChanges();

const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
const inertElement = containerElement.querySelector('[aria-hidden]')!;

expect(inertElement.getAttribute('aria-hidden'))
Expand All @@ -85,7 +85,7 @@ describe('MatSnackBar', () => {
snackBar.open('Snack time!', 'Chew');
viewContainerFixture.detectChanges();

const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
const liveElement = containerElement.querySelector('[aria-live]')!;
tick(announceDelay);

Expand Down Expand Up @@ -120,7 +120,7 @@ describe('MatSnackBar', () => {

viewContainerFixture.detectChanges();

const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
const liveElement = containerElement.querySelector('[aria-live]')!;

expect(liveElement.getAttribute('aria-live')).toBe('assertive',
Expand All @@ -133,7 +133,7 @@ describe('MatSnackBar', () => {
{announcementMessage: 'Yay Burritos', politeness: 'assertive'});
viewContainerFixture.detectChanges();

const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
const liveElement = containerElement.querySelector('[aria-live]')!;

expect(liveElement.getAttribute('aria-live'))
Expand All @@ -144,7 +144,7 @@ describe('MatSnackBar', () => {
snackBar.openFromComponent(BurritosNotification, {politeness: 'polite'});
viewContainerFixture.detectChanges();

const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
const liveElement = containerElement.querySelector('[aria-live]')!;

expect(liveElement.getAttribute('aria-live'))
Expand All @@ -155,7 +155,7 @@ describe('MatSnackBar', () => {
snackBar.openFromComponent(BurritosNotification, {politeness: 'off'});
viewContainerFixture.detectChanges();

const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
const liveElement = containerElement.querySelector('[aria-live]')!;

expect(liveElement.getAttribute('aria-live'))
Expand All @@ -167,7 +167,7 @@ describe('MatSnackBar', () => {
snackBar.openFromComponent(BurritosNotification, {politeness: 'assertive'});
viewContainerFixture.detectChanges();

const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
const liveElement = containerElement.querySelector('[aria-live]')!;

expect(liveElement.getAttribute('role'))
Expand All @@ -179,7 +179,7 @@ describe('MatSnackBar', () => {
snackBar.openFromComponent(BurritosNotification, {politeness: 'polite'});
viewContainerFixture.detectChanges();

const containerElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
const containerElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
const liveElement = containerElement.querySelector('[aria-live]')!;

expect(liveElement.getAttribute('role'))
Expand All @@ -198,7 +198,7 @@ describe('MatSnackBar', () => {
let snackBarRef = snackBar.open('Snack time!', 'Chew');
viewContainerFixture.detectChanges();

let messageElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
let messageElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
expect(messageElement.textContent).toContain('Snack time!',
'Expected snack bar to show a message without a ViewContainerRef');

Expand All @@ -222,7 +222,7 @@ describe('MatSnackBar', () => {
.toBe(snackBarRef,
'Expected the snack bar reference to be placed in the component instance');

let messageElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
let messageElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
expect(messageElement.textContent)
.toContain(simpleMessage, `Expected the snack bar message to be '${simpleMessage}'`);

Expand All @@ -246,7 +246,7 @@ describe('MatSnackBar', () => {
.toBe(snackBarRef,
'Expected the snack bar reference to be placed in the component instance');

let messageElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
let messageElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
expect(messageElement.textContent)
.toContain(simpleMessage, `Expected the snack bar message to be '${simpleMessage}'`);
expect(overlayContainerElement.querySelector('button.mat-mdc-button'))
Expand All @@ -266,7 +266,7 @@ describe('MatSnackBar', () => {

snackBarRef.dismiss();
viewContainerFixture.detectChanges();
const messageElement = overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
const messageElement = overlayContainerElement.querySelector('mat-snack-bar-container')!;
expect (messageElement.hasAttribute('mat-exit'))
.toBe(true, 'Expected the snackbar container to have the "exit" attribute upon dismiss');

Expand Down Expand Up @@ -485,7 +485,7 @@ describe('MatSnackBar', () => {
viewContainerFixture.detectChanges();

let containerClasses =
overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!.classList;
overlayContainerElement.querySelector('mat-snack-bar-container')!.classList;

expect(containerClasses).toContain('one');
expect(containerClasses).toContain('two');
Expand Down Expand Up @@ -522,7 +522,7 @@ describe('MatSnackBar', () => {
snackBar.open(simpleMessage);
flush();

expect(overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!.classList)
expect(overlayContainerElement.querySelector('mat-snack-bar-container')!.classList)
.toContain('custom-class', 'Expected class applied through the defaults to be applied.');
}));

Expand Down Expand Up @@ -621,7 +621,7 @@ describe('MatSnackBar', () => {
templateFixture.detectChanges();

const containerElement =
overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
overlayContainerElement.querySelector('mat-snack-bar-container')!;

expect(containerElement.textContent).toContain('Fries');
expect(containerElement.textContent).toContain('Pizza');
Expand All @@ -639,7 +639,7 @@ describe('MatSnackBar', () => {
templateFixture.detectChanges();

const containerElement =
overlayContainerElement.querySelector('mat-mdc-snack-bar-container')!;
overlayContainerElement.querySelector('mat-snack-bar-container')!;

expect(containerElement.textContent).toContain('Oranges');
});
Expand Down

0 comments on commit fe1de10

Please sign in to comment.