Update deps and fix lint issues

Author: chromakode

.eslintignore

@@ -0,0 +1,2 @@
+lib/**
+coverage/**

__tests__/.eslintrc

@@ -1,5 +1,9 @@
 {
   "env": {
-    "mocha": true
+    "jest": true
+  },
+  "rules": {
+    "global-require": ["off"],
+    "react/jsx-filename-extension": ["off"]
   }
 }

__tests__/ReactHTMLEmail.test.js

@@ -11,28 +11,24 @@ describe('ReactHTMLEmail', () => {
 
   describe('PropTypes.style', () => {
     it('returns an error for non-objects', () => {
-      const spy = spyOn(console, 'error')
+      const spy = jest.spyOn(console, 'error').mockImplementation()
       const style = 1
       checkPropTypes(module.PropTypes, { style }, 'style', 'Test')
       expect(spy).toHaveBeenCalled()
       expect(spy).toHaveBeenCalledWith('Warning: Failed style type: Invalid style `style` of type `number` supplied to `Test`, expected `object`.')
     })
 
     it('validates style objects', () => {
-      const spy = spyOn(module.default.__styleValidator, 'validate')
+      const spy = jest.spyOn(module.default.styleValidator, 'validate').mockImplementation()
       const style = { listStylePosition: '11px' }
       checkPropTypes(module.PropTypes, { style }, 'style', 'Test')
       expect(spy).toHaveBeenCalledWith(style, 'Test')
     })
   })
 
   describe('configStyleValidator', () => {
-    beforeEach(() => {
-      const module = require('../src/index')
-    })
-
     it('updates StyleValidator config', () => {
-      const spy = spyOn(module.default.__styleValidator, 'setConfig')
+      const spy = jest.spyOn(module.default.styleValidator, 'setConfig').mockImplementation()
       const config = { strict: false }
       module.configStyleValidator(config)
       expect(spy).toHaveBeenCalledWith(config)
@@ -48,7 +44,7 @@ describe('ReactHTMLEmail', () => {
     })
 
     it('disables warnings', () => {
-      expect(module.default.__styleValidator.config.warn).toEqual(false)
+      expect(module.default.styleValidator.config.warn).toEqual(false)
     })
 
     afterAll(() => {

__tests__/StyleValidator.test.js

@@ -39,15 +39,15 @@ describe('StyleValidator', () => {
 
   it('does not return an error on a known property, but warns with comments', () => {
     const val = new StyleValidator({ platforms: ['gmail-android', 'yahoo-mail'] })
-    const spy = spyOn(console, 'warn')
+    const spy = jest.spyOn(console, 'warn').mockImplementation()
     const result = val.validate({ backgroundSize: '11px' }, '<Test>')
     expect(spy).toHaveBeenCalledWith('Warning: Style property `background-size` supplied to `<Test>`, in gmail-android, yahoo-mail: image not stretched')
     expect(result).toBe(undefined)
   })
 
   it('does not output warnings when they are disabled', () => {
     const val = new StyleValidator({ warn: false, platforms: ['gmail-android', 'yahoo-mail'] })
-    const spy = spyOn(console, 'warn')
+    const spy = jest.spyOn(console, 'warn').mockImplementation()
     const result = val.validate({ backgroundSize: '11px' }, '<Test>')
     expect(spy).not.toHaveBeenCalled()
     expect(result).toBe(undefined)

__tests__/injectReactEmailAttributes.test.js

@@ -6,7 +6,7 @@ describe('injectReactEmailAttributes', () => {
   beforeAll(() => {
     jest.resetModules()
     const module = require('../src/injectReactEmailAttributes')
-    DOMProperty = module._DOMProperty
+    DOMProperty = module.DOMProperty
     injectReactEmailAttributes = module.default
     emailAttributes = module.emailAttributes
   })
@@ -16,13 +16,13 @@ describe('injectReactEmailAttributes', () => {
   })
 
   it('injects email properties on first run', () => {
-    const spy = spyOn(DOMProperty.injection, 'injectDOMPropertyConfig')
+    const spy = jest.spyOn(DOMProperty.injection, 'injectDOMPropertyConfig').mockImplementation()
     injectReactEmailAttributes()
     expect(spy).toHaveBeenCalledWith(emailAttributes)
   })
 
   it('no-ops on second run', () => {
-    const spy = spyOn(DOMProperty.injection, 'injectDOMPropertyConfig')
+    const spy = jest.spyOn(DOMProperty.injection, 'injectDOMPropertyConfig').mockImplementation()
     injectReactEmailAttributes()
     expect(spy).not.toHaveBeenCalled()
   })

__tests__/renderEmail.test.js

@@ -1,5 +1,5 @@
-import kitchenSink from '../examples/kitchenSink'
 import React from 'react'
+import kitchenSink from '../examples/kitchenSink'
 import { A } from '../src/index'
 
 describe('renderEmail', () => {
@@ -15,12 +15,12 @@ describe('renderEmail', () => {
 
   it('produces expected output from a kitchen sink example', () => {
     const actualOutput = renderEmail(kitchenSink)
-    const expectedOutput = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1.0"/><title>Test Email</title><style type="text/css">@media only screen and (max-device-width: 480px) {\n  font-size: 20px !important;\n}</style></head><body style="width:100%;margin:0;padding:0;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;"><table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0" align="left" valign="top"><tbody><tr><td align="center" valign="top"><table width="600" align="center" cellpadding="0" cellspacing="0" border="0" valign="top"><tbody><tr><td><span style="font-family:sans-serif;font-size:15px;line-height:15px;color:#000;">Hello, world!</span></td></tr><tr><td><table cellspacing="20" width="100%" style="border-top:3px solid black;" cellpadding="0" border="0" align="left" valign="top"><tbody><tr><td><span style="font-family:sans-serif;font-size:14px;line-height:20px;color:gray;">Generated by <a href="https://github.com/chromakode/react-html-email" target="_blank" style="text-decoration:underline;">react-html-email</a></span><img data-mc-bar="bar" data-mc-baz="baz" alt="react" src="https://upload.wikimedia.org/wikipedia/commons/thumb/5/57/React.js_logo.svg/100px-React.js_logo.svg.png" width="100" height="100" style="display:block;outline:none;border:none;text-decoration:none;"/><a download="https://raw.githubusercontent.com/chromakode/react-html-email/master/examples/kitchenSink.js" href="https://raw.githubusercontent.com/chromakode/react-html-email/master/examples/kitchenSink.js" target="_blank" style="text-decoration:underline;">Source code</a></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table></body></html>'
+    const expectedOutput = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html lang="en" xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1.0"/><title>Test Email</title><style type="text/css">@media only screen and (max-device-width: 480px) {\n  font-size: 20px !important;\n}</style></head><body style="width:100%;margin:0;padding:0;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;"><table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0" align="left" valign="top"><tbody><tr><td align="center" valign="top"><table width="600" align="center" cellpadding="0" cellspacing="0" border="0" valign="top"><tbody><tr><td><span style="font-family:sans-serif;font-size:15px;line-height:15px;color:#000;">Hello, world!</span></td></tr><tr><td><table cellspacing="20" width="100%" style="border-top:3px solid black;" cellpadding="0" border="0" align="left" valign="top"><tbody><tr><td><span style="font-family:sans-serif;font-size:14px;line-height:20px;color:gray;">Generated by <a href="https://github.com/chromakode/react-html-email" target="_blank" style="text-decoration:underline;">react-html-email</a></span><img data-mc-bar="bar" data-mc-baz="baz" alt="react" src="https://upload.wikimedia.org/wikipedia/commons/thumb/5/57/React.js_logo.svg/100px-React.js_logo.svg.png" width="100" height="100" style="display:block;outline:none;border:none;text-decoration:none;"/><a download="https://raw.githubusercontent.com/chromakode/react-html-email/master/examples/kitchenSink.js" href="https://raw.githubusercontent.com/chromakode/react-html-email/master/examples/kitchenSink.js" target="_blank" style="text-decoration:underline;">Source code</a></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table></body></html>'
     expect(actualOutput).toBe(expectedOutput)
   })
 
   it('warns on usage of an unsupported property', () => {
-    const spy = spyOn(console, 'error')
+    const spy = jest.spyOn(console, 'error').mockImplementation()
     const actualOutput = renderEmail(<A href="#test" style={{ listStylePosition: 'inside' }} />)
     const expectedOutput = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><a href="#test" target="_blank" style="text-decoration:underline;list-style-position:inside;"></a>'
     expect(actualOutput).toBe(expectedOutput)