Merge pull request #103 from iCHEF/CJ/upgrade_jest

Upgrade jest to v21
iCHEF · Oct 26, 2017 · faf1824 · faf1824
2 parents d7ec983 + 5aa9045
commit faf1824
Show file tree

Hide file tree

Showing 7 changed files with 355 additions and 319 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Upgrade storybook libraries to v3.2.12, also fix the API changes of `storybook-addon-info`.  (#93)(#95)
 - Deprecate `escapable()` mixin in favor of new `closable()`.
 - The `padding` option for `anchored()` is renamed to `edgePadding` for better understanding.
+- Upgrade webpack of main package to v3. (#101)
+- Upgrade jest to v21.2. (#103)
+
+### Bugs Fix
+- [InfiniteScroll] Attach scroll listener when the `scrollNode` is existing.
+- [storybook] Fix <InfiniteScroll> stories.
 
 ### Breaking
 - `<Tooltip>` now default-exports an anchored version. `<AnchoredTooltip>` is removed from bundle.

diff --git a/configs/jest.config.json b/configs/jest.config.json
@@ -1,9 +1,9 @@
 {
+    "rootDir": "../",
     "coverageReporters": ["cobertura", "lcov", "text"],
     "moduleNameMapper": {
          "\\.(css|scss|sass|md|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|)$": "<rootDir>/__mocks__/fileMock.js"
     },
-    "testRegex": "(/__tests__/.*.(test|spec))\\.jsx?$",
     "transformIgnorePatterns": [
       "<rootDir>/node_modules/(?!@ichef/)"
     ]

diff --git a/package.json b/package.json
@@ -37,15 +37,15 @@
     "babel-cli": "^6.23.0",
     "babel-core": "^6.23.1",
     "babel-eslint": "^7.1.1",
-    "babel-jest": "^19.0.0",
+    "babel-jest": "^21.2.0",
     "babel-loader": "^6.3.2",
     "babel-plugin-module-resolver": "^3.0.0-beta.5",
     "babel-plugin-strip-css-imports": "zhusee2/babel-plugin-strip-css-imports",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.2.1",
     "babel-preset-react": "^6.23.0",
     "babel-preset-stage-2": "^6.22.0",
-    "coveralls": "^2.13.1",
+    "coveralls": "^3.0.0",
     "css-loader": "^0.28.7",
     "eslint": "^3.17.1",
     "eslint-config-airbnb": "^14.1.0",
@@ -59,7 +59,7 @@
     "extract-text-webpack-plugin": "^3.0.1",
     "file-loader": "^1.1.5",
     "flow-bin": "^0.47.0",
-    "jest": "^19.0.2",
+    "jest": "^21.2.1",
     "lerna": "^2.4.0",
     "node-sass": "^4.5.3",
     "postcss-loader": "^2.0.8",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -47,7 +47,7 @@
   "devDependencies": {
     "babel-cli": "^6.23.0",
     "enzyme": "^2.8.2",
-    "sinon": "^2.2.0",
+    "sinon": "^4.0.1",
     "webpack": "^3.8.1"
   }
 }
diff --git a/packages/core/src/InfiniteScroll.js b/packages/core/src/InfiniteScroll.js
@@ -197,10 +197,12 @@ class InfiniteScroll extends PureComponent {
         const { usePageAsContainer } = this.props;
         this.scrollContainer = usePageAsContainer
             ? window
-            : this.scrollNode.parentNode;
+            : this.scrollNode && this.scrollNode.parentNode;
 
-        this.scrollContainer
-            .addEventListener('scroll', this.handleScrollListener);
+        if (this.scrollContainer) {
+            this.scrollContainer
+                .addEventListener('scroll', this.handleScrollListener);
+        }
     }
 
     detachScrollListener = () => {

diff --git a/packages/storybook/examples/InfiniteScroll/index.js b/packages/storybook/examples/InfiniteScroll/index.js
@@ -11,13 +11,13 @@ import PageAsContainerExample from './PageAsContainer';
 storiesOf('InfiniteScroll', module)
     .add('basic usage',
         withInfo('placed in a fixed height container')(
-            <BasicUsageExample />
+            () => <BasicUsageExample />
         )
     )
     .add('page as scroll container',
-        withInfo()(
+        withInfo({ inline: false })(
             () => <PageAsContainerExample />
-        )({ source: false })
+        )
     )
     // Props table
     .addPropsTable(