remove custom matcher

Author: andrewseguin

src/lib/core/testing/jasmine-matchers.ts

@@ -10,35 +10,21 @@
  * Collection of useful custom jasmine matchers for tests.
  */
 export const customMatchers: jasmine.CustomMatcherFactories = {
-  /** Matcher verifying that the element has the expected role attribute. */
   toBeRole: () => {
     return {
       compare: function (element: Element, expectedRole: string) {
-        return checkElementAttribute(element, 'role', expectedRole);
-      }
-    };
-  },
+        const result: jasmine.CustomMatcherResult = {pass: false};
+        const actualRole = element.getAttribute('role');
 
-  /** Matcher verifying that the element has the expected aria label. */
-  toHaveAriaLabel: () => {
-    return {
-      compare: function (element: Element, expectedAriaLabel: string) {
-        return checkElementAttribute(element, 'aria-label', expectedAriaLabel);
-      }
-    };
-  },
-};
+        result.pass = actualRole === expectedRole;
+        result.message = `Expected role for ${element.tagName} to be ${expectedRole}`;
 
-function checkElementAttribute(element, attr, expectation): jasmine.CustomMatcherResult {
-  const result: jasmine.CustomMatcherResult = {pass: false};
-  const actual = element.getAttribute(attr);
+        if (!result.pass) {
+          result.message += ` but was ${actualRole}`;
+        }
 
-  result.pass = actual === expectation;
-  result.message = `Expected aria-label for ${element.tagName} to be ${expectation}`;
-
-  if (!result.pass) {
-    result.message += ` but was ${actual}`;
+        return result;
+      }
+    };
   }
-
-  return result;
-}
+};

src/lib/paginator/paginator.spec.ts

@@ -12,7 +12,7 @@ import {customMatchers} from '../core/testing/jasmine-matchers';
 import {dispatchMouseEvent} from '../core/testing/dispatch-events';
 
 
-describe('MdPaginator', () => {
+fdescribe('MdPaginator', () => {
   let fixture: ComponentFixture<MdPaginatorApp>;
   let component: MdPaginatorApp;
   let paginator: MdPaginator;
@@ -93,12 +93,14 @@ describe('MdPaginator', () => {
     });
 
     it('should show right aria-labels for select and buttons', () => {
-      expect(fixture.nativeElement.querySelector('.mat-select'))
-          .toHaveAriaLabel('Items per page:');
-      expect(fixture.nativeElement.querySelector('.mat-paginator-navigation-previous'))
-          .toHaveAriaLabel('Previous page');
-      expect(fixture.nativeElement.querySelector('.mat-paginator-navigation-next'))
-          .toHaveAriaLabel('Next page');
+      const select = fixture.nativeElement.querySelector('.mat-select');
+      expect(select.getAttribute('aria-label')).toBe('Items per page:');
+
+      const prevButton = fixture.nativeElement.querySelector('.mat-paginator-navigation-previous');
+      expect(prevButton.getAttribute('aria-label')).toBe('Previous page');
+
+      const nextButton = fixture.nativeElement.querySelector('.mat-paginator-navigation-next');
+      expect(nextButton.getAttribute('aria-label')).toBe('Next page');
     });
   });
 

src/lib/typings.d.ts

@@ -4,8 +4,6 @@ declare var module: {id: string};
 declare namespace jasmine {
   interface Matchers {
     toBeRole(expectedRole: string): boolean;
-    toHaveAriaLabel(expectedAriaLabel: string): boolean;
-    toHaveAttribute(attr: string, test: string, expectedContent: any[]): boolean;
     toMatchTableContent(expectedContent: any[]): boolean;
   }
 }

tools/dgeni/index.js

@@ -97,6 +97,7 @@ let apiDocsPackage = new DgeniPackage('material2-api-docs', dgeniPackageDeps)
     'input/index.ts',
     'list/index.ts',
     'menu/index.ts',
+    'paginator/index.ts',
     'progress-bar/index.ts',
     'progress-spinner/index.ts',
     'radio/index.ts',