fix(form-element): Backport hyphenation fix on labels (#3578)

Author: brandonferrua

ui/components/app-launcher/__tests__/__snapshots__/index.spec.js.snap

@@ -15,10 +15,10 @@ import {
 
 import createHelpers from '../../../../jest.helpers';
 
-const { matchesMarkupAndStyle } = createHelpers(__dirname);
+const { matchesMarkup } = createHelpers(__dirname);
 
 it('renders a default app launcher', () =>
-  matchesMarkupAndStyle(
+  matchesMarkup(
     <div className="demo-only" style={{ height: '800px' }}>
       <AppLauncherModal
         appTiles={appTiles}
@@ -32,7 +32,7 @@ it('renders a default app launcher', () =>
   ));
 
 it('renders an app tile with a tooltip', () =>
-  matchesMarkupAndStyle(
+  matchesMarkup(
     <AppLauncherTile
       figureClass="slds-icon-custom-27"
       objectInitials="SC"
@@ -45,7 +45,7 @@ it('renders an app tile with a tooltip', () =>
   ));
 
 it('renders a grabbed app launcher', () =>
-  matchesMarkupAndStyle(
+  matchesMarkup(
     <div className="demo-only" style={{ height: '800px' }}>
       <AppLauncherModal
         appTiles={appTilesGrabbed}
@@ -60,7 +60,7 @@ it('renders a grabbed app launcher', () =>
   ));
 
 it('renders a moved app launcher', () =>
-  matchesMarkupAndStyle(
+  matchesMarkup(
     <div className="demo-only" style={{ height: '800px' }}>
       <AppLauncherModal
         appTiles={appTilesMoved}
@@ -74,7 +74,7 @@ it('renders a moved app launcher', () =>
   ));
 
 it('renders a dropped app launcher', () =>
-  matchesMarkupAndStyle(
+  matchesMarkup(
     <div className="demo-only" style={{ height: '800px' }}>
       <AppLauncherModal
         appTiles={appTilesDropped}
@@ -88,7 +88,7 @@ it('renders a dropped app launcher', () =>
   ));
 
 it('renders a search app launcher', () =>
-  matchesMarkupAndStyle(
+  matchesMarkup(
     <div className="demo-only" style={{ height: '800px' }}>
       <AppLauncherModal
         appTiles={appTilesSearch}

ui/components/app-launcher/__tests__/__snapshots__/renders_a_default_app_launcher.json

@@ -4,10 +4,10 @@ import { Checkbox, CheckboxGroup, Fieldset } from '../base/example';
 
 import createHelpers from '../../../../jest.helpers';
 
-const { matchesMarkupAndStyle } = createHelpers(__dirname);
+const { matchesMarkup } = createHelpers(__dirname);
 
 xit('renders a default checkbox button group', () =>
-  matchesMarkupAndStyle(
+  matchesMarkup(
     <Fieldset>
       <CheckboxGroup>
         <Checkbox id="monday">Mon</Checkbox>
@@ -20,7 +20,7 @@ xit('renders a default checkbox button group', () =>
   ));
 
 xit('renders a default checkbox button group with error', () =>
-  matchesMarkupAndStyle(
+  matchesMarkup(
     <Fieldset className="slds-has-error">
       <CheckboxGroup>
         <Checkbox errorId="error_01" id="monday">
@@ -46,7 +46,7 @@ xit('renders a default checkbox button group with error', () =>
   ));
 
 xit('renders a disabled checkbox button group', () =>
-  matchesMarkupAndStyle(
+  matchesMarkup(
     <Fieldset>
       <CheckboxGroup>
         <Checkbox id="monday" disabled="true">

ui/components/app-launcher/__tests__/__snapshots__/renders_a_dropped_app_launcher.json

@@ -8,13 +8,13 @@ import {
 
 import createHelpers from '../../../../jest.helpers';
 
-const { matchesMarkupAndStyle } = createHelpers(__dirname);
+const { matchesMarkup } = createHelpers(__dirname);
 
 xit('renders a default checkbox toggle', () =>
-  matchesMarkupAndStyle(<CheckboxToggle />));
+  matchesMarkup(<CheckboxToggle />));
 
 xit('renders a checked checkbox toggle', () =>
-  matchesMarkupAndStyle(<CheckboxToggleChecked />));
+  matchesMarkup(<CheckboxToggleChecked />));
 
 xit('renders a disabled checkbox toggle', () =>
-  matchesMarkupAndStyle(<CheckboxToggleDisabled />));
+  matchesMarkup(<CheckboxToggleDisabled />));