Fix failing tests

Author: joshwooding

packages/material-ui/src/CardHeader/CardHeader.test.js

@@ -59,7 +59,7 @@ describe('<CardHeader />', () => {
     it('should render the title as headline text', () => {
       const title = wrapper.childAt(0);
       assert.strictEqual(title.type(), Typography);
-      assert.strictEqual(title.props().variant, 'headline');
+      assert.strictEqual(title.props().variant, 'h5');
     });
 
     it('should render the subheader as body1 secondary text', () => {

packages/material-ui/src/styles/createTypography.test.js

@@ -47,17 +47,16 @@ describe('createTypography', () => {
   it('should apply a CSS property to all the variants', () => {
     const typography = createTypography(palette, { allVariants: { marginLeft: 0 } });
     const allVariants = [
-      'display4',
-      'display3',
-      'display2',
-      'display1',
-      'headline',
-      'title',
-      'subheading',
-      'body2',
+      'h1',
+      'h2',
+      'h3',
+      'h4',
+      'h5',
+      'h6',
+      'subtitle1',
+      'subtitle2',
       'body1',
-      'caption',
-      'button',
+      'body2',
     ];
 
     allVariants.forEach(variant => {