Skip to content

Commit

Permalink
Merge pull request #8 from 4Catalyzer/update
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
taion authored Nov 15, 2017
2 parents fe6d269 + b531e13 commit 5023b9d
Show file tree
Hide file tree
Showing 7 changed files with 4,223 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
["latest", {
"es2015": { "loose": true }
["env", {
"loose": true
}],
"stage-1",
"react"
Expand Down
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ env:
- BROWSER=ChromeCi
- BROWSER=Firefox

cache:
directories:
- node_modules
cache: yarn

before_install:
- export CHROME_BIN=chromium-browser
Expand Down
43 changes: 25 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
"testonly": "jest --runInBand --verbose",
"test": "npm run lint && npm run testonly"
},
"jest": {
"setupFiles": [
"<rootDir>/test/setup.js"
]
},
"repository": {
"type": "git",
"url": "git+https://github.com/4Catalyzer/found-scroll.git"
Expand All @@ -30,32 +35,34 @@
"homepage": "https://github.com/4Catalyzer/found-scroll#readme",
"dependencies": {
"farce": "^0.2.1",
"prop-types": "^15.5.6",
"prop-types": "^15.6.0",
"scroll-behavior": "^0.9.3"
},
"peerDependencies": {
"found": ">=0.1.0",
"react": ">=0.14.0"
"react": "^0.14.9 || >=15.3.0"
},
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-eslint": "^7.2.1",
"babel-jest": "^19.0.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "^7.2.3",
"babel-jest": "^21.2.0",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-preset-latest": "^6.24.1",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-1": "^6.24.1",
"enzyme": "^2.8.0",
"eslint": "^3.19.0",
"eslint-config-4catalyzer-react": "^0.2.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.10.3",
"found": "^0.2.2",
"jest": "^19.0.2",
"react": "^15.5.3",
"react-addons-test-utils": "^15.5.1",
"react-dom": "^15.5.3",
"rimraf": "^2.6.1"
"enzyme": "^3.0.0",
"enzyme-adapter-react-16": "^1.0.0",
"eslint": "^4.7.2",
"eslint-config-4catalyzer-react": "^0.3.2",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-jsx-a11y": "^5.1.1",
"eslint-plugin-react": "^7.4.0",
"found": "^0.3.4",
"jest": "^21.2.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0",
"rimraf": "^2.6.2"
}
}
6 changes: 3 additions & 3 deletions test/ScrollManager.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mount } from 'enzyme';

import ScrollManager from '../src/ScrollManager';

const CustomCompoment = () => <div />;
const CustomComponent = () => <div />;

const location = {};
const router = {
Expand Down Expand Up @@ -39,10 +39,10 @@ it('should render children', () => {

wrapper = mount(
<ScrollManager renderArgs={initialRenderArgs}>
<CustomCompoment />
<CustomComponent />
</ScrollManager>,
);
expect(wrapper.find(CustomCompoment)).toHaveLength(1);
expect(wrapper.find(CustomComponent)).toHaveLength(1);
});

it('should call updateScroll if location changed', () => {
Expand Down
3 changes: 1 addition & 2 deletions test/index.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { ScrollManager } from '../src/';

import { ScrollManager } from '../src';

it('exports ScrollManager', () => {
expect(ScrollManager).toBeDefined();
Expand Down
4 changes: 4 additions & 0 deletions test/setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';

Enzyme.configure({ adapter: new Adapter() });
Loading

0 comments on commit 5023b9d

Please sign in to comment.