Skip to content

Commit

Permalink
Merge branch 'develop' into chore/misc-doc-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
bobylito authored Oct 23, 2017
2 parents 8c2f36b + 54e134e commit 5e15c4f
Show file tree
Hide file tree
Showing 7 changed files with 295 additions and 1,299 deletions.
2 changes: 1 addition & 1 deletion docgen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"algolia-frontend-components": "0.0.34",
"autoprefixer": "7.1.5",
"autoprefixer": "7.1.6",
"babel-cli": "6.26.0",
"babel-loader": "6.4.1",
"babel-preset-env": "1.6.0",
Expand Down
16 changes: 10 additions & 6 deletions docgen/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,12 @@ atob@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"

autoprefixer@7.1.5:
version "7.1.5"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.5.tgz#d65d14b83c7cd1dd7bc801daa00557addf5a06b2"
autoprefixer@7.1.6:
version "7.1.6"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.6.tgz#fb933039f74af74a83e71225ce78d9fd58ba84d7"
dependencies:
browserslist "^2.5.0"
caniuse-lite "^1.0.30000744"
browserslist "^2.5.1"
caniuse-lite "^1.0.30000748"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.13"
Expand Down Expand Up @@ -1410,7 +1410,7 @@ browserslist@^2.1.2:
caniuse-lite "^1.0.30000718"
electron-to-chromium "^1.3.18"

browserslist@^2.5.0:
browserslist@^2.5.1:
version "2.5.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.5.1.tgz#68e4bc536bbcc6086d62843a2ffccea8396821c6"
dependencies:
Expand Down Expand Up @@ -1506,6 +1506,10 @@ caniuse-lite@^1.0.30000744:
version "1.0.30000746"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000746.tgz#c64f95a3925cfd30207a308ed76c1ae96ea09ea0"

caniuse-lite@^1.0.30000748:
version "1.0.30000748"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000748.tgz#44c8d6da52ad65a5d7b9dca4efebd0bdd982ba09"

capture-stack-trace@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"devDependencies": {
"argos-cli": "0.0.9",
"autodll-webpack-plugin": "0.2.1",
"autoprefixer": "7.1.5",
"autoprefixer": "7.1.6",
"babel-cli": "6.26.0",
"babel-core": "6.26.0",
"babel-eslint": "8.0.1",
Expand Down Expand Up @@ -119,8 +119,8 @@
"lodash": "^4.17.4",
"preact": "^8.1.0",
"preact-compat": "^3.16.0",
"preact-rheostat": "^2.1.1",
"prop-types": "^15.5.10",
"rheostat": "algolia/rheostat#dist-preact",
"to-factory": "^1.0.0"
},
"jest": {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Slider/Slider.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PropTypes from 'prop-types';

import React, { Component } from 'preact-compat';

import Rheostat from 'rheostat';
import Rheostat from 'preact-rheostat';
import cx from 'classnames';

import Pit from './Pit.js';
Expand Down
82 changes: 38 additions & 44 deletions src/components/Slider/__tests__/Slider-test.js
Original file line number Diff line number Diff line change
@@ -1,62 +1,56 @@
import React from 'react';
import renderer from 'react-test-renderer';
import { shallow } from 'enzyme';
import { createRenderer } from 'react-test-renderer/shallow';

import Slider, { RawSlider } from '../Slider';

describe('Slider', () => {
it('expect to render correctly', () => {
const tree = renderer
.create(
<Slider
refine={() => undefined}
min={0}
max={500}
values={[0, 0]}
pips={true}
step={2}
tooltips={true}
shouldAutoHideContainer={false}
/>
)
.toJSON();
const tree = createRenderer().render(
<Slider
refine={() => undefined}
min={0}
max={500}
values={[0, 0]}
pips={true}
step={2}
tooltips={true}
shouldAutoHideContainer={false}
/>
);
expect(tree).toMatchSnapshot();
});

it('expect to render collapsed', () => {
const tree = renderer
.create(
<Slider
refine={() => undefined}
min={0}
max={500}
values={[0, 0]}
pips={true}
step={2}
tooltips={true}
collapsible={{ collapsed: true }}
shouldAutoHideContainer={false}
/>
)
.toJSON();
const tree = createRenderer().render(
<Slider
refine={() => undefined}
min={0}
max={500}
values={[0, 0]}
pips={true}
step={2}
tooltips={true}
collapsible={{ collapsed: true }}
shouldAutoHideContainer={false}
/>
);
expect(tree).toMatchSnapshot();
});

it('expect to render without pips', () => {
const tree = renderer
.create(
<Slider
refine={() => undefined}
min={0}
max={500}
values={[0, 0]}
pips={false}
step={2}
tooltips={true}
shouldAutoHideContainer={false}
/>
)
.toJSON();
const tree = createRenderer().render(
<Slider
refine={() => undefined}
min={0}
max={500}
values={[0, 0]}
pips={false}
step={2}
tooltips={true}
shouldAutoHideContainer={false}
/>
);
expect(tree).toMatchSnapshot();
});

Expand Down
Loading

0 comments on commit 5e15c4f

Please sign in to comment.