Update tests for jss v9.3.1

Author: lttb

package.json

@@ -58,6 +58,7 @@
     "common-tags": "^1.4.0",
     "copyfiles": "^1.2.0",
     "coveralls": "^3.0.0",
+    "css.escape": "^1.5.1",
     "enzyme": "^3.1.0",
     "enzyme-adapter-react-16": "^1.0.1",
     "enzyme-to-json": "^3.1.2",
@@ -94,7 +95,8 @@
     "rootDir": "src",
     "coverageDirectory": "../coverage",
     "setupFiles": [
-      "raf/polyfill"
+      "raf/polyfill",
+      "css.escape"
     ],
     "snapshotSerializers": [
       "enzyme-to-json/serializer"

src/tests/__snapshots__/functional.spec.jsx.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`functional tests Compose React Components should escape name 1`] = `
-".\\\\(Comp\\\\.name\\\\)-1-id {
+exports[`functional tests Compose React Components should escape name in dev mode 1`] = `
+".(Comp.name)-1-id {
   color: red;
 }"
 `;
@@ -105,6 +105,8 @@ exports[`functional tests should update dynamic props for conditional rules 1`]
   padding: 10px;
 }
 @media screen {
+  .button-1-id {
+  }
   .button-1-id .button {
     margin: 10px;
   }
@@ -116,6 +118,8 @@ exports[`functional tests should update dynamic props for conditional rules 2`]
   padding: 0;
 }
 @media screen {
+  .button-1-id {
+  }
   .button-1-id .button {
     margin: 0;
   }
@@ -129,9 +133,19 @@ exports[`functional tests should update nested props 1`] = `
 .div-1-id {
   padding: 15px;
 }
+.div-3-id {
+}
+.div-3-id:hover {
+}
 .div-3-id:hover .button-id {
   color: green;
 }
+.button-2-id {
+}
+.div-4-id {
+}
+.div-4-id:hover {
+}
 .div-4-id:hover .button-id {
   color: red;
 }"
@@ -227,7 +241,9 @@ exports[`functional tests should use Styled Component classname in string 1`] =
 `;
 
 exports[`functional tests should use Styled Component classname in string 2`] = `
-".div-4-id:not(:first-child) .static-2-id {
+".div-4-id {
+}
+.div-4-id:not(:first-child) .static-2-id {
   display: none;
 }
 .div-4-id:not(:last-child) .static-3-id {

src/tests/functional.spec.jsx

@@ -4,8 +4,6 @@ import Observable from 'zen-observable'
 import Enzyme, {mount} from 'enzyme'
 import Adapter from 'enzyme-adapter-react-16'
 
-import escapeClassName from '../utils/escapeClassName'
-
 import {
   getCss,
   removeWhitespace
@@ -28,7 +26,7 @@ const mockNameGenerators = () => {
   const createGenerateClassName = require('jss/lib/utils/createGenerateClassName').default
 
   // $FlowIgnore there is now mockImplementation in declaration
-  generateTagName.mockImplementation((tagName: string) => `${escapeClassName(tagName)}-${++styledCounter}`)
+  generateTagName.mockImplementation((tagName: string) => `${tagName}-${++styledCounter}`)
   createGenerateClassName.mockImplementation(() => rule => `${rule.key}-id`)
 }
 
@@ -190,7 +188,7 @@ describe('functional tests', () => {
       assertSheet(styled.sheet)
     })
 
-    it('should escape name', () => {
+    it('should escape name in dev mode', () => {
       const Comp = ({className}: {className: string}) => (
         <div className={className}>Container</div>
       )
@@ -204,7 +202,6 @@ describe('functional tests', () => {
       const wrapper = mount(<Container />)
       const {sheet} = styled
 
-      expect(sheet.rules.index[0].selectorText).toBe('.\\(Comp\\.name\\)-1-id')
       assertSheet(sheet)
 
       wrapper.unmount()

src/utils/escapeClassName.js

@@ -1,5 +1,3 @@
-import escapeClassName from './escapeClassName'
-
 let tagNameCounter = 0
 
-export default (tagName: string) => `${escapeClassName(tagName)}-${++tagNameCounter}`
+export default (tagName: string) => `${tagName}-${++tagNameCounter}`

src/utils/generateTagName.js

@@ -1232,6 +1232,10 @@ css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
 
+css.escape@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
+
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"