Merge branch 'master' into mm17555-final

components/widgets/admin_console/admin_panel.test.tsx

@@ -35,7 +35,9 @@ describe('components/widgets/admin_console/AdminPanel', () => {
  values={Object {}}
  />
  </h3>
- <span>
+ <div
+ className="margin-top"
+ >
  <injectIntl(FormattedMarkdownMessage)
  defaultMessage="test-subtitle-default"
  id="test-subtitle-id"
@@ -78,7 +80,9 @@ describe('components/widgets/admin_console/AdminPanel', () => {
  values={Object {}}
  />
  </h3>
- <span>
+ <div
+ className="margin-top"
+ >
  <injectIntl(FormattedMarkdownMessage)
  defaultMessage="test-subtitle-default"
  id="test-subtitle-id"
@@ -129,7 +133,9 @@ describe('components/widgets/admin_console/AdminPanel', () => {
  values={Object {}}
  />
  </h3>
- <span>
+ <div
+ className="margin-top"
+ >
  <injectIntl(FormattedMarkdownMessage)
  defaultMessage="test-subtitle-default"
  id="test-subtitle-id"

components/widgets/menu/menu_items/menu_item_toggle_modal_redux.test.tsx

@@ -18,19 +18,23 @@ describe('components/MenuItemToggleModalRedux', () => {
  );
 
  expect(wrapper).toMatchInlineSnapshot(`
-<Connect(injectIntl(ModalToggleButtonRedux))
- accessibilityLabel="Whatever"
- dialogProps={
- Object {
- "test": "test",
- }
- }
- dialogType={[MockFunction]}
- modalId="test"
->
- Whatever
-</Connect(injectIntl(ModalToggleButtonRedux))>
-`);
+ <Connect(injectIntl(ModalToggleButtonRedux))
+ accessibilityLabel="Whatever"
+ dialogProps={
+ Object {
+ "test": "test",
+ }
+ }
+ dialogType={[MockFunction]}
+ modalId="test"
+ >
+ <span
+ className="MenuItem__primary-text"
+ >
+ Whatever
+ </span>
+ </Connect(injectIntl(ModalToggleButtonRedux))>
+ `);
  });
 
  test('should match snapshot with extra text', () => {