Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

refactoring: more unit tests for UI (#435)

Guilherme Oenning99f46c7ca5fc
diff --git a/package-lock.json b/package-lock.json
index 888c2ce29..12e806da1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,6 +77,31 @@
}
}
},
+ "@types/cheerio": {
+ "version": "0.22.8",
+ "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.8.tgz",
+ "integrity": "sha512-LzF540VOFabhS2TR2yYFz2Mu/fTfkA+5AwYddtJbOJGwnYrr2e7fHadT7/Z3jNGJJdCRlO3ySxmW26NgRdwhNA==",
+ "dev": true
+ },
+ "@types/enzyme": {
+ "version": "3.1.11",
+ "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.1.11.tgz",
+ "integrity": "sha512-abPTpLuveNVd2ibafCjwoZT9MerzgnBKd6ijNKdtlfJREGKXk5dxzKAXGoY9IuiYarH2YXTc197WeyIVQUFjQg==",
+ "dev": true,
+ "requires": {
+ "@types/cheerio": "*",
+ "@types/react": "*"
+ }
+ },
+ "@types/enzyme-adapter-react-16": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.2.tgz",
+ "integrity": "sha512-/oEtlwJyFIT9metXC2A90XnjfHwBDYxhFoJwqNjNDG5K2CCqp7xneQbAp4u5j280bOmalFYUDjfmmxNQG3S4Og==",
+ "dev": true,
+ "requires": {
+ "@types/enzyme": "*"
+ }
+ },
"@types/events": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
@@ -84,31 +109,21 @@
"dev": true
},
"@types/jest": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/@types/jest/-/jest-23.1.0.tgz",
- "integrity": "sha512-DlIvvYDpcFgM1Ny1uzUBGb+0UMejhPEzDGxJ2By75ndMVDa82OUzPlV+v6NOsjA7HRvB4oj/Jqsscv6eJvLxeQ==",
+ "version": "23.1.2",
+ "resolved": "https://registry.npmjs.org/@types/jest/-/jest-23.1.2.tgz",
+ "integrity": "sha512-qXPAaH+1KJBCRtQub2cd7GOnKfWkgRr++luya81ksUs+DA8QG2nMNZuved5K4Nb4enR61aS64CocEJNsjCKwog==",
"dev": true
},
"@types/jsdom": {
- "version": "11.0.4",
- "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-11.0.4.tgz",
- "integrity": "sha512-lthMj4kw7Fzs3LjBhQ0+1faAfDrN9GFJZO5Nf/xO7fppFfxqnnQdNR28n0xMGXsx8fTHOPliE1NTkAW1bVLpYw==",
+ "version": "11.0.6",
+ "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-11.0.6.tgz",
+ "integrity": "sha512-6sw9iNdXak3Dk4iN1osdZeZcV8cTe2SNIVwbnt8MjFFAI8+nBWDNcDfjUgZZqycF3Twlr7xXlKntnOrruxNRvg==",
"dev": true,
"requires": {
+ "@types/events": "*",
"@types/node": "*",
"@types/tough-cookie": "*",
- "parse5": "^3.0.2"
- },
- "dependencies": {
- "parse5": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
- "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
- "dev": true,
- "requires": {
- "@types/node": "*"
- }
- }
+ "parse5": "^4.0.0"
}
},
"@types/markdown-it": {
@@ -124,9 +139,9 @@
"dev": true
},
"@types/puppeteer": {
- "version": "1.3.4",
- "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-1.3.4.tgz",
- "integrity": "sha512-WI43+i2SZnYAm39ASmeDxhSR+czDIBuEqTNftg3V+bgTlqsbdmj8n/p9/95wWd4ipsnb/qD6nrvBekEvWh8UKQ==",
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-1.5.0.tgz",
+ "integrity": "sha512-KNQzIbHKn/yOlCH3BXOBA+3OUTZRmLkeCMQOHSid1ytrCKNks8ut6Oj0eeUeiOdOoRcW264qNh5kjH6LIoxeCA==",
"dev": true,
"requires": {
"@types/events": "*",
@@ -134,9 +149,9 @@
}
},
"@types/react": {
- "version": "16.3.17",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.3.17.tgz",
- "integrity": "sha512-f2ZTOSF7l9sRdXSbzLI84Z2wsVnj3qUjfJhtDLSi7lTWFMo1WSou7eQ2vkQga8100zhzzDjSyGbj+Viz7i927g==",
+ "version": "16.4.2",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.2.tgz",
+ "integrity": "sha512-oVcVteCDNiVc/fkDjowRfAZQDEOR76j3CJ3FvwXNvfV6zJguhghy1lMgpAzYox+9AZsWch+JPV6Imml3wvIUeg==",
"dev": true,
"requires": {
"csstype": "^2.2.0"
@@ -718,10 +733,13 @@
"dev": true
},
"async": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
- "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
- "dev": true
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+ "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+ "dev": true,
+ "requires": {
+ "lodash": "^4.17.10"
+ }
},
"async-each": {
"version": "1.0.1",
@@ -860,28 +878,28 @@
}
},
"babel-jest": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.0.1.tgz",
- "integrity": "sha1-u6079SP7IC2gXtCmVAtIyE7tE6Y=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.2.0.tgz",
+ "integrity": "sha1-FKnWo/QSLf6mBp03CFrfJqU6Tbo=",
"dev": true,
"requires": {
"babel-plugin-istanbul": "^4.1.6",
- "babel-preset-jest": "^23.0.1"
+ "babel-preset-jest": "^23.2.0"
},
"dependencies": {
"babel-plugin-jest-hoist": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.1.tgz",
- "integrity": "sha1-6qEclkVjrqnCG+zvK994U/fzwUg=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz",
+ "integrity": "sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=",
"dev": true
},
"babel-preset-jest": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.0.1.tgz",
- "integrity": "sha1-YxzFRcbPAhlDATvK8i9F2H/mIZg=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz",
+ "integrity": "sha1-jsegOhOPABoaj7HoETZSvxpV2kY=",
"dev": true,
"requires": {
- "babel-plugin-jest-hoist": "^23.0.1",
+ "babel-plugin-jest-hoist": "^23.2.0",
"babel-plugin-syntax-object-rest-spread": "^6.13.0"
}
}
@@ -1178,6 +1196,12 @@
"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
"dev": true
},
+ "boolbase": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+ "dev": true
+ },
"boom": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
@@ -1510,6 +1534,31 @@
"integrity": "sha512-9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g==",
"dev": true
},
+ "cheerio": {
+ "version": "1.0.0-rc.2",
+ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
+ "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
+ "dev": true,
+ "requires": {
+ "css-select": "~1.2.0",
+ "dom-serializer": "~0.1.0",
+ "entities": "~1.1.1",
+ "htmlparser2": "^3.9.1",
+ "lodash": "^4.15.0",
+ "parse5": "^3.0.1"
+ },
+ "dependencies": {
+ "parse5": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+ "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ }
+ }
+ },
"chokidar": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
@@ -1725,6 +1774,12 @@
"shallow-clone": "^1.0.0"
}
},
+ "clorox": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/clorox/-/clorox-1.0.3.tgz",
+ "integrity": "sha512-w3gKAUKMJYmmaJyc+p+iDrDtLvsFasrx/y6/zWo2U1TZfsz3y4Vl4T9PHCZrOwk1eMTOSRI6xHdpDR4PhTdy8Q==",
+ "dev": true
+ },
"co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -2050,6 +2105,18 @@
"source-list-map": "^2.0.0"
}
},
+ "css-select": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+ "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+ "dev": true,
+ "requires": {
+ "boolbase": "~1.0.0",
+ "css-what": "2.1",
+ "domutils": "1.5.1",
+ "nth-check": "~1.0.1"
+ }
+ },
"css-selector-tokenizer": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
@@ -2061,6 +2128,12 @@
"regexpu-core": "^1.0.0"
}
},
+ "css-what": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
+ "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
+ "dev": true
+ },
"cssesc": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
@@ -2133,9 +2206,9 @@
}
},
"csstype": {
- "version": "2.5.3",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.3.tgz",
- "integrity": "sha512-G5HnoK8nOiAq3DXIEoY2n/8Vb7Lgrms+jGJl8E4EJpQEeVONEnPFJSl8IK505wPBoxxtrtHhrRm4WX2GgdqarA==",
+ "version": "2.5.5",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.5.tgz",
+ "integrity": "sha512-EGMjeoiN3aqEX5u/cyH5mSdGBDGdLcCQvcEcBWNGFSPXKd9uOTIeVG91YQ22OxI44DKpvI+4C7VUSmEpsHWJaA==",
"dev": true
},
"currently-unhandled": {
@@ -2348,17 +2421,47 @@
"randombytes": "^2.0.0"
}
},
+ "discontinuous-range": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
+ "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
+ "dev": true
+ },
"dom-helpers": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
},
+ "dom-serializer": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+ "dev": true,
+ "requires": {
+ "domelementtype": "~1.1.1",
+ "entities": "~1.1.1"
+ },
+ "dependencies": {
+ "domelementtype": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+ "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
+ "dev": true
+ }
+ }
+ },
"domain-browser": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
"dev": true
},
+ "domelementtype": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+ "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+ "dev": true
+ },
"domexception": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
@@ -2368,6 +2471,25 @@
"webidl-conversions": "^4.0.2"
}
},
+ "domhandler": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+ "dev": true,
+ "requires": {
+ "domelementtype": "1"
+ }
+ },
+ "domutils": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+ "dev": true,
+ "requires": {
+ "dom-serializer": "0",
+ "domelementtype": "1"
+ }
+ },
"dotenv": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.0.0.tgz",
@@ -2462,6 +2584,56 @@
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
},
+ "enzyme": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.3.0.tgz",
+ "integrity": "sha512-l8csyPyLmtxskTz6pX9W8eDOyH1ckEtDttXk/vlFWCjv00SkjTjtoUrogqp4yEvMyneU9dUJoOLnqFoiHb8IHA==",
+ "dev": true,
+ "requires": {
+ "cheerio": "^1.0.0-rc.2",
+ "function.prototype.name": "^1.0.3",
+ "has": "^1.0.1",
+ "is-boolean-object": "^1.0.0",
+ "is-callable": "^1.1.3",
+ "is-number-object": "^1.0.3",
+ "is-string": "^1.0.4",
+ "is-subset": "^0.1.1",
+ "lodash": "^4.17.4",
+ "object-inspect": "^1.5.0",
+ "object-is": "^1.0.1",
+ "object.assign": "^4.1.0",
+ "object.entries": "^1.0.4",
+ "object.values": "^1.0.4",
+ "raf": "^3.4.0",
+ "rst-selector-parser": "^2.2.3"
+ }
+ },
+ "enzyme-adapter-react-16": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz",
+ "integrity": "sha512-kC8pAtU2Jk3OJ0EG8Y2813dg9Ol0TXi7UNxHzHiWs30Jo/hj7alc//G1YpKUsPP1oKl9X+Lkx+WlGJpPYA+nvw==",
+ "dev": true,
+ "requires": {
+ "enzyme-adapter-utils": "^1.3.0",
+ "lodash": "^4.17.4",
+ "object.assign": "^4.0.4",
+ "object.values": "^1.0.4",
+ "prop-types": "^15.6.0",
+ "react-reconciler": "^0.7.0",
+ "react-test-renderer": "^16.0.0-0"
+ }
+ },
+ "enzyme-adapter-utils": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz",
+ "integrity": "sha512-vVXSt6uDv230DIv+ebCG66T1Pm36Kv+m74L1TrF4kaE7e1V7Q/LcxO0QRkajk5cA6R3uu9wJf5h13wOTezTbjA==",
+ "dev": true,
+ "requires": {
+ "lodash": "^4.17.4",
+ "object.assign": "^4.0.4",
+ "prop-types": "^15.6.0"
+ }
+ },
"errno": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
@@ -2619,12 +2791,12 @@
}
},
"exec-sh": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz",
- "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==",
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+ "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
"dev": true,
"requires": {
- "merge": "^1.1.3"
+ "merge": "^1.2.0"
}
},
"execa": {
@@ -3723,6 +3895,17 @@
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
},
+ "function.prototype.name": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.0.tgz",
+ "integrity": "sha512-Bs0VRrTz4ghD8pTmbJQD1mZ8A/mN0ur/jGz+A6FBxPDUPkm1tNfF6bhTYPA7i7aF4lZJVr+OXTNNrnnIl58Wfg==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.2",
+ "function-bind": "^1.1.1",
+ "is-callable": "^1.1.3"
+ }
+ },
"gauge": {
"version": "2.7.4",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -3932,6 +4115,12 @@
"uglify-js": "^2.6"
},
"dependencies": {
+ "async": {
+ "version": "1.5.2",
+ "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+ "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+ "dev": true
+ },
"source-map": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
@@ -3983,6 +4172,12 @@
"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
"dev": true
},
+ "has-symbols": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+ "dev": true
+ },
"has-unicode": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -4101,6 +4296,20 @@
"whatwg-encoding": "^1.0.1"
}
},
+ "htmlparser2": {
+ "version": "3.9.2",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
+ "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+ "dev": true,
+ "requires": {
+ "domelementtype": "^1.3.0",
+ "domhandler": "^2.3.0",
+ "domutils": "^1.5.1",
+ "entities": "^1.1.1",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.2"
+ }
+ },
"http-signature": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -4438,6 +4647,12 @@
"binary-extensions": "^1.0.0"
}
},
+ "is-boolean-object": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.0.tgz",
+ "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=",
+ "dev": true
+ },
"is-buffer": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -4612,6 +4827,12 @@
}
}
},
+ "is-number-object": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz",
+ "integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=",
+ "dev": true
+ },
"is-odd": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
@@ -4706,6 +4927,18 @@
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
},
+ "is-string": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
+ "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=",
+ "dev": true
+ },
+ "is-subset": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
+ "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
+ "dev": true
+ },
"is-svg": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
@@ -4790,17 +5023,6 @@
"js-yaml": "^3.7.0",
"mkdirp": "^0.5.1",
"once": "^1.4.0"
- },
- "dependencies": {
- "async": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
- "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
- "dev": true,
- "requires": {
- "lodash": "^4.17.10"
- }
- }
}
},
"istanbul-lib-coverage": {
@@ -4898,13 +5120,13 @@
}
},
"jest": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest/-/jest-23.1.0.tgz",
- "integrity": "sha1-u7f4kxAKEadC3YvQ0EelSwlorRo=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-23.2.0.tgz",
+ "integrity": "sha1-govzGgltRdzwaCTR6gMBOve8/CA=",
"dev": true,
"requires": {
"import-local": "^1.0.0",
- "jest-cli": "^23.1.0"
+ "jest-cli": "^23.2.0"
},
"dependencies": {
"ansi-regex": {
@@ -4922,30 +5144,13 @@
"color-convert": "^1.9.0"
}
},
- "arr-diff": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
- "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
- "dev": true,
- "requires": {
- "arr-flatten": "^1.0.1"
- }
- },
- "array-unique": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
- "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
- "dev": true
- },
- "braces": {
- "version": "1.8.5",
- "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
- "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+ "browser-resolve": {
+ "version": "1.11.3",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+ "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
"dev": true,
"requires": {
- "expand-range": "^1.8.1",
- "preserve": "^0.2.0",
- "repeat-element": "^1.1.2"
+ "resolve": "1.1.7"
}
},
"camelcase": {
@@ -4976,38 +5181,20 @@
"wrap-ansi": "^2.0.0"
}
},
- "expand-brackets": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
- "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
- "dev": true,
- "requires": {
- "is-posix-bracket": "^0.1.0"
- }
- },
"expect": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-23.1.0.tgz",
- "integrity": "sha1-v9/VeiogFw2HWZnul4fMcfAcIF8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-23.2.0.tgz",
+ "integrity": "sha1-U6fhNeNv4n51hnsReP8IqqzCsN0=",
"dev": true,
"requires": {
"ansi-styles": "^3.2.0",
- "jest-diff": "^23.0.1",
+ "jest-diff": "^23.2.0",
"jest-get-type": "^22.1.0",
- "jest-matcher-utils": "^23.0.1",
- "jest-message-util": "^23.1.0",
+ "jest-matcher-utils": "^23.2.0",
+ "jest-message-util": "^23.2.0",
"jest-regex-util": "^23.0.0"
}
},
- "extglob": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
- "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
- "dev": true,
- "requires": {
- "is-extglob": "^1.0.0"
- }
- },
"find-up": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -5030,9 +5217,9 @@
"dev": true
},
"jest-cli": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-23.1.0.tgz",
- "integrity": "sha1-64vdTODRUlCJLjGtm2m8mdKo9r8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-23.2.0.tgz",
+ "integrity": "sha1-O1Q6PaUUXdiTeTEBcoI3n8aWxFs=",
"dev": true,
"requires": {
"ansi-escapes": "^3.0.0",
@@ -5046,23 +5233,24 @@
"istanbul-lib-coverage": "^1.2.0",
"istanbul-lib-instrument": "^1.10.1",
"istanbul-lib-source-maps": "^1.2.4",
- "jest-changed-files": "^23.0.1",
- "jest-config": "^23.1.0",
- "jest-environment-jsdom": "^23.1.0",
+ "jest-changed-files": "^23.2.0",
+ "jest-config": "^23.2.0",
+ "jest-environment-jsdom": "^23.2.0",
"jest-get-type": "^22.1.0",
- "jest-haste-map": "^23.1.0",
- "jest-message-util": "^23.1.0",
+ "jest-haste-map": "^23.2.0",
+ "jest-message-util": "^23.2.0",
"jest-regex-util": "^23.0.0",
- "jest-resolve-dependencies": "^23.0.1",
- "jest-runner": "^23.1.0",
- "jest-runtime": "^23.1.0",
- "jest-snapshot": "^23.0.1",
- "jest-util": "^23.1.0",
- "jest-validate": "^23.0.1",
- "jest-watcher": "^23.1.0",
- "jest-worker": "^23.0.1",
- "micromatch": "^2.3.11",
+ "jest-resolve-dependencies": "^23.2.0",
+ "jest-runner": "^23.2.0",
+ "jest-runtime": "^23.2.0",
+ "jest-snapshot": "^23.2.0",
+ "jest-util": "^23.2.0",
+ "jest-validate": "^23.2.0",
+ "jest-watcher": "^23.2.0",
+ "jest-worker": "^23.2.0",
+ "micromatch": "^3.1.10",
"node-notifier": "^5.2.1",
+ "prompts": "^0.1.9",
"realpath-native": "^1.0.0",
"rimraf": "^2.5.4",
"slash": "^1.0.0",
@@ -5073,106 +5261,106 @@
}
},
"jest-config": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.1.0.tgz",
- "integrity": "sha1-cIyg9DHTVu5CT7SJXTMIAGvdgkE=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.2.0.tgz",
+ "integrity": "sha1-0vtVb9WioZw561bROdzKXa0qHIg=",
"dev": true,
"requires": {
"babel-core": "^6.0.0",
- "babel-jest": "^23.0.1",
+ "babel-jest": "^23.2.0",
"chalk": "^2.0.1",
"glob": "^7.1.1",
- "jest-environment-jsdom": "^23.1.0",
- "jest-environment-node": "^23.1.0",
+ "jest-environment-jsdom": "^23.2.0",
+ "jest-environment-node": "^23.2.0",
"jest-get-type": "^22.1.0",
- "jest-jasmine2": "^23.1.0",
+ "jest-jasmine2": "^23.2.0",
"jest-regex-util": "^23.0.0",
- "jest-resolve": "^23.1.0",
- "jest-util": "^23.1.0",
- "jest-validate": "^23.0.1",
- "pretty-format": "^23.0.1"
+ "jest-resolve": "^23.2.0",
+ "jest-util": "^23.2.0",
+ "jest-validate": "^23.2.0",
+ "pretty-format": "^23.2.0"
}
},
"jest-diff": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.0.1.tgz",
- "integrity": "sha1-PUkTfO4SwyCktNK0pvpugtSRoWo=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.2.0.tgz",
+ "integrity": "sha1-nyz0tR4Sx5FVAgCrwWtHEwrxBio=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"diff": "^3.2.0",
"jest-get-type": "^22.1.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-environment-jsdom": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.1.0.tgz",
- "integrity": "sha1-hZKZFOI77TV32sl1X0EG0Gl8R5w=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.2.0.tgz",
+ "integrity": "sha1-NjRgOgipdbDKimWDIPVqVKjgRVg=",
"dev": true,
"requires": {
- "jest-mock": "^23.1.0",
- "jest-util": "^23.1.0",
+ "jest-mock": "^23.2.0",
+ "jest-util": "^23.2.0",
"jsdom": "^11.5.1"
}
},
"jest-environment-node": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.1.0.tgz",
- "integrity": "sha1-RSwL+UnPy7rNoeF2Lu7XC8eEx9U=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.2.0.tgz",
+ "integrity": "sha1-tv5BNy44IJO7bz2b32wcTsClDxg=",
"dev": true,
"requires": {
- "jest-mock": "^23.1.0",
- "jest-util": "^23.1.0"
+ "jest-mock": "^23.2.0",
+ "jest-util": "^23.2.0"
}
},
"jest-jasmine2": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.1.0.tgz",
- "integrity": "sha1-SvqzFym2VN3NKwdK3YSTlvE7MLg=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.2.0.tgz",
+ "integrity": "sha1-qmcM2x5NX47HdMlN2l4QX+M9i7Q=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"co": "^4.6.0",
- "expect": "^23.1.0",
+ "expect": "^23.2.0",
"is-generator-fn": "^1.0.0",
- "jest-diff": "^23.0.1",
- "jest-each": "^23.1.0",
- "jest-matcher-utils": "^23.0.1",
- "jest-message-util": "^23.1.0",
- "jest-snapshot": "^23.0.1",
- "jest-util": "^23.1.0",
- "pretty-format": "^23.0.1"
+ "jest-diff": "^23.2.0",
+ "jest-each": "^23.2.0",
+ "jest-matcher-utils": "^23.2.0",
+ "jest-message-util": "^23.2.0",
+ "jest-snapshot": "^23.2.0",
+ "jest-util": "^23.2.0",
+ "pretty-format": "^23.2.0"
}
},
"jest-matcher-utils": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz",
- "integrity": "sha1-DGwNrt+YM8Kn82I2Bp7+y0w/bl8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz",
+ "integrity": "sha1-TUmB8jIT6Tnjzt8j3DTHR7WuGRM=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"jest-get-type": "^22.1.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-message-util": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.1.0.tgz",
- "integrity": "sha1-moCbpIfsrFzlEdTmmO47XuJGHqk=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.2.0.tgz",
+ "integrity": "sha1-WR6BSP/2nPibBBSAnHIXVuvv50Q=",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0-beta.35",
"chalk": "^2.0.1",
- "micromatch": "^2.3.11",
+ "micromatch": "^3.1.10",
"slash": "^1.0.0",
"stack-utils": "^1.0.1"
}
},
"jest-mock": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.1.0.tgz",
- "integrity": "sha1-o4HDGxIasfYMRiotrbe4bczKxIc=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.2.0.tgz",
+ "integrity": "sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=",
"dev": true
},
"jest-regex-util": {
@@ -5182,86 +5370,56 @@
"dev": true
},
"jest-resolve": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.1.0.tgz",
- "integrity": "sha1-ueMW7s69bwC8UKOWDRUnuuZXktI=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.2.0.tgz",
+ "integrity": "sha1-oHkK1aO5kAKrTb/L+Nni1qabPZk=",
"dev": true,
"requires": {
- "browser-resolve": "^1.11.2",
+ "browser-resolve": "^1.11.3",
"chalk": "^2.0.1",
"realpath-native": "^1.0.0"
}
},
"jest-snapshot": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.0.1.tgz",
- "integrity": "sha1-ZnT6Gbnraamcq+zUFb3cQtavPn4=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.2.0.tgz",
+ "integrity": "sha1-x6PQFxd7utYMillYac+QqHguan4=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
- "jest-diff": "^23.0.1",
- "jest-matcher-utils": "^23.0.1",
+ "jest-diff": "^23.2.0",
+ "jest-matcher-utils": "^23.2.0",
"mkdirp": "^0.5.1",
"natural-compare": "^1.4.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-util": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.1.0.tgz",
- "integrity": "sha1-wCUbrzRkTG3S/qeKli9CY6xVdy0=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.2.0.tgz",
+ "integrity": "sha1-YrdwdXaW2W4JSgS48cNzylClqy4=",
"dev": true,
"requires": {
"callsites": "^2.0.0",
"chalk": "^2.0.1",
"graceful-fs": "^4.1.11",
"is-ci": "^1.0.10",
- "jest-message-util": "^23.1.0",
+ "jest-message-util": "^23.2.0",
"mkdirp": "^0.5.1",
"slash": "^1.0.0",
"source-map": "^0.6.0"
}
},
"jest-validate": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.0.1.tgz",
- "integrity": "sha1-zZ8BqJ0mu4hfEqhmdxXpyGWldU8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.2.0.tgz",
+ "integrity": "sha1-Z8i5CeEa8XAXZSOIlMZ6wykbGV4=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"jest-get-type": "^22.1.0",
"leven": "^2.1.0",
- "pretty-format": "^23.0.1"
- }
- },
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- },
- "micromatch": {
- "version": "2.3.11",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
- "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
- "dev": true,
- "requires": {
- "arr-diff": "^2.0.0",
- "array-unique": "^0.2.1",
- "braces": "^1.8.2",
- "expand-brackets": "^0.1.4",
- "extglob": "^0.3.1",
- "filename-regex": "^2.0.0",
- "is-extglob": "^1.0.0",
- "is-glob": "^2.0.1",
- "kind-of": "^3.0.2",
- "normalize-path": "^2.0.1",
- "object.omit": "^2.0.0",
- "parse-glob": "^3.0.4",
- "regex-cache": "^0.4.2"
+ "pretty-format": "^23.2.0"
}
},
"os-locale": {
@@ -5276,15 +5434,21 @@
}
},
"pretty-format": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.0.1.tgz",
- "integrity": "sha1-1h0GUmjkx1kIO8y8onoBrXx2AfQ=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.2.0.tgz",
+ "integrity": "sha1-OwqqY8AYpTWDNzwcs6XZbMXoMBc=",
"dev": true,
"requires": {
"ansi-regex": "^3.0.0",
"ansi-styles": "^3.2.0"
}
},
+ "resolve": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+ "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+ "dev": true
+ },
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -5357,9 +5521,9 @@
}
},
"jest-changed-files": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.0.1.tgz",
- "integrity": "sha1-95Vy0HIIROpd+EwqRI6GLCJU9gw=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.2.0.tgz",
+ "integrity": "sha1-oUWm5LZtASn8fJnO4TTck3pkPZw=",
"dev": true,
"requires": {
"throat": "^4.0.0"
@@ -5477,13 +5641,13 @@
"dev": true
},
"jest-each": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-23.1.0.tgz",
- "integrity": "sha1-FhRrWSw1SGelrl4TzfFcbGW2lsY=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-23.2.0.tgz",
+ "integrity": "sha1-pAD4HIVwg/UMT1M5mxCfEgI/sZ0=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
},
"dependencies": {
"ansi-regex": {
@@ -5519,9 +5683,9 @@
"dev": true
},
"pretty-format": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.0.1.tgz",
- "integrity": "sha1-1h0GUmjkx1kIO8y8onoBrXx2AfQ=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.2.0.tgz",
+ "integrity": "sha1-OwqqY8AYpTWDNzwcs6XZbMXoMBc=",
"dev": true,
"requires": {
"ansi-regex": "^3.0.0",
@@ -5567,102 +5731,28 @@
"dev": true
},
"jest-haste-map": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.1.0.tgz",
- "integrity": "sha1-GObH1ajScTb5G32YUvhd4McHTEk=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.2.0.tgz",
+ "integrity": "sha1-0Qy6wAfGlZSMjvGCGisu0tTy1Ng=",
"dev": true,
"requires": {
"fb-watchman": "^2.0.0",
"graceful-fs": "^4.1.11",
- "jest-docblock": "^23.0.1",
+ "jest-docblock": "^23.2.0",
"jest-serializer": "^23.0.1",
- "jest-worker": "^23.0.1",
- "micromatch": "^2.3.11",
+ "jest-worker": "^23.2.0",
+ "micromatch": "^3.1.10",
"sane": "^2.0.0"
},
"dependencies": {
- "arr-diff": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
- "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
- "dev": true,
- "requires": {
- "arr-flatten": "^1.0.1"
- }
- },
- "array-unique": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
- "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
- "dev": true
- },
- "braces": {
- "version": "1.8.5",
- "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
- "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
- "dev": true,
- "requires": {
- "expand-range": "^1.8.1",
- "preserve": "^0.2.0",
- "repeat-element": "^1.1.2"
- }
- },
- "expand-brackets": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
- "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
- "dev": true,
- "requires": {
- "is-posix-bracket": "^0.1.0"
- }
- },
- "extglob": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
- "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
- "dev": true,
- "requires": {
- "is-extglob": "^1.0.0"
- }
- },
"jest-docblock": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.0.1.tgz",
- "integrity": "sha1-3t3RgzO+XcJBUmCgTvP86SdrVyU=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.2.0.tgz",
+ "integrity": "sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=",
"dev": true,
"requires": {
"detect-newline": "^2.1.0"
}
- },
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- },
- "micromatch": {
- "version": "2.3.11",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
- "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
- "dev": true,
- "requires": {
- "arr-diff": "^2.0.0",
- "array-unique": "^0.2.1",
- "braces": "^1.8.2",
- "expand-brackets": "^0.1.4",
- "extglob": "^0.3.1",
- "filename-regex": "^2.0.0",
- "is-extglob": "^1.0.0",
- "is-glob": "^2.0.1",
- "kind-of": "^3.0.2",
- "normalize-path": "^2.0.1",
- "object.omit": "^2.0.0",
- "parse-glob": "^3.0.4",
- "regex-cache": "^0.4.2"
- }
}
}
},
@@ -5739,12 +5829,12 @@
}
},
"jest-leak-detector": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-23.0.1.tgz",
- "integrity": "sha1-nboHUFrDSVw50+wJrB5WRZnoYaA=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-23.2.0.tgz",
+ "integrity": "sha1-wonZYdxjjxQ1fU75bgQx7MGqN30=",
"dev": true,
"requires": {
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
},
"dependencies": {
"ansi-regex": {
@@ -5763,9 +5853,9 @@
}
},
"pretty-format": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.0.1.tgz",
- "integrity": "sha1-1h0GUmjkx1kIO8y8onoBrXx2AfQ=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.2.0.tgz",
+ "integrity": "sha1-OwqqY8AYpTWDNzwcs6XZbMXoMBc=",
"dev": true,
"requires": {
"ansi-regex": "^3.0.0",
@@ -6021,13 +6111,13 @@
}
},
"jest-resolve-dependencies": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-23.0.1.tgz",
- "integrity": "sha1-0BoQ3a2RUsTOzfXqwriFccS2pk0=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-23.2.0.tgz",
+ "integrity": "sha1-bfjVcJxkBmOc0H9Uv/B04BtcBFg=",
"dev": true,
"requires": {
"jest-regex-util": "^23.0.0",
- "jest-snapshot": "^23.0.1"
+ "jest-snapshot": "^23.2.0"
},
"dependencies": {
"ansi-regex": {
@@ -6063,26 +6153,26 @@
"dev": true
},
"jest-diff": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.0.1.tgz",
- "integrity": "sha1-PUkTfO4SwyCktNK0pvpugtSRoWo=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.2.0.tgz",
+ "integrity": "sha1-nyz0tR4Sx5FVAgCrwWtHEwrxBio=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"diff": "^3.2.0",
"jest-get-type": "^22.1.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-matcher-utils": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz",
- "integrity": "sha1-DGwNrt+YM8Kn82I2Bp7+y0w/bl8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz",
+ "integrity": "sha1-TUmB8jIT6Tnjzt8j3DTHR7WuGRM=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"jest-get-type": "^22.1.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-regex-util": {
@@ -6092,23 +6182,23 @@
"dev": true
},
"jest-snapshot": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.0.1.tgz",
- "integrity": "sha1-ZnT6Gbnraamcq+zUFb3cQtavPn4=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.2.0.tgz",
+ "integrity": "sha1-x6PQFxd7utYMillYac+QqHguan4=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
- "jest-diff": "^23.0.1",
- "jest-matcher-utils": "^23.0.1",
+ "jest-diff": "^23.2.0",
+ "jest-matcher-utils": "^23.2.0",
"mkdirp": "^0.5.1",
"natural-compare": "^1.4.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"pretty-format": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.0.1.tgz",
- "integrity": "sha1-1h0GUmjkx1kIO8y8onoBrXx2AfQ=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.2.0.tgz",
+ "integrity": "sha1-OwqqY8AYpTWDNzwcs6XZbMXoMBc=",
"dev": true,
"requires": {
"ansi-regex": "^3.0.0",
@@ -6127,22 +6217,22 @@
}
},
"jest-runner": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-23.1.0.tgz",
- "integrity": "sha1-+iCpM//3MaVDKzVh5/ZCZZT6KbU=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-23.2.0.tgz",
+ "integrity": "sha1-DZGWfqgvcrDHBZEJJghtIFXOda8=",
"dev": true,
"requires": {
"exit": "^0.1.2",
"graceful-fs": "^4.1.11",
- "jest-config": "^23.1.0",
- "jest-docblock": "^23.0.1",
- "jest-haste-map": "^23.1.0",
- "jest-jasmine2": "^23.1.0",
- "jest-leak-detector": "^23.0.1",
- "jest-message-util": "^23.1.0",
- "jest-runtime": "^23.1.0",
- "jest-util": "^23.1.0",
- "jest-worker": "^23.0.1",
+ "jest-config": "^23.2.0",
+ "jest-docblock": "^23.2.0",
+ "jest-haste-map": "^23.2.0",
+ "jest-jasmine2": "^23.2.0",
+ "jest-leak-detector": "^23.2.0",
+ "jest-message-util": "^23.2.0",
+ "jest-runtime": "^23.2.0",
+ "jest-util": "^23.2.0",
+ "jest-worker": "^23.2.0",
"source-map-support": "^0.5.6",
"throat": "^4.0.0"
},
@@ -6159,33 +6249,16 @@
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"requires": {
- "color-convert": "^1.9.0"
- }
- },
- "arr-diff": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
- "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
- "dev": true,
- "requires": {
- "arr-flatten": "^1.0.1"
+ "color-convert": "^1.9.0"
}
},
- "array-unique": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
- "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
- "dev": true
- },
- "braces": {
- "version": "1.8.5",
- "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
- "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+ "browser-resolve": {
+ "version": "1.11.3",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+ "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
"dev": true,
"requires": {
- "expand-range": "^1.8.1",
- "preserve": "^0.2.0",
- "repeat-element": "^1.1.2"
+ "resolve": "1.1.7"
}
},
"chalk": {
@@ -6199,38 +6272,20 @@
"supports-color": "^5.3.0"
}
},
- "expand-brackets": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
- "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
- "dev": true,
- "requires": {
- "is-posix-bracket": "^0.1.0"
- }
- },
"expect": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-23.1.0.tgz",
- "integrity": "sha1-v9/VeiogFw2HWZnul4fMcfAcIF8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-23.2.0.tgz",
+ "integrity": "sha1-U6fhNeNv4n51hnsReP8IqqzCsN0=",
"dev": true,
"requires": {
"ansi-styles": "^3.2.0",
- "jest-diff": "^23.0.1",
+ "jest-diff": "^23.2.0",
"jest-get-type": "^22.1.0",
- "jest-matcher-utils": "^23.0.1",
- "jest-message-util": "^23.1.0",
+ "jest-matcher-utils": "^23.2.0",
+ "jest-message-util": "^23.2.0",
"jest-regex-util": "^23.0.0"
}
},
- "extglob": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
- "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
- "dev": true,
- "requires": {
- "is-extglob": "^1.0.0"
- }
- },
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -6238,115 +6293,115 @@
"dev": true
},
"jest-config": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.1.0.tgz",
- "integrity": "sha1-cIyg9DHTVu5CT7SJXTMIAGvdgkE=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.2.0.tgz",
+ "integrity": "sha1-0vtVb9WioZw561bROdzKXa0qHIg=",
"dev": true,
"requires": {
"babel-core": "^6.0.0",
- "babel-jest": "^23.0.1",
+ "babel-jest": "^23.2.0",
"chalk": "^2.0.1",
"glob": "^7.1.1",
- "jest-environment-jsdom": "^23.1.0",
- "jest-environment-node": "^23.1.0",
+ "jest-environment-jsdom": "^23.2.0",
+ "jest-environment-node": "^23.2.0",
"jest-get-type": "^22.1.0",
- "jest-jasmine2": "^23.1.0",
+ "jest-jasmine2": "^23.2.0",
"jest-regex-util": "^23.0.0",
- "jest-resolve": "^23.1.0",
- "jest-util": "^23.1.0",
- "jest-validate": "^23.0.1",
- "pretty-format": "^23.0.1"
+ "jest-resolve": "^23.2.0",
+ "jest-util": "^23.2.0",
+ "jest-validate": "^23.2.0",
+ "pretty-format": "^23.2.0"
}
},
"jest-diff": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.0.1.tgz",
- "integrity": "sha1-PUkTfO4SwyCktNK0pvpugtSRoWo=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.2.0.tgz",
+ "integrity": "sha1-nyz0tR4Sx5FVAgCrwWtHEwrxBio=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"diff": "^3.2.0",
"jest-get-type": "^22.1.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-docblock": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.0.1.tgz",
- "integrity": "sha1-3t3RgzO+XcJBUmCgTvP86SdrVyU=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.2.0.tgz",
+ "integrity": "sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=",
"dev": true,
"requires": {
"detect-newline": "^2.1.0"
}
},
"jest-environment-jsdom": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.1.0.tgz",
- "integrity": "sha1-hZKZFOI77TV32sl1X0EG0Gl8R5w=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.2.0.tgz",
+ "integrity": "sha1-NjRgOgipdbDKimWDIPVqVKjgRVg=",
"dev": true,
"requires": {
- "jest-mock": "^23.1.0",
- "jest-util": "^23.1.0",
+ "jest-mock": "^23.2.0",
+ "jest-util": "^23.2.0",
"jsdom": "^11.5.1"
}
},
"jest-environment-node": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.1.0.tgz",
- "integrity": "sha1-RSwL+UnPy7rNoeF2Lu7XC8eEx9U=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.2.0.tgz",
+ "integrity": "sha1-tv5BNy44IJO7bz2b32wcTsClDxg=",
"dev": true,
"requires": {
- "jest-mock": "^23.1.0",
- "jest-util": "^23.1.0"
+ "jest-mock": "^23.2.0",
+ "jest-util": "^23.2.0"
}
},
"jest-jasmine2": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.1.0.tgz",
- "integrity": "sha1-SvqzFym2VN3NKwdK3YSTlvE7MLg=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.2.0.tgz",
+ "integrity": "sha1-qmcM2x5NX47HdMlN2l4QX+M9i7Q=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"co": "^4.6.0",
- "expect": "^23.1.0",
+ "expect": "^23.2.0",
"is-generator-fn": "^1.0.0",
- "jest-diff": "^23.0.1",
- "jest-each": "^23.1.0",
- "jest-matcher-utils": "^23.0.1",
- "jest-message-util": "^23.1.0",
- "jest-snapshot": "^23.0.1",
- "jest-util": "^23.1.0",
- "pretty-format": "^23.0.1"
+ "jest-diff": "^23.2.0",
+ "jest-each": "^23.2.0",
+ "jest-matcher-utils": "^23.2.0",
+ "jest-message-util": "^23.2.0",
+ "jest-snapshot": "^23.2.0",
+ "jest-util": "^23.2.0",
+ "pretty-format": "^23.2.0"
}
},
"jest-matcher-utils": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz",
- "integrity": "sha1-DGwNrt+YM8Kn82I2Bp7+y0w/bl8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz",
+ "integrity": "sha1-TUmB8jIT6Tnjzt8j3DTHR7WuGRM=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"jest-get-type": "^22.1.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-message-util": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.1.0.tgz",
- "integrity": "sha1-moCbpIfsrFzlEdTmmO47XuJGHqk=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.2.0.tgz",
+ "integrity": "sha1-WR6BSP/2nPibBBSAnHIXVuvv50Q=",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0-beta.35",
"chalk": "^2.0.1",
- "micromatch": "^2.3.11",
+ "micromatch": "^3.1.10",
"slash": "^1.0.0",
"stack-utils": "^1.0.1"
}
},
"jest-mock": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.1.0.tgz",
- "integrity": "sha1-o4HDGxIasfYMRiotrbe4bczKxIc=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.2.0.tgz",
+ "integrity": "sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=",
"dev": true
},
"jest-regex-util": {
@@ -6356,98 +6411,74 @@
"dev": true
},
"jest-resolve": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.1.0.tgz",
- "integrity": "sha1-ueMW7s69bwC8UKOWDRUnuuZXktI=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.2.0.tgz",
+ "integrity": "sha1-oHkK1aO5kAKrTb/L+Nni1qabPZk=",
"dev": true,
"requires": {
- "browser-resolve": "^1.11.2",
+ "browser-resolve": "^1.11.3",
"chalk": "^2.0.1",
"realpath-native": "^1.0.0"
}
},
"jest-snapshot": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.0.1.tgz",
- "integrity": "sha1-ZnT6Gbnraamcq+zUFb3cQtavPn4=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.2.0.tgz",
+ "integrity": "sha1-x6PQFxd7utYMillYac+QqHguan4=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
- "jest-diff": "^23.0.1",
- "jest-matcher-utils": "^23.0.1",
+ "jest-diff": "^23.2.0",
+ "jest-matcher-utils": "^23.2.0",
"mkdirp": "^0.5.1",
"natural-compare": "^1.4.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-util": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.1.0.tgz",
- "integrity": "sha1-wCUbrzRkTG3S/qeKli9CY6xVdy0=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.2.0.tgz",
+ "integrity": "sha1-YrdwdXaW2W4JSgS48cNzylClqy4=",
"dev": true,
"requires": {
"callsites": "^2.0.0",
"chalk": "^2.0.1",
"graceful-fs": "^4.1.11",
"is-ci": "^1.0.10",
- "jest-message-util": "^23.1.0",
+ "jest-message-util": "^23.2.0",
"mkdirp": "^0.5.1",
"slash": "^1.0.0",
"source-map": "^0.6.0"
}
},
"jest-validate": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.0.1.tgz",
- "integrity": "sha1-zZ8BqJ0mu4hfEqhmdxXpyGWldU8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.2.0.tgz",
+ "integrity": "sha1-Z8i5CeEa8XAXZSOIlMZ6wykbGV4=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"jest-get-type": "^22.1.0",
"leven": "^2.1.0",
- "pretty-format": "^23.0.1"
- }
- },
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- },
- "micromatch": {
- "version": "2.3.11",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
- "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
- "dev": true,
- "requires": {
- "arr-diff": "^2.0.0",
- "array-unique": "^0.2.1",
- "braces": "^1.8.2",
- "expand-brackets": "^0.1.4",
- "extglob": "^0.3.1",
- "filename-regex": "^2.0.0",
- "is-extglob": "^1.0.0",
- "is-glob": "^2.0.1",
- "kind-of": "^3.0.2",
- "normalize-path": "^2.0.1",
- "object.omit": "^2.0.0",
- "parse-glob": "^3.0.4",
- "regex-cache": "^0.4.2"
+ "pretty-format": "^23.2.0"
}
},
"pretty-format": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.0.1.tgz",
- "integrity": "sha1-1h0GUmjkx1kIO8y8onoBrXx2AfQ=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.2.0.tgz",
+ "integrity": "sha1-OwqqY8AYpTWDNzwcs6XZbMXoMBc=",
"dev": true,
"requires": {
"ansi-regex": "^3.0.0",
"ansi-styles": "^3.2.0"
}
},
+ "resolve": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+ "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+ "dev": true
+ },
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6476,9 +6507,9 @@
}
},
"jest-runtime": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-23.1.0.tgz",
- "integrity": "sha1-tK4OhyWeys/UqIS2OdsHz03WIK8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-23.2.0.tgz",
+ "integrity": "sha1-YtywF2ahxMZGltwJAgnnbOGq3Lw=",
"dev": true,
"requires": {
"babel-core": "^6.0.0",
@@ -6488,15 +6519,15 @@
"exit": "^0.1.2",
"fast-json-stable-stringify": "^2.0.0",
"graceful-fs": "^4.1.11",
- "jest-config": "^23.1.0",
- "jest-haste-map": "^23.1.0",
- "jest-message-util": "^23.1.0",
+ "jest-config": "^23.2.0",
+ "jest-haste-map": "^23.2.0",
+ "jest-message-util": "^23.2.0",
"jest-regex-util": "^23.0.0",
- "jest-resolve": "^23.1.0",
- "jest-snapshot": "^23.0.1",
- "jest-util": "^23.1.0",
- "jest-validate": "^23.0.1",
- "micromatch": "^2.3.11",
+ "jest-resolve": "^23.2.0",
+ "jest-snapshot": "^23.2.0",
+ "jest-util": "^23.2.0",
+ "jest-validate": "^23.2.0",
+ "micromatch": "^3.1.10",
"realpath-native": "^1.0.0",
"slash": "^1.0.0",
"strip-bom": "3.0.0",
@@ -6519,30 +6550,13 @@
"color-convert": "^1.9.0"
}
},
- "arr-diff": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
- "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
- "dev": true,
- "requires": {
- "arr-flatten": "^1.0.1"
- }
- },
- "array-unique": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
- "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
- "dev": true
- },
- "braces": {
- "version": "1.8.5",
- "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
- "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+ "browser-resolve": {
+ "version": "1.11.3",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+ "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
"dev": true,
"requires": {
- "expand-range": "^1.8.1",
- "preserve": "^0.2.0",
- "repeat-element": "^1.1.2"
+ "resolve": "1.1.7"
}
},
"camelcase": {
@@ -6573,38 +6587,20 @@
"wrap-ansi": "^2.0.0"
}
},
- "expand-brackets": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
- "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
- "dev": true,
- "requires": {
- "is-posix-bracket": "^0.1.0"
- }
- },
"expect": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-23.1.0.tgz",
- "integrity": "sha1-v9/VeiogFw2HWZnul4fMcfAcIF8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-23.2.0.tgz",
+ "integrity": "sha1-U6fhNeNv4n51hnsReP8IqqzCsN0=",
"dev": true,
"requires": {
"ansi-styles": "^3.2.0",
- "jest-diff": "^23.0.1",
+ "jest-diff": "^23.2.0",
"jest-get-type": "^22.1.0",
- "jest-matcher-utils": "^23.0.1",
- "jest-message-util": "^23.1.0",
+ "jest-matcher-utils": "^23.2.0",
+ "jest-message-util": "^23.2.0",
"jest-regex-util": "^23.0.0"
}
},
- "extglob": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
- "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
- "dev": true,
- "requires": {
- "is-extglob": "^1.0.0"
- }
- },
"find-up": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -6627,106 +6623,106 @@
"dev": true
},
"jest-config": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.1.0.tgz",
- "integrity": "sha1-cIyg9DHTVu5CT7SJXTMIAGvdgkE=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.2.0.tgz",
+ "integrity": "sha1-0vtVb9WioZw561bROdzKXa0qHIg=",
"dev": true,
"requires": {
"babel-core": "^6.0.0",
- "babel-jest": "^23.0.1",
+ "babel-jest": "^23.2.0",
"chalk": "^2.0.1",
"glob": "^7.1.1",
- "jest-environment-jsdom": "^23.1.0",
- "jest-environment-node": "^23.1.0",
+ "jest-environment-jsdom": "^23.2.0",
+ "jest-environment-node": "^23.2.0",
"jest-get-type": "^22.1.0",
- "jest-jasmine2": "^23.1.0",
+ "jest-jasmine2": "^23.2.0",
"jest-regex-util": "^23.0.0",
- "jest-resolve": "^23.1.0",
- "jest-util": "^23.1.0",
- "jest-validate": "^23.0.1",
- "pretty-format": "^23.0.1"
+ "jest-resolve": "^23.2.0",
+ "jest-util": "^23.2.0",
+ "jest-validate": "^23.2.0",
+ "pretty-format": "^23.2.0"
}
},
"jest-diff": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.0.1.tgz",
- "integrity": "sha1-PUkTfO4SwyCktNK0pvpugtSRoWo=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.2.0.tgz",
+ "integrity": "sha1-nyz0tR4Sx5FVAgCrwWtHEwrxBio=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"diff": "^3.2.0",
"jest-get-type": "^22.1.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-environment-jsdom": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.1.0.tgz",
- "integrity": "sha1-hZKZFOI77TV32sl1X0EG0Gl8R5w=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.2.0.tgz",
+ "integrity": "sha1-NjRgOgipdbDKimWDIPVqVKjgRVg=",
"dev": true,
"requires": {
- "jest-mock": "^23.1.0",
- "jest-util": "^23.1.0",
+ "jest-mock": "^23.2.0",
+ "jest-util": "^23.2.0",
"jsdom": "^11.5.1"
}
},
"jest-environment-node": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.1.0.tgz",
- "integrity": "sha1-RSwL+UnPy7rNoeF2Lu7XC8eEx9U=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.2.0.tgz",
+ "integrity": "sha1-tv5BNy44IJO7bz2b32wcTsClDxg=",
"dev": true,
"requires": {
- "jest-mock": "^23.1.0",
- "jest-util": "^23.1.0"
+ "jest-mock": "^23.2.0",
+ "jest-util": "^23.2.0"
}
},
"jest-jasmine2": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.1.0.tgz",
- "integrity": "sha1-SvqzFym2VN3NKwdK3YSTlvE7MLg=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.2.0.tgz",
+ "integrity": "sha1-qmcM2x5NX47HdMlN2l4QX+M9i7Q=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"co": "^4.6.0",
- "expect": "^23.1.0",
+ "expect": "^23.2.0",
"is-generator-fn": "^1.0.0",
- "jest-diff": "^23.0.1",
- "jest-each": "^23.1.0",
- "jest-matcher-utils": "^23.0.1",
- "jest-message-util": "^23.1.0",
- "jest-snapshot": "^23.0.1",
- "jest-util": "^23.1.0",
- "pretty-format": "^23.0.1"
+ "jest-diff": "^23.2.0",
+ "jest-each": "^23.2.0",
+ "jest-matcher-utils": "^23.2.0",
+ "jest-message-util": "^23.2.0",
+ "jest-snapshot": "^23.2.0",
+ "jest-util": "^23.2.0",
+ "pretty-format": "^23.2.0"
}
},
"jest-matcher-utils": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz",
- "integrity": "sha1-DGwNrt+YM8Kn82I2Bp7+y0w/bl8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz",
+ "integrity": "sha1-TUmB8jIT6Tnjzt8j3DTHR7WuGRM=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"jest-get-type": "^22.1.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-message-util": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.1.0.tgz",
- "integrity": "sha1-moCbpIfsrFzlEdTmmO47XuJGHqk=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.2.0.tgz",
+ "integrity": "sha1-WR6BSP/2nPibBBSAnHIXVuvv50Q=",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0-beta.35",
"chalk": "^2.0.1",
- "micromatch": "^2.3.11",
+ "micromatch": "^3.1.10",
"slash": "^1.0.0",
"stack-utils": "^1.0.1"
}
},
"jest-mock": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.1.0.tgz",
- "integrity": "sha1-o4HDGxIasfYMRiotrbe4bczKxIc=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.2.0.tgz",
+ "integrity": "sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=",
"dev": true
},
"jest-regex-util": {
@@ -6736,86 +6732,56 @@
"dev": true
},
"jest-resolve": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.1.0.tgz",
- "integrity": "sha1-ueMW7s69bwC8UKOWDRUnuuZXktI=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.2.0.tgz",
+ "integrity": "sha1-oHkK1aO5kAKrTb/L+Nni1qabPZk=",
"dev": true,
"requires": {
- "browser-resolve": "^1.11.2",
+ "browser-resolve": "^1.11.3",
"chalk": "^2.0.1",
"realpath-native": "^1.0.0"
}
},
"jest-snapshot": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.0.1.tgz",
- "integrity": "sha1-ZnT6Gbnraamcq+zUFb3cQtavPn4=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.2.0.tgz",
+ "integrity": "sha1-x6PQFxd7utYMillYac+QqHguan4=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
- "jest-diff": "^23.0.1",
- "jest-matcher-utils": "^23.0.1",
+ "jest-diff": "^23.2.0",
+ "jest-matcher-utils": "^23.2.0",
"mkdirp": "^0.5.1",
"natural-compare": "^1.4.0",
- "pretty-format": "^23.0.1"
+ "pretty-format": "^23.2.0"
}
},
"jest-util": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.1.0.tgz",
- "integrity": "sha1-wCUbrzRkTG3S/qeKli9CY6xVdy0=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.2.0.tgz",
+ "integrity": "sha1-YrdwdXaW2W4JSgS48cNzylClqy4=",
"dev": true,
"requires": {
"callsites": "^2.0.0",
"chalk": "^2.0.1",
"graceful-fs": "^4.1.11",
"is-ci": "^1.0.10",
- "jest-message-util": "^23.1.0",
+ "jest-message-util": "^23.2.0",
"mkdirp": "^0.5.1",
"slash": "^1.0.0",
"source-map": "^0.6.0"
}
},
"jest-validate": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.0.1.tgz",
- "integrity": "sha1-zZ8BqJ0mu4hfEqhmdxXpyGWldU8=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.2.0.tgz",
+ "integrity": "sha1-Z8i5CeEa8XAXZSOIlMZ6wykbGV4=",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"jest-get-type": "^22.1.0",
"leven": "^2.1.0",
- "pretty-format": "^23.0.1"
- }
- },
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- },
- "micromatch": {
- "version": "2.3.11",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
- "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
- "dev": true,
- "requires": {
- "arr-diff": "^2.0.0",
- "array-unique": "^0.2.1",
- "braces": "^1.8.2",
- "expand-brackets": "^0.1.4",
- "extglob": "^0.3.1",
- "filename-regex": "^2.0.0",
- "is-extglob": "^1.0.0",
- "is-glob": "^2.0.1",
- "kind-of": "^3.0.2",
- "normalize-path": "^2.0.1",
- "object.omit": "^2.0.0",
- "parse-glob": "^3.0.4",
- "regex-cache": "^0.4.2"
+ "pretty-format": "^23.2.0"
}
},
"os-locale": {
@@ -6830,15 +6796,21 @@
}
},
"pretty-format": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.0.1.tgz",
- "integrity": "sha1-1h0GUmjkx1kIO8y8onoBrXx2AfQ=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.2.0.tgz",
+ "integrity": "sha1-OwqqY8AYpTWDNzwcs6XZbMXoMBc=",
"dev": true,
"requires": {
"ansi-regex": "^3.0.0",
"ansi-styles": "^3.2.0"
}
},
+ "resolve": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+ "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+ "dev": true
+ },
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6885,17 +6857,6 @@
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
- "write-file-atomic": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
- "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.11",
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.2"
- }
- },
"yargs": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz",
@@ -7093,9 +7054,9 @@
}
},
"jest-watcher": {
- "version": "23.1.0",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-23.1.0.tgz",
- "integrity": "sha1-qNWELjjZ+0r/+CPfartCpYrmzb0=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-23.2.0.tgz",
+ "integrity": "sha1-Z46FKJbpGenZoOtLi68a4nliDqk=",
"dev": true,
"requires": {
"ansi-escapes": "^3.0.0",
@@ -7141,9 +7102,9 @@
}
},
"jest-worker": {
- "version": "23.0.1",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-23.0.1.tgz",
- "integrity": "sha1-nmSd2WP/QEYCb5HEAX8Dmmqkp7w=",
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-23.2.0.tgz",
+ "integrity": "sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=",
"dev": true,
"requires": {
"merge-stream": "^1.0.1"
@@ -7427,6 +7388,12 @@
"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
"dev": true
},
+ "lodash.flattendeep": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+ "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+ "dev": true
+ },
"lodash.memoize": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -7860,6 +7827,18 @@
"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
"dev": true
},
+ "nearley": {
+ "version": "2.13.0",
+ "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.13.0.tgz",
+ "integrity": "sha512-ioYYogSaZhFlCpRizQgY3UT3G1qFXmHGY/5ozoFE3dMfiCRAeJfh+IPE3/eh9gCZvqLhPCWb4bLt7Bqzo+1mLQ==",
+ "dev": true,
+ "requires": {
+ "nomnom": "~1.6.2",
+ "railroad-diagrams": "^1.0.0",
+ "randexp": "0.4.6",
+ "semver": "^5.4.1"
+ }
+ },
"neo-async": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
@@ -8125,6 +8104,24 @@
}
}
},
+ "nomnom": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz",
+ "integrity": "sha1-hKZqJgF0QI/Ft3oY+IjszET7aXE=",
+ "dev": true,
+ "requires": {
+ "colors": "0.5.x",
+ "underscore": "~1.4.4"
+ },
+ "dependencies": {
+ "colors": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz",
+ "integrity": "sha1-fQAj6usVTo7p/Oddy5I9DtFmd3Q=",
+ "dev": true
+ }
+ }
+ },
"nopt": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -8194,6 +8191,15 @@
"set-blocking": "~2.0.0"
}
},
+ "nth-check": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+ "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
+ "dev": true,
+ "requires": {
+ "boolbase": "~1.0.0"
+ }
+ },
"num2fraction": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
@@ -8254,10 +8260,22 @@
}
}
},
+ "object-inspect": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+ "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+ "dev": true
+ },
+ "object-is": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
+ "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
+ "dev": true
+ },
"object-keys": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
- "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+ "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
"dev": true
},
"object-visit": {
@@ -8269,6 +8287,30 @@
"isobject": "^3.0.0"
}
},
+ "object.assign": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+ "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.2",
+ "function-bind": "^1.1.1",
+ "has-symbols": "^1.0.0",
+ "object-keys": "^1.0.11"
+ }
+ },
+ "object.entries": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
+ "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.6.1",
+ "function-bind": "^1.1.0",
+ "has": "^1.0.1"
+ }
+ },
"object.getownpropertydescriptors": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
@@ -8309,6 +8351,18 @@
"isobject": "^3.0.1"
}
},
+ "object.values": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz",
+ "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.6.1",
+ "function-bind": "^1.1.0",
+ "has": "^1.0.1"
+ }
+ },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -9305,6 +9359,16 @@
"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
"dev": true
},
+ "prompts": {
+ "version": "0.1.9",
+ "resolved": "https://registry.npmjs.org/prompts/-/prompts-0.1.9.tgz",
+ "integrity": "sha512-RMRvwAUDVUMhP/z3YfDW6igMwT0UnL+w3XCUUNxxHjgwJnVEdHWYJVjM7hQMPub8HCk12xZYAqWlbgLBnqebwg==",
+ "dev": true,
+ "requires": {
+ "clorox": "^1.0.1",
+ "sisteransi": "^0.1.0"
+ }
+ },
"prop-types": {
"version": "15.6.1",
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
@@ -9443,6 +9507,31 @@
"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
"dev": true
},
+ "raf": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
+ "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
+ "dev": true,
+ "requires": {
+ "performance-now": "^2.1.0"
+ }
+ },
+ "railroad-diagrams": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
+ "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
+ "dev": true
+ },
+ "randexp": {
+ "version": "0.4.6",
+ "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
+ "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+ "dev": true,
+ "requires": {
+ "discontinuous-range": "1.0.0",
+ "ret": "~0.1.10"
+ }
+ },
"randomatic": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
@@ -9505,6 +9594,36 @@
"prop-types": "^15.6.0"
}
},
+ "react-is": {
+ "version": "16.4.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.4.1.tgz",
+ "integrity": "sha512-xpb0PpALlFWNw/q13A+1aHeyJyLYCg0/cCHPUA43zYluZuIPHaHL3k8OBsTgQtxqW0FhyDEMvi8fZ/+7+r4OSQ==",
+ "dev": true
+ },
+ "react-reconciler": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.7.0.tgz",
+ "integrity": "sha512-50JwZ3yNyMS8fchN+jjWEJOH3Oze7UmhxeoJLn2j6f3NjpfCRbcmih83XTWmzqtar/ivd5f7tvQhvvhism2fgg==",
+ "dev": true,
+ "requires": {
+ "fbjs": "^0.8.16",
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1",
+ "prop-types": "^15.6.0"
+ }
+ },
+ "react-test-renderer": {
+ "version": "16.4.1",
+ "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.4.1.tgz",
+ "integrity": "sha512-wyyiPxRZOTpKnNIgUBOB6xPLTpIzwcQMIURhZvzUqZzezvHjaGNsDPBhMac5fIY3Jf5NuKxoGvV64zDSOECPPQ==",
+ "dev": true,
+ "requires": {
+ "fbjs": "^0.8.16",
+ "object-assign": "^4.1.1",
+ "prop-types": "^15.6.0",
+ "react-is": "^16.4.1"
+ }
+ },
"react-textarea-autosize": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
@@ -9862,6 +9981,16 @@
"inherits": "^2.0.1"
}
},
+ "rst-selector-parser": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
+ "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
+ "dev": true,
+ "requires": {
+ "lodash.flattendeep": "^4.4.0",
+ "nearley": "^2.7.10"
+ }
+ },
"rsvp": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
@@ -10686,6 +10815,12 @@
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true
},
+ "sisteransi": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-0.1.1.tgz",
+ "integrity": "sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==",
+ "dev": true
+ },
"slash": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
@@ -11802,6 +11937,12 @@
}
}
},
+ "underscore": {
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
+ "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=",
+ "dev": true
+ },
"union-value": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
@@ -12548,6 +12689,17 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
},
+ "write-file-atomic": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+ "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.11",
+ "imurmurhash": "^0.1.4",
+ "signal-exit": "^3.0.2"
+ }
+ },
"ws": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
diff --git a/package.json b/package.json
index 26a9b67c3..eb4fde93b 100644
--- a/package.json
+++ b/package.json
@@ -14,18 +14,22 @@
"tslib": "1.9.2"
},
"devDependencies": {
- "@types/jest": "23.1.0",
- "@types/jsdom": " 11.0.4",
+ "@types/enzyme": "3.1.11",
+ "@types/enzyme-adapter-react-16": "1.0.2",
+ "@types/jest": "23.1.2",
+ "@types/jsdom": "11.0.6",
"@types/markdown-it": "0.0.4",
"@types/node": "10.3.3",
- "@types/puppeteer": "^1.3.4",
- "@types/react": "16.3.17",
+ "@types/puppeteer": "1.5.0",
+ "@types/react": "16.4.2",
"@types/react-dom": "16.0.6",
"@types/react-textarea-autosize": "4.3.2",
"css-loader": "0.28.11",
"dotenv": "6.0.0",
+ "enzyme": "3.3.0",
+ "enzyme-adapter-react-16": "1.1.1",
"file-loader": "1.1.11",
- "jest": "23.1.0",
+ "jest": "23.2.0",
"mini-css-extract-plugin": "0.4.0",
"node-sass": "4.9.0",
"prettier": "1.13.5",
diff --git a/public/components/ShowIdeaResponse.tsx b/public/components/ShowIdeaResponse.tsx
index 1a59e84d6..716e967e9 100644
--- a/public/components/ShowIdeaResponse.tsx
+++ b/public/components/ShowIdeaResponse.tsx
@@ -13,6 +13,10 @@ export const ShowIdeaStatus = (props: ShowIdeaStatusProps) => {
};
const DuplicateDetails = (props: IdeaResponseProps): JSX.Element | null => {
+ if (!props.response) {
+ return null;
+ }
+
const original = props.response.original;
if (!original) {
return null;
@@ -28,11 +32,11 @@ const DuplicateDetails = (props: IdeaResponseProps): JSX.Element | null => {
interface IdeaResponseProps {
status: number;
- response: IdeaResponse;
+ response: IdeaResponse | null;
}
const StatusDetails = (props: IdeaResponseProps): JSX.Element | null => {
- if (!props.response.text) {
+ if (!props.response || !props.response.text) {
return null;
}
diff --git a/public/components/SupportCounter.spec.tsx b/public/components/SupportCounter.spec.tsx
new file mode 100644
index 000000000..0affde324
--- /dev/null
+++ b/public/components/SupportCounter.spec.tsx
@@ -0,0 +1,102 @@
+import * as React from "react";
+import { shallow } from "enzyme";
+import { Idea, UserRole, UserStatus, IdeaStatus } from "@fider/models";
+import { SupportCounter } from "@fider/components";
+import { httpMock, fiderMock, rerender } from "@fider/services/testing";
+
+let idea: Idea;
+
+beforeEach(() => {
+ idea = {
+ id: 1,
+ number: 10,
+ slug: "add-typescript",
+ title: "Add TypeScript",
+ description: "",
+ createdOn: "",
+ status: IdeaStatus.Started.value,
+ user: {
+ id: 5,
+ name: "John",
+ role: UserRole.Collaborator,
+ status: UserStatus.Active
+ },
+ viewerSupported: false,
+ response: null,
+ totalSupporters: 5,
+ totalComments: 2,
+ tags: []
+ };
+});
+
+describe("<SupportCounter />", () => {
+ test("when viewerSupported === true", () => {
+ idea.viewerSupported = true;
+ idea.totalSupporters = 9;
+ const wrapper = shallow(<SupportCounter idea={idea} />);
+ const button = wrapper.find("button");
+ expect(button.text()).toBe("9");
+ expect(button.hasClass("m-supported")).toBe(true);
+ expect(button.hasClass("m-disabled")).toBe(false);
+ });
+
+ test("when viewerSupported === false", () => {
+ idea.viewerSupported = false;
+ idea.totalSupporters = 2;
+ const wrapper = shallow(<SupportCounter idea={idea} />);
+ const button = wrapper.find("button");
+ expect(button.text()).toBe("2");
+ expect(button.hasClass("m-supported")).toBe(false);
+ expect(button.hasClass("m-disabled")).toBe(false);
+ });
+
+ test("when idea is closed", () => {
+ idea.status = IdeaStatus.Completed.value;
+ const wrapper = shallow(<SupportCounter idea={idea} />);
+ const button = wrapper.find("button");
+ expect(button.text()).toBe("5");
+ expect(button.hasClass("m-supported")).toBe(false);
+ expect(button.hasClass("m-disabled")).toBe(true);
+ });
+
+ test("click when unauthenticated", async () => {
+ fiderMock.notAuthenticated();
+
+ const mock = httpMock.alwaysOk();
+
+ const wrapper = shallow(<SupportCounter idea={idea} />);
+ wrapper.find("button").simulate("click");
+ await rerender(wrapper);
+ expect(wrapper.find("SignInModal").length).toBe(1);
+ expect(mock).toHaveBeenCalledTimes(0);
+ });
+
+ test("click when authenticated and viewerSupported === false", async () => {
+ fiderMock.authenticated();
+
+ const mock = httpMock.alwaysOk();
+
+ const wrapper = shallow(<SupportCounter idea={idea} />);
+ wrapper.find("button").simulate("click");
+ expect(mock).toHaveBeenCalledWith("/api/ideas/10/support");
+ expect(mock).toHaveBeenCalledTimes(1);
+
+ await rerender(wrapper);
+ expect(wrapper.find("button").text()).toBe("6");
+ });
+
+ test("click when authenticated and viewerSupported === true", async () => {
+ idea.viewerSupported = true;
+ fiderMock.authenticated();
+
+ const mock = httpMock.alwaysOk();
+
+ const wrapper = shallow(<SupportCounter idea={idea} />);
+ wrapper.find("button").simulate("click");
+ expect(mock).toHaveBeenCalledWith("/api/ideas/10/unsupport");
+ expect(mock).toHaveBeenCalledTimes(1);
+
+ await rerender(wrapper);
+ expect(wrapper.find("button").text()).toBe("4");
+ });
+});
diff --git a/public/components/SupportCounter.tsx b/public/components/SupportCounter.tsx
index c0bc4d856..48061d270 100644
--- a/public/components/SupportCounter.tsx
+++ b/public/components/SupportCounter.tsx
@@ -2,7 +2,7 @@ import "./SupportCounter.scss";
import * as React from "react";
import { Idea, IdeaStatus } from "@fider/models";
-import { actions, device, classSet } from "@fider/services";
+import { actions, device, classSet, Fider } from "@fider/services";
import { SignInModal } from "@fider/components";
interface SupportCounterProps {
diff --git a/public/components/common/EnvironmentInfo.tsx b/public/components/common/EnvironmentInfo.tsx
index 8d2952534..68c6e6ea9 100644
--- a/public/components/common/EnvironmentInfo.tsx
+++ b/public/components/common/EnvironmentInfo.tsx
@@ -1,5 +1,5 @@
import * as React from "react";
-import { SystemSettings } from "@fider/models";
+import { Fider } from "@fider/services";
export class EnvironmentInfo extends React.Component<{}, {}> {
public render() {
diff --git a/public/components/common/FiderVersion.tsx b/public/components/common/FiderVersion.tsx
index 88ee8be94..3b289b1fb 100644
--- a/public/components/common/FiderVersion.tsx
+++ b/public/components/common/FiderVersion.tsx
@@ -1,4 +1,5 @@
import * as React from "react";
+import { Fider } from "@fider/services";
export const FiderVersion = () => {
return (
diff --git a/public/components/common/Gravatar.tsx b/public/components/common/Gravatar.tsx
index aa86226e3..8b4d8bee3 100644
--- a/public/components/common/Gravatar.tsx
+++ b/public/components/common/Gravatar.tsx
@@ -1,8 +1,8 @@
import "./Gravatar.scss";
import * as React from "react";
-import { classSet } from "@fider/services";
-import { User, UserRole, UserStatus, CurrentUser } from "@fider/models";
+import { classSet, Fider } from "@fider/services";
+import { User, UserRole } from "@fider/models";
interface GravatarProps {
user?: User;
diff --git a/public/components/common/Header.tsx b/public/components/common/Header.tsx
index e50fef4fb..b685c5511 100644
--- a/public/components/common/Header.tsx
+++ b/public/components/common/Header.tsx
@@ -1,9 +1,8 @@
import "./Header.scss";
import * as React from "react";
-import { SystemSettings, CurrentUser, Tenant } from "@fider/models";
-import { SignInModal, SignInControl, EnvironmentInfo, Gravatar, Logo } from "@fider/components";
-import { actions, classSet } from "@fider/services";
+import { SignInModal, EnvironmentInfo, Gravatar, Logo } from "@fider/components";
+import { actions, Fider } from "@fider/services";
interface HeaderState {
showSignIn: boolean;
diff --git a/public/components/common/Legal.tsx b/public/components/common/Legal.tsx
index 69045c552..bbefc55cd 100644
--- a/public/components/common/Legal.tsx
+++ b/public/components/common/Legal.tsx
@@ -1,5 +1,6 @@
import * as React from "react";
-import { Modal, Field, Checkbox } from "@fider/components/common";
+import { Modal, Checkbox } from "@fider/components/common";
+import { Fider } from "@fider/services";
const privacy = (
<a href="/privacy" target="_blank">
diff --git a/public/components/common/Logo.tsx b/public/components/common/Logo.tsx
index c23522295..ccfdcc6b4 100644
--- a/public/components/common/Logo.tsx
+++ b/public/components/common/Logo.tsx
@@ -1,4 +1,5 @@
import * as React from "react";
+import { Fider } from "@fider/services";
interface LogoProps {
url?: string;
diff --git a/public/components/common/SignInControl.tsx b/public/components/common/SignInControl.tsx
index 70683598b..c98e6982d 100644
--- a/public/components/common/SignInControl.tsx
+++ b/public/components/common/SignInControl.tsx
@@ -2,7 +2,7 @@ import "./SignInControl.scss";
import * as React from "react";
import { SocialSignInButton, Form, Button, Input } from "@fider/components";
-import { device, actions, Failure } from "@fider/services";
+import { device, actions, Failure, Fider } from "@fider/services";
interface SignInControlState {
email: string;
diff --git a/public/components/common/form/Checkbox.tsx b/public/components/common/form/Checkbox.tsx
index 37b61e500..cf858a310 100644
--- a/public/components/common/form/Checkbox.tsx
+++ b/public/components/common/form/Checkbox.tsx
@@ -1,7 +1,6 @@
import * as React from "react";
-import { Failure, classSet } from "@fider/services";
+import { classSet } from "@fider/services";
import { DisplayError, ValidationContext, hasError } from "../";
-import { ECANCELED } from "constants";
interface CheckboxProps {
field: string;
diff --git a/public/index.tsx b/public/index.tsx
index 1fc4c421d..ef89b8757 100644
--- a/public/index.tsx
+++ b/public/index.tsx
@@ -2,9 +2,8 @@ import * as React from "react";
import * as ReactDOM from "react-dom";
import { resolveRootComponent } from "@fider/router";
import { Header, Footer } from "@fider/components/common";
-import { analytics, classSet } from "@fider/services";
+import { analytics, classSet, Fider } from "@fider/services";
import { ToastContainer } from "react-toastify";
-import { Fider } from "./fider";
import "semantic-ui-css/components/reset.min.css";
import "semantic-ui-css/components/icon.min.css";
@@ -19,7 +18,7 @@ window.addEventListener("error", (evt: ErrorEvent) => {
});
document.addEventListener("DOMContentLoaded", () => {
- const fider = ((global as any).Fider = new Fider());
+ const fider = Fider.initialize();
const root = document.getElementById("root");
if (root) {
diff --git a/public/jest.setup.ts b/public/jest.setup.ts
index 570b6224f..1b6bf0ec5 100644
--- a/public/jest.setup.ts
+++ b/public/jest.setup.ts
@@ -1,28 +1,16 @@
-import { JSDOM } from "jsdom";
+import { configure } from "enzyme";
+import * as Adapter from "enzyme-adapter-react-16";
-const jsdom = new JSDOM("<!doctype html><html><body></body></html>");
-const { window } = jsdom;
+configure({ adapter: new Adapter() });
-function copyProps(src: any, target: any) {
- const props = Object.getOwnPropertyNames(src)
- .filter(prop => typeof target[prop] === "undefined")
- .reduce(
- (result, prop) => ({
- ...result,
- [prop]: Object.getOwnPropertyDescriptor(src, prop)
- }),
- {}
- );
- Object.defineProperties(target, props);
-}
-
-(global as any).window = window;
-(global as any).document = window.document;
-(global as any).navigator = {
- userAgent: "node.js"
+let storage: {
+ [key: string]: string | undefined;
};
-let storage: { [key: string]: string | undefined } = {};
+beforeEach(() => {
+ storage = {};
+});
+
(window as any).sessionStorage = {
getItem: (key: string) => {
const value = storage[key];
@@ -35,9 +23,3 @@ let storage: { [key: string]: string | undefined } = {};
return delete storage[key];
}
};
-
-beforeEach(() => {
- storage = {};
-});
-
-copyProps(window, global);
diff --git a/public/models/idea.ts b/public/models/idea.ts
index 22bd6ee4c..c5066f281 100644
--- a/public/models/idea.ts
+++ b/public/models/idea.ts
@@ -10,7 +10,7 @@ export interface Idea {
status: number;
user: User;
viewerSupported: boolean;
- response: IdeaResponse;
+ response: IdeaResponse | null;
totalSupporters: number;
totalComments: number;
tags: string[];
diff --git a/public/pages/Administration/components/SideMenu.tsx b/public/pages/Administration/components/SideMenu.tsx
index eb05e2b7c..e30180bc5 100644
--- a/public/pages/Administration/components/SideMenu.tsx
+++ b/public/pages/Administration/components/SideMenu.tsx
@@ -2,7 +2,7 @@ import "./SideMenu.scss";
import * as React from "react";
import { CurrentUser } from "@fider/models";
-import { classSet } from "@fider/services";
+import { classSet, Fider } from "@fider/services";
import { FiderVersion } from "@fider/components";
interface SiteMenuProps {
diff --git a/public/pages/Administration/components/TagListItem.tsx b/public/pages/Administration/components/TagListItem.tsx
index aca27a9b7..69258dd23 100644
--- a/public/pages/Administration/components/TagListItem.tsx
+++ b/public/pages/Administration/components/TagListItem.tsx
@@ -4,7 +4,7 @@ import * as React from "react";
import { Tag, CurrentUser } from "@fider/models";
import { ListItem, ShowTag, Button } from "@fider/components";
import { TagFormState, TagForm } from "./";
-import { actions, Failure } from "@fider/services";
+import { actions, Failure, Fider } from "@fider/services";
interface TagListItemProps {
tag: Tag;
diff --git a/public/pages/Administration/pages/AdvancedSettings.page.tsx b/public/pages/Administration/pages/AdvancedSettings.page.tsx
index 33fa80607..266cf9349 100644
--- a/public/pages/Administration/pages/AdvancedSettings.page.tsx
+++ b/public/pages/Administration/pages/AdvancedSettings.page.tsx
@@ -5,7 +5,7 @@ import * as React from "react";
import { CurrentUser } from "@fider/models";
import { AdminBasePage } from "../components";
import { DisplayError, TextArea, Form, Button, ButtonClickEvent } from "@fider/components";
-import { Failure, actions } from "@fider/services";
+import { Failure, actions, Fider } from "@fider/services";
interface AdvancedSettingsPageProps {
customCSS: string;
diff --git a/public/pages/Administration/pages/GeneralSettings.page.tsx b/public/pages/Administration/pages/GeneralSettings.page.tsx
index 714b796e8..ce8f05346 100644
--- a/public/pages/Administration/pages/GeneralSettings.page.tsx
+++ b/public/pages/Administration/pages/GeneralSettings.page.tsx
@@ -3,7 +3,7 @@ import "./GeneralSettings.page.scss";
import * as React from "react";
import { Button, ButtonClickEvent, TextArea, DisplayError, Logo, Form, Input, Field } from "@fider/components/common";
-import { actions, Failure, fileToBase64 } from "@fider/services";
+import { actions, Failure, fileToBase64, Fider } from "@fider/services";
import { AdminBasePage } from "../components";
interface GeneralSettingsPageProps {
diff --git a/public/pages/Administration/pages/Invitations.page.tsx b/public/pages/Administration/pages/Invitations.page.tsx
index a797ebd00..02920673e 100644
--- a/public/pages/Administration/pages/Invitations.page.tsx
+++ b/public/pages/Administration/pages/Invitations.page.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
import { SystemSettings, CurrentUser, Tenant } from "@fider/models";
import { Button, ButtonClickEvent, TextArea, DisplayError, Form, Input, Field } from "@fider/components";
-import { actions, notify, Failure } from "@fider/services";
+import { actions, notify, Failure, Fider } from "@fider/services";
import { AdminBasePage } from "../components";
interface InvitationsPageState {
diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsx
index 7e98339a4..bf045d362 100644
--- a/public/pages/Administration/pages/ManageMembers.page.tsx
+++ b/public/pages/Administration/pages/ManageMembers.page.tsx
@@ -3,7 +3,7 @@ import "./ManageMembers.page.scss";
import * as React from "react";
import { Button, Gravatar, UserName, Segment, ListItem, List, Input, Form } from "@fider/components/common";
import { User, CurrentUser, UserRole } from "@fider/models";
-import { actions } from "@fider/services";
+import { actions, Fider } from "@fider/services";
import { AdminBasePage, UserListItem } from "../components";
interface ManageMembersPageState {
diff --git a/public/pages/Administration/pages/ManageTags.page.tsx b/public/pages/Administration/pages/ManageTags.page.tsx
index 9c6caca28..c6751aa5d 100644
--- a/public/pages/Administration/pages/ManageTags.page.tsx
+++ b/public/pages/Administration/pages/ManageTags.page.tsx
@@ -5,7 +5,7 @@ import { ShowTag, Button, Gravatar, UserName, Segment, List, ListItem, Heading }
import { AdminBasePage, TagForm, TagFormState, TagListItem } from "../components";
import { Tag, CurrentUser, UserRole } from "@fider/models";
-import { actions, Failure } from "@fider/services";
+import { actions, Failure, Fider } from "@fider/services";
interface ManageTagsPageProps {
tags: Tag[];
diff --git a/public/pages/Administration/pages/PrivacySettings.page.tsx b/public/pages/Administration/pages/PrivacySettings.page.tsx
index 233be3ba9..9532881dc 100644
--- a/public/pages/Administration/pages/PrivacySettings.page.tsx
+++ b/public/pages/Administration/pages/PrivacySettings.page.tsx
@@ -4,7 +4,7 @@ import * as React from "react";
import { SystemSettings, CurrentUser, Tenant } from "@fider/models";
import { Button, ButtonClickEvent, DisplayError, Toggle, Form } from "@fider/components/common";
-import { actions, notify, Failure } from "@fider/services";
+import { actions, notify, Failure, Fider } from "@fider/services";
import { AdminBasePage } from "../components";
interface PrivacySettingsPageState {
diff --git a/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx b/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx
index c53edeb8f..3369903ea 100644
--- a/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx
+++ b/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
import { HomePage, HomePageProps, SignInPage } from "../";
import { Modal, Button, Form, Input, LegalFooter } from "@fider/components";
-import { actions, Failure, querystring } from "@fider/services";
+import { actions, Failure, querystring, Fider } from "@fider/services";
interface CompleteSignInProfilePageState {
name: string;
diff --git a/public/pages/Home/Home.page.tsx b/public/pages/Home/Home.page.tsx
index 13d7ad961..eb9284b08 100644
--- a/public/pages/Home/Home.page.tsx
+++ b/public/pages/Home/Home.page.tsx
@@ -4,7 +4,7 @@ import * as React from "react";
import { Idea, Tag, IdeaStatus } from "@fider/models";
import { MultiLineText } from "@fider/components";
import { IdeaInput, ListIdeas, IdeasContainer } from "./";
-import { actions } from "@fider/services";
+import { actions, Fider } from "@fider/services";
import { SimilarIdeas } from "./components/SimilarIdeas";
export interface HomePageProps {
diff --git a/public/pages/Home/components/IdeaFilter.tsx b/public/pages/Home/components/IdeaFilter.tsx
index 9a485b24c..042b89c2a 100644
--- a/public/pages/Home/components/IdeaFilter.tsx
+++ b/public/pages/Home/components/IdeaFilter.tsx
@@ -1,6 +1,7 @@
import * as React from "react";
import { Idea, IdeaStatus, CurrentUser } from "@fider/models";
import { Dropdown, DropdownItemProps, DropdownProps } from "@fider/components";
+import { Fider } from "@fider/services";
interface IdeaFilterProps {
activeFilter: string;
diff --git a/public/pages/Home/components/IdeaInput.tsx b/public/pages/Home/components/IdeaInput.tsx
index bdad67035..904f72794 100644
--- a/public/pages/Home/components/IdeaInput.tsx
+++ b/public/pages/Home/components/IdeaInput.tsx
@@ -1,7 +1,7 @@
import * as React from "react";
import { DisplayError, Button, ButtonClickEvent, Input, Form, TextArea } from "@fider/components";
import { SignInModal } from "@fider/components";
-import { cache, actions, Failure } from "@fider/services";
+import { cache, actions, Failure, Fider } from "@fider/services";
import { CurrentUser } from "@fider/models";
interface IdeaInputProps {
diff --git a/public/pages/Home/components/IdeasContainer.tsx b/public/pages/Home/components/IdeasContainer.tsx
index 56621df54..29c61ec06 100644
--- a/public/pages/Home/components/IdeasContainer.tsx
+++ b/public/pages/Home/components/IdeasContainer.tsx
@@ -1,10 +1,10 @@
import * as React from "react";
-import { IdeaInput, ListIdeas, TagsFilter, IdeaFilter } from "../";
+import { ListIdeas, TagsFilter, IdeaFilter } from "../";
-import { Idea, Tag, IdeaStatus, CurrentUser } from "@fider/models";
-import { Loader, MultiLineText, Heading, Field, Input } from "@fider/components";
-import { actions, querystring } from "@fider/services";
+import { Idea, Tag, CurrentUser } from "@fider/models";
+import { Loader, Field, Input } from "@fider/components";
+import { actions, navigator, querystring } from "@fider/services";
interface IdeasContainerProps {
user?: CurrentUser;
@@ -42,7 +42,7 @@ export class IdeasContainer extends React.Component<IdeasContainerProps, IdeasCo
): void {
this.setState(obj, () => {
const query = this.state.query.trim().toLowerCase();
- actions.replaceState(
+ navigator.replaceState(
querystring.stringify({
t: this.state.tags,
q: query,
diff --git a/public/pages/MySettings/MySettings.page.tsx b/public/pages/MySettings/MySettings.page.tsx
index bcc30b605..dadf077d9 100644
--- a/public/pages/MySettings/MySettings.page.tsx
+++ b/public/pages/MySettings/MySettings.page.tsx
@@ -6,7 +6,7 @@ import { Modal, Form, DisplayError, Button, Gravatar, Heading, Field, Input } fr
import { DangerZone, NotificationSettings } from "./";
import { CurrentUser, UserSettings } from "@fider/models";
-import { Failure, actions } from "@fider/services";
+import { Failure, actions, Fider } from "@fider/services";
interface MySettingsPageState {
showModal: boolean;
diff --git a/public/pages/MySettings/components/DangerZone.tsx b/public/pages/MySettings/components/DangerZone.tsx
index aa71d3098..34a7d68bc 100644
--- a/public/pages/MySettings/components/DangerZone.tsx
+++ b/public/pages/MySettings/components/DangerZone.tsx
@@ -1,8 +1,7 @@
import * as React from "react";
-import { CurrentUser, UserSettings } from "@fider/models";
-import { Toggle, Segment, Segments, Field, Button, Modal, ButtonClickEvent } from "@fider/components";
-import { actions, notify } from "@fider/services";
+import { Button, Modal, ButtonClickEvent } from "@fider/components";
+import { actions, notify, navigator } from "@fider/services";
interface DangerZoneState {
clicked: boolean;
@@ -28,7 +27,7 @@ export class DangerZone extends React.Component<{}, DangerZoneState> {
const response = await actions.deleteCurrentAccount();
if (response.ok) {
e.preventEnable();
- actions.goHome();
+ navigator.goHome();
} else {
notify.error("Failed to delete your account. Try again later");
}
diff --git a/public/pages/MySettings/components/NotificationSettings.tsx b/public/pages/MySettings/components/NotificationSettings.tsx
index 35838f21d..1b812169a 100644
--- a/public/pages/MySettings/components/NotificationSettings.tsx
+++ b/public/pages/MySettings/components/NotificationSettings.tsx
@@ -2,6 +2,7 @@ import * as React from "react";
import { CurrentUser, UserSettings } from "@fider/models";
import { Toggle, Segment, Segments, Field } from "@fider/components";
+import { Fider } from "@fider/services";
interface NotificationSettingsProps {
userSettings: UserSettings;
diff --git a/public/pages/ShowIdea/ShowIdea.page.tsx b/public/pages/ShowIdea/ShowIdea.page.tsx
index 9303af73c..ae65d0d5c 100644
--- a/public/pages/ShowIdea/ShowIdea.page.tsx
+++ b/public/pages/ShowIdea/ShowIdea.page.tsx
@@ -3,7 +3,7 @@ import "./ShowIdea.page.scss";
import * as React from "react";
import { Comment, Idea, Tag } from "@fider/models";
-import { actions, Failure } from "@fider/services";
+import { actions, Failure, Fider } from "@fider/services";
import { TagsPanel, DiscussionPanel, ResponseForm, NotificationsPanel, ModerationPanel } from "./";
import {
diff --git a/public/pages/ShowIdea/components/CommentInput.tsx b/public/pages/ShowIdea/components/CommentInput.tsx
index 158a7d3b1..8fa027963 100644
--- a/public/pages/ShowIdea/components/CommentInput.tsx
+++ b/public/pages/ShowIdea/components/CommentInput.tsx
@@ -5,7 +5,7 @@ import { Idea, CurrentUser } from "@fider/models";
import { Gravatar, UserName, Button, DisplayError, SignInControl, TextArea, Form } from "@fider/components/common";
import { SignInModal } from "@fider/components";
-import { cache, actions, Failure } from "@fider/services";
+import { cache, actions, Failure, Fider } from "@fider/services";
interface CommentInputProps {
idea: Idea;
diff --git a/public/pages/ShowIdea/components/ModerationPanel.tsx b/public/pages/ShowIdea/components/ModerationPanel.tsx
index 2ebef7c6e..99332026b 100644
--- a/public/pages/ShowIdea/components/ModerationPanel.tsx
+++ b/public/pages/ShowIdea/components/ModerationPanel.tsx
@@ -1,7 +1,7 @@
import * as React from "react";
-import { IdeaStatus, CurrentUser, Idea } from "@fider/models";
-import { actions, Failure } from "@fider/services";
-import { Form, DisplayError, Modal, Button, List, ListItem, TextArea } from "@fider/components";
+import { IdeaStatus, Idea } from "@fider/models";
+import { actions, navigator, Failure, Fider } from "@fider/services";
+import { Form, Modal, Button, List, ListItem, TextArea } from "@fider/components";
interface ModerationPanelProps {
idea: Idea;
@@ -28,7 +28,7 @@ export class ModerationPanel extends React.Component<ModerationPanelProps, Moder
const response = await actions.deleteIdea(this.props.idea.number, this.state.text);
if (response.ok) {
await this.closeModal();
- actions.goHome();
+ navigator.goHome();
} else if (response.error) {
this.setState({ error: this.state.error });
}
diff --git a/public/pages/ShowIdea/components/NotificationsPanel.tsx b/public/pages/ShowIdea/components/NotificationsPanel.tsx
index 9ebe74703..c3e2aa2b9 100644
--- a/public/pages/ShowIdea/components/NotificationsPanel.tsx
+++ b/public/pages/ShowIdea/components/NotificationsPanel.tsx
@@ -1,7 +1,7 @@
import * as React from "react";
import { CurrentUser, Idea } from "@fider/models";
import { Button, List, ListItem } from "@fider/components";
-import { actions } from "@fider/services";
+import { actions, Fider } from "@fider/services";
interface NotificationsPanelProps {
idea: Idea;
diff --git a/public/pages/ShowIdea/components/ShowComment.tsx b/public/pages/ShowIdea/components/ShowComment.tsx
index b804218cd..f47861a1e 100644
--- a/public/pages/ShowIdea/components/ShowComment.tsx
+++ b/public/pages/ShowIdea/components/ShowComment.tsx
@@ -1,7 +1,7 @@
import * as React from "react";
import { Comment, CurrentUser, Idea } from "@fider/models";
import { Gravatar, UserName, Moment, Form, TextArea, Button, MultiLineText } from "@fider/components";
-import { formatDate, Failure, actions } from "@fider/services";
+import { formatDate, Failure, actions, Fider } from "@fider/services";
interface ShowCommentProps {
idea: Idea;
diff --git a/public/pages/ShowIdea/components/TagsPanel.tsx b/public/pages/ShowIdea/components/TagsPanel.tsx
index 3947d50ad..52453a45f 100644
--- a/public/pages/ShowIdea/components/TagsPanel.tsx
+++ b/public/pages/ShowIdea/components/TagsPanel.tsx
@@ -1,6 +1,6 @@
import * as React from "react";
import { CurrentUser, Tag, Idea } from "@fider/models";
-import { actions } from "@fider/services";
+import { actions, Fider } from "@fider/services";
import { ShowTag, List, ListItem } from "@fider/components";
import { TagListItem } from "./TagListItem";
diff --git a/public/pages/SignIn/SignIn.page.tsx b/public/pages/SignIn/SignIn.page.tsx
index 31e7c1fda..f142c4450 100644
--- a/public/pages/SignIn/SignIn.page.tsx
+++ b/public/pages/SignIn/SignIn.page.tsx
@@ -2,7 +2,7 @@ import "./SignIn.page.scss";
import * as React from "react";
import { SignInControl, Logo, LegalNotice } from "@fider/components";
-import { notify } from "@fider/services";
+import { notify, Fider } from "@fider/services";
import { Tenant } from "@fider/models";
export class SignInPage extends React.Component<{}, {}> {
diff --git a/public/pages/SignUp/SignUp.page.tsx b/public/pages/SignUp/SignUp.page.tsx
index 979d958af..1e3823901 100644
--- a/public/pages/SignUp/SignUp.page.tsx
+++ b/public/pages/SignUp/SignUp.page.tsx
@@ -2,7 +2,7 @@ import "./SignUp.page.scss";
import * as React from "react";
import { SignInControl, Modal, Button, DisplayError, Form, Input, Message, LegalAgreement } from "@fider/components";
-import { jwt, actions, Failure, querystring } from "@fider/services";
+import { jwt, actions, Failure, querystring, Fider } from "@fider/services";
interface OAuthUser {
token: string;
diff --git a/public/services/actions/index.ts b/public/services/actions/index.ts
index d0524cf3a..5a997c828 100644
--- a/public/services/actions/index.ts
+++ b/public/services/actions/index.ts
@@ -5,14 +5,3 @@ export * from "./tenant";
export * from "./notification";
export * from "./invite";
export { Failure } from "@fider/services/http";
-
-export const goHome = () => {
- window.location.href = "/";
-};
-
-export const replaceState = (path: string): void => {
- if (history.replaceState) {
- const newUrl = Fider.settings.baseURL + path;
- window.history.replaceState({ path: newUrl }, "", newUrl);
- }
-};
diff --git a/public/fider.ts b/public/services/fider.ts
similarity index 83%
rename from public/fider.ts
rename to public/services/fider.ts
index 39510369b..8e0b9e9d1 100644
--- a/public/fider.ts
+++ b/public/services/fider.ts
@@ -28,14 +28,15 @@ export class FiderSession {
}
}
-export class Fider {
- private pSettings: SystemSettings;
- private pSession: FiderSession;
+export class FiderImpl {
+ private pSettings!: SystemSettings;
+ private pSession!: FiderSession;
- constructor() {
+ public initialize = (): FiderImpl => {
this.pSettings = window.__settings;
this.pSession = new FiderSession();
- }
+ return this;
+ };
public get session(): FiderSession {
return this.pSession;
@@ -53,3 +54,5 @@ export class Fider {
return this.pSettings.mode === "single";
}
}
+
+export let Fider = new FiderImpl();
diff --git a/public/services/http.ts b/public/services/http.ts
index 5f5b24f07..98140c7ae 100644
--- a/public/services/http.ts
+++ b/public/services/http.ts
@@ -46,10 +46,10 @@ export const http = {
get: async <T = void>(url: string): Promise<Result<T>> => {
return await request<T>(url, "GET");
},
- post: async <T = void>(url: string, body?: any): Promise<Result<T>> => {
+ post: async <T = void>(url: string, body?: {}): Promise<Result<T>> => {
return await request<T>(url, "POST", body);
},
- delete: async <T = void>(url: string, body?: any): Promise<Result<T>> => {
+ delete: async <T = void>(url: string, body?: {}): Promise<Result<T>> => {
return await request<T>(url, "DELETE", body);
},
event: (category: string, action: string) => <T>(result: Result<T>): Result<T> => {
diff --git a/public/services/index.ts b/public/services/index.ts
index f6bb9b573..03ff4ec8a 100644
--- a/public/services/index.ts
+++ b/public/services/index.ts
@@ -1,6 +1,7 @@
export * from "./http";
export * from "./cache";
export * from "./analytics";
+export * from "./fider";
export * from "./jwt";
export * from "./utils";
import * as markdown from "./markdown";
@@ -8,4 +9,5 @@ import * as notify from "./notify";
import * as querystring from "./querystring";
import * as device from "./device";
import * as actions from "./actions";
-export { actions, querystring, device, notify, markdown };
+import navigator from "./navigator";
+export { actions, querystring, navigator, device, notify, markdown };
diff --git a/public/services/jwt.spec.ts b/public/services/jwt.spec.ts
new file mode 100644
index 000000000..a7c218654
--- /dev/null
+++ b/public/services/jwt.spec.ts
@@ -0,0 +1,23 @@
+import { jwt } from "./jwt";
+
+[
+ {
+ expected: {
+ sub: "1234567890",
+ name: "John Snow",
+ age: "30",
+ iat: 1516239022
+ },
+ token:
+ "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gU25vdyIsImFnZSI6IjMwIiwiaWF0IjoxNTE2MjM5MDIyfQ.A4e171Ry70APUJ2a9uo9G9Aju9G08AJB_Cr9B9ivX-o"
+ },
+ {
+ expected: undefined,
+ token: "wrong"
+ }
+].forEach(x => {
+ test(`decode('${x.token}') should be ${x.expected}`, () => {
+ const result = jwt.decode(x.token);
+ expect(result).toEqual(x.expected);
+ });
+});
diff --git a/public/services/navigator.ts b/public/services/navigator.ts
new file mode 100644
index 000000000..f3c61a195
--- /dev/null
+++ b/public/services/navigator.ts
@@ -0,0 +1,18 @@
+import { Fider } from "@fider/services";
+
+const navigator = {
+ url: () => {
+ return window.location.href;
+ },
+ goHome: () => {
+ window.location.href = "/";
+ },
+ replaceState: (path: string): void => {
+ if (history.replaceState) {
+ const newUrl = Fider.settings.baseURL + path;
+ window.history.replaceState({ path: newUrl }, "", newUrl);
+ }
+ }
+};
+
+export default navigator;
diff --git a/public/services/querystring.spec.ts b/public/services/querystring.spec.ts
new file mode 100644
index 000000000..2a1134567
--- /dev/null
+++ b/public/services/querystring.spec.ts
@@ -0,0 +1,70 @@
+import * as qs from "./querystring";
+import navigator from "./navigator";
+
+[
+ { qs: "?name=John&age=30", name: "name", expected: "John" },
+ { qs: "?name=John&age=30", name: "age", expected: "30" },
+ { qs: "?name=", name: "name", expected: "" },
+ { qs: "", name: "name", expected: "" }
+].forEach(x => {
+ test(`get('${x.name}') should be ${x.expected}`, () => {
+ navigator.url = () => `http://example.com${x.qs}`;
+ const result = qs.get(x.name);
+ expect(result).toEqual(x.expected);
+ });
+});
+
+[
+ { qs: "?name=John,Arya&age=30", name: "name", expected: ["John", "Arya"] },
+ { qs: "?name=John&age=30", name: "age", expected: ["30"] },
+ { qs: "?name=", name: "name", expected: [] },
+ { qs: "", name: "name", expected: [] }
+].forEach(x => {
+ test(`getArray('${x.name}') should be ${x.expected}`, () => {
+ navigator.url = () => `http://example.com${x.qs}`;
+ const result = qs.getArray(x.name);
+ expect(result).toEqual(x.expected);
+ });
+});
+
+[
+ { qs: "?name=John&age=30", name: "age", expected: 30 },
+ { qs: "?name=", name: "name", expected: undefined },
+ { qs: "", name: "name", expected: undefined }
+].forEach(x => {
+ test(`getNumber('${x.name}') should be ${x.expected}`, () => {
+ navigator.url = () => `http://example.com${x.qs}`;
+ const result = qs.getNumber(x.name);
+ expect(result).toEqual(x.expected);
+ });
+});
+
+[
+ { object: {}, expected: "" },
+ { object: undefined, expected: "" },
+ {
+ object: {
+ name: "John"
+ },
+ expected: "?name=John"
+ },
+ {
+ object: {
+ name: "John",
+ age: 30
+ },
+ expected: "?name=John&age=30"
+ },
+ {
+ object: {
+ tags: ["bug", "feature"],
+ age: 30
+ },
+ expected: "?tags=bug,feature&age=30"
+ }
+].forEach(x => {
+ test(`stringfy('${x.object}') should be ${x.expected}`, () => {
+ const result = qs.stringify(x.object);
+ expect(result).toEqual(x.expected);
+ });
+});
diff --git a/public/services/querystring.ts b/public/services/querystring.ts
index 3868a518d..53ac919d5 100644
--- a/public/services/querystring.ts
+++ b/public/services/querystring.ts
@@ -1,14 +1,13 @@
-import { SystemSettings } from "@fider/models";
+import navigator from "./navigator";
export const getNumber = (name: string): number | undefined => {
return parseInt(get(name), 10) || undefined;
};
export const get = (name: string): string => {
- const url = window.location.href;
name = name.replace(/[\[\]]/g, "\\$&");
const regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)");
- const results = regex.exec(url);
+ const results = regex.exec(navigator.url());
if (!results || !results[2]) {
return "";
@@ -30,7 +29,7 @@ export interface QueryString {
[key: string]: string | string[] | number | undefined;
}
-export const stringify = (object: QueryString): string => {
+export const stringify = (object: QueryString | undefined): string => {
if (!object) {
return "";
}
diff --git a/public/services/testing/fider.ts b/public/services/testing/fider.ts
new file mode 100644
index 000000000..f7b83b224
--- /dev/null
+++ b/public/services/testing/fider.ts
@@ -0,0 +1,20 @@
+import { Fider } from "@fider/services";
+
+export const fiderMock = {
+ notAuthenticated: () => {
+ Fider.initialize();
+ Object.defineProperty(Fider.session, "isAuthenticated", {
+ get() {
+ return false;
+ }
+ });
+ },
+ authenticated: () => {
+ Fider.initialize();
+ Object.defineProperty(Fider.session, "isAuthenticated", {
+ get() {
+ return true;
+ }
+ });
+ }
+};
diff --git a/public/services/testing/http.ts b/public/services/testing/http.ts
new file mode 100644
index 000000000..108f4019b
--- /dev/null
+++ b/public/services/testing/http.ts
@@ -0,0 +1,15 @@
+import { http } from "@fider/services";
+
+export const httpMock = {
+ alwaysOk: () => {
+ const fn = jest.fn(() => {
+ return Promise.resolve({
+ ok: true
+ });
+ });
+ http.get = fn;
+ http.post = fn;
+ http.delete = fn;
+ return fn;
+ }
+};
diff --git a/public/services/testing/index.ts b/public/services/testing/index.ts
new file mode 100644
index 000000000..8b9541759
--- /dev/null
+++ b/public/services/testing/index.ts
@@ -0,0 +1,3 @@
+export * from "./http";
+export * from "./fider";
+export * from "./react";
diff --git a/public/services/testing/react.ts b/public/services/testing/react.ts
new file mode 100644
index 000000000..756d727b7
--- /dev/null
+++ b/public/services/testing/react.ts
@@ -0,0 +1,8 @@
+import { ShallowWrapper } from "enzyme";
+
+const flushPromises = () => new Promise(resolve => setImmediate(resolve));
+
+export const rerender = async (component: ShallowWrapper<any, any, any>) => {
+ await flushPromises();
+ return component.update();
+};
diff --git a/public/tsd.d.ts b/public/tsd.d.ts
index 11be9982e..3cbfa96db 100644
--- a/public/tsd.d.ts
+++ b/public/tsd.d.ts
@@ -1,5 +1,4 @@
import { CurrentUser, SystemSettings, Tenant } from "@fider/models";
-import { Fider } from "./fider";
declare global {
interface Window {
@@ -10,8 +9,6 @@ declare global {
__tenant: Tenant;
__settings: SystemSettings;
}
-
- var Fider: Fider;
}
declare var require: (id: string) => any;
diff --git a/tests/lib/mailgun/index.ts b/tests/lib/mailgun.ts
similarity index 87%
rename from tests/lib/mailgun/index.ts
rename to tests/lib/mailgun.ts
index bda9d3b21..6d693d7db 100644
--- a/tests/lib/mailgun/index.ts
+++ b/tests/lib/mailgun.ts
@@ -2,7 +2,7 @@ require("dotenv").config();
import { parse as parseURL } from "url";
import * as http from "http";
import * as https from "https";
-import { delay } from "../";
+import { delay } from "./";
const httpGet = (endpoint: string): Promise<any> => {
const url = parseURL(endpoint);
@@ -29,9 +29,14 @@ export const mailgun = {
do {
count++;
- const url = `https://api.mailgun.net/v3/${
+
+ let url = `https://api.mailgun.net/v3/${
process.env.EMAIL_MAILGUN_DOMAIN
- }/events?to=${to}&tags=tenant:${tenant}&event=accepted&limit=1&ascending=no`;
+ }/events?to=${to}&event=accepted&limit=1&ascending=no`;
+ if (tenant) {
+ url += `&tags=tenant:${tenant}`;
+ }
+
const events = await httpGet(url);
if (events.items.length > 0 && events.items[0].recipient === to) {
messageUrl = events.items[0].storage.url;
diff --git a/tests/single.spec.ts b/tests/single.spec.ts
index 4722e3f28..2659f7c44 100644
--- a/tests/single.spec.ts
+++ b/tests/single.spec.ts
@@ -1,3 +1,3 @@
process.env.HOST_MODE = "single";
jest.setTimeout(30000);
-require("./scenarios/feedback-loop");
+require("./scenarios/index");
diff --git a/tsconfig.json b/tsconfig.json
index 62024e501..26969b925 100755
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,8 @@
"react",
"react-dom",
"react-textarea-autosize",
- "jest"
+ "jest",
+ "node"
],
"outDir": "./output/public",
"jsx": "react",