Skip to content

Commit

Permalink
Merge pull request #62 from SpareBank1/fix-lint-errors-and-test-spam
Browse files Browse the repository at this point in the history 
Fix lint errors and test spam
  • Loading branch information
@selbekk
selbekk committed Mar 8, 2018
2 parents d9ed456 + 1b6b97b commit 29bb1cf
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 90 deletions.
1 change: 0 additions & 1 deletion packages/ffe-buttons-react/src/ExpandButton.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ describe('<ExpandButton />', () => {
});
it('renders a KryssIkon', () => {
const wrapper = getWrapper({ isExpanded: true });
console.log(wrapper.children().debug());
expect(wrapper.find(KryssIkon).exists()).toBe(true);
expect(wrapper.find(KryssIkon).hasClass('ffe-button__icon')).toBe(true);
});
Expand Down
6 changes: 3 additions & 3 deletions packages/ffe-buttons/less/base-button.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
cursor: pointer;
display: flex;
font-family: "MuseoSansRounded-500", arial, sans-serif;
.ffe-fontsize-button;
line-height: 24px;
overflow: hidden;
padding: 8px 30px;
Expand All @@ -18,6 +17,7 @@
transition: all @ffe-transition-duration @ffe-ease;
user-select: none;
width: 100%;
.ffe-fontsize-button;

&:focus {
outline: none;
Expand Down Expand Up @@ -111,7 +111,7 @@

&--task {
background-color: @ffe-white;
border-radius: 0px;
border-radius: 0;
box-shadow: none;
color: @ffe-blue-azure;
display: inline-block;
Expand Down Expand Up @@ -239,4 +239,4 @@
to { transform: rotate(360deg); }
}
}
}
}
4 changes: 3 additions & 1 deletion packages/ffe-form-react/src/Label.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ import React from 'react';
import { bool, node, string } from 'prop-types';
import classNames from 'classnames';

const Label = ({ block, children, className, ...rest }) => (
const Label = ({ block, children, className, htmlFor, ...rest }) => (
<label
className={classNames(
'ffe-form-label',
{ 'ffe-form-label--block': block },
className,
)}
htmlFor={htmlFor}
{...rest}
>
{children}
Expand All @@ -23,6 +24,7 @@ Label.propTypes = {
block: bool,
children: node.isRequired,
className: string,
htmlFor: string,
};

export default Label;
1 change: 0 additions & 1 deletion packages/ffe-form-react/src/SuccessFieldMessage.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import { node } from 'prop-types';
import FieldMessage from './FieldMessage';

const SuccessFieldMessage = props => {
Expand Down
139 changes: 55 additions & 84 deletions packages/ffe-radio-button-react/src/radio-base.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ describe('<RadioBase />', () => {

it('should render an input with type radio', () => {
expect(wrapper.find('input')).toHaveLength(1);
expect(wrapper
.find('input')
.prop('type')).toBe('radio');
expect(wrapper.find('input').prop('type')).toBe('radio');
});

it('should render a label', () => {
Expand All @@ -29,54 +27,50 @@ describe('<RadioBase />', () => {
it('should not create a new id on every render', () => {
const firstId = wrapper.find('input').prop('id');
wrapper.setProps({ invalid: true }); // trigger re-render
const secondId = wrapper.find('input').prop('id');
const secondId = wrapper.find('input').prop('id');
expect(firstId).toBe(secondId);
})
});
});

it('should render a default value if passed', () => {
let wrapper = shallow(<RadioBase labelClasses="" value="" />);
expect(wrapper
.find('input')
.prop('checked')).toBeFalsy();
expect(wrapper.find('input').prop('checked')).toBeFalsy();

wrapper = shallow(<RadioBase value="" checked={true} labelClasses="" />);
expect(wrapper
.find('input')
.prop('checked')).toBe(true);
wrapper = shallow(
<RadioBase value="" checked={true} labelClasses="" />,
);
expect(wrapper.find('input').prop('checked')).toBe(true);
});

it('should render the field disabled if specified', () => {
let wrapper = shallow(<RadioBase value="" labelClasses="" />);
expect(wrapper
.find('input')
.prop('disabled')).toBeUndefined();
expect(wrapper.find('input').prop('disabled')).toBeUndefined();

wrapper = shallow(<RadioBase value="" labelClasses="" disabled={true} />);
expect(wrapper
.find('input')
.prop('disabled')).toBe(true);
wrapper = shallow(
<RadioBase value="" labelClasses="" disabled={true} />,
);
expect(wrapper.find('input').prop('disabled')).toBe(true);
});

it('should apply labelClasses to the label', () => {
const wrapper = shallow(
<RadioBase labelClasses="test-class" value="" />,
);
expect(wrapper
.find('label')
.hasClass('test-class')).toBe(true);
expect(wrapper.find('label').hasClass('test-class')).toBe(true);
});

it('should apply pass-through extra props', () => {
const wrapper = shallow(<RadioBase
labelClasses="" value="shark"
const wrapper = shallow(
<RadioBase
labelClasses=""
value="shark"
label="Kjempetorsk"
aria-describedby="svorsk"
/>,
);
expect(wrapper
.find('input')
.prop('aria-describedby')).toBe('svorsk');
expect(wrapper.find('input').prop('aria-describedby')).toBe(
'svorsk',
);
});
});

Expand Down Expand Up @@ -127,103 +121,76 @@ describe('<RadioBase />', () => {
it('sets missing prop to false', () => {
const wrapper = shallow(<RadioBase value="Hei" labelClasses="" />);

expect(wrapper
.find('input')
.prop('aria-invalid')).toBe('false');
expect(wrapper
.find('label')
.prop(
'className',
)).not.toBe('ffe-radio-button--invalid');
expect(wrapper.find('input').prop('aria-invalid')).toBe('false');
expect(wrapper.find('label').prop('className')).not.toBe(
'ffe-radio-button--invalid',
);
});

it('handles boolean `false` aria-invalid-prop', () => {
const wrapper = shallow(
<RadioBase value="Hei" labelClasses="" aria-invalid={false} />,
);

expect(wrapper
.find('input')
.prop('aria-invalid')).toBe('false');
expect(wrapper
.find('label')
.prop(
'className',
)).not.toBe('ffe-radio-button--invalid');
expect(wrapper.find('input').prop('aria-invalid')).toBe('false');
expect(wrapper.find('label').prop('className')).not.toBe(
'ffe-radio-button--invalid',
);
});

it('handles boolean `true` aria-invalid-prop', () => {
const wrapper = shallow(
<RadioBase value="Hei" labelClasses="" aria-invalid={true} />,
);

expect(wrapper
.find('input')
.prop('aria-invalid')).toBe('true');
expect(wrapper
.find('label')
.prop(
'className',
)).toBe('ffe-radio-button--invalid');
expect(wrapper.find('input').prop('aria-invalid')).toBe('true');
expect(wrapper.find('label').prop('className')).toBe(
'ffe-radio-button--invalid',
);
});

it('handles string "false" aria-invalid-prop', () => {
const wrapper = shallow(
<RadioBase value="Hei" labelClasses="" aria-invalid="false" />,
);

expect(wrapper
.find('input')
.prop('aria-invalid')).toBe('false');
expect(wrapper
.find('label')
.prop(
'className',
)).not.toBe('ffe-radio-button--invalid');
expect(wrapper.find('input').prop('aria-invalid')).toBe('false');
expect(wrapper.find('label').prop('className')).not.toBe(
'ffe-radio-button--invalid',
);
});

it('handles string "true" aria-invalid-prop', () => {
const wrapper = shallow(
<RadioBase value="Hei" labelClasses="" aria-invalid="true" />,
);

expect(wrapper
.find('input')
.prop('aria-invalid')).toBe('true');
expect(wrapper
.find('label')
.prop(
'className',
)).toBe('ffe-radio-button--invalid');
expect(wrapper.find('input').prop('aria-invalid')).toBe('true');
expect(wrapper.find('label').prop('className')).toBe(
'ffe-radio-button--invalid',
);
});

it('handles boolean `false` invalid-prop', () => {
const wrapper = shallow(
<RadioBase value="Hei" labelClasses="" invalid={false} />,
);

expect(wrapper
.find('input')
.prop('aria-invalid')).toBe('false');
expect(wrapper
.find('label')
.prop(
'className',
)).not.toBe('ffe-radio-button--invalid');
expect(wrapper.find('input').prop('aria-invalid')).toBe('false');
expect(wrapper.find('label').prop('className')).not.toBe(
'ffe-radio-button--invalid',
);
});

it('handles boolean `true` invalid-prop', () => {
const wrapper = shallow(
<RadioBase value="Hei" labelClasses="" invalid={true} />,
);

expect(wrapper
.find('input')
.prop('aria-invalid')).toBe('true');
expect(wrapper
.find('label')
.prop(
'className')).toBe('ffe-radio-button--invalid');
expect(wrapper.find('input').prop('aria-invalid')).toBe('true');
expect(wrapper.find('label').prop('className')).toBe(
'ffe-radio-button--invalid',
);
});

it('handles string "false" invalid-prop', () => {
Expand All @@ -232,7 +199,9 @@ describe('<RadioBase />', () => {
);

expect(wrapper.find('input').prop('aria-invalid')).toBe('false');
expect(wrapper.find('label').prop('className')).not.toBe('ffe-radio-button--invalid');
expect(wrapper.find('label').prop('className')).not.toBe(
'ffe-radio-button--invalid',
);
});

it('handles string "true" invalid-prop', () => {
Expand All @@ -241,7 +210,9 @@ describe('<RadioBase />', () => {
);

expect(wrapper.find('input').prop('aria-invalid')).toBe('true');
expect(wrapper.find('label').prop('className')).toBe('ffe-radio-button--invalid');
expect(wrapper.find('label').prop('className')).toBe(
'ffe-radio-button--invalid',
);
});
});
});

0 comments on commit 29bb1cf

Please sign in to comment.