Skip to content

Commit

Permalink
Auto-merged master into dev on deployment.
Browse files Browse the repository at this point in the history
  • Loading branch information
Peder Korsveien authored Nov 5, 2019
2 parents 3386386 + 187870c commit 3822be1
Show file tree
Hide file tree
Showing 53 changed files with 872 additions and 561 deletions.
84 changes: 35 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@
"eslintConfig": {
"extends": "react-app"
},
"jest": {
"snapshotSerializers": [
"enzyme-to-json/serializer"
]
},
"browserslist": {
"production": [
">0.2%",
Expand Down Expand Up @@ -94,6 +99,7 @@
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"husky": "^3.0.0",
"enzyme-to-json": "^3.4.3",
"prettier": "^1.18.2",
"serve": "^11.0.2",
"tslint": "^5.17.0",
Expand Down
34 changes: 34 additions & 0 deletions src/felleskomponenter/EksternLenke.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import React from 'react';
import { shallow } from 'enzyme';
import EksternLenke from './EksternLenke';
import '../utils/SetupEnzyme';

describe('<EksternLenke/>', () => {
it('skal padde href med protokoll når det mangler', () => {
const tekst = 'nav.no';
const wrapper = shallow(<EksternLenke lenke={tekst} />);

expect(wrapper).toMatchSnapshot();
});

it('skal ikke padde href med protokoll, http', () => {
const tekst = 'http://nav.no';
const wrapper = shallow(<EksternLenke lenke={tekst} />);

expect(wrapper).toMatchSnapshot();
});

it('skal ikke padde href med protokoll, https', () => {
const tekst = 'https://nav.no';
const wrapper = shallow(<EksternLenke lenke={tekst} />);

expect(wrapper).toMatchSnapshot();
});

it('skal padde href med protokoll når det mangler, www', () => {
const tekst = 'www.nav.no';
const wrapper = shallow(<EksternLenke lenke={tekst} />);

expect(wrapper).toMatchSnapshot();
});
});
22 changes: 22 additions & 0 deletions src/felleskomponenter/EksternLenke.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from 'react';
import Lenke from 'nav-frontend-lenker';
import { ReactComponent as EksternLenkeIkon } from './ekstern-lenke.svg';

const httpRegex = /^(https?):\/\/.*$/;

interface PropTypes {
lenke: string | null;
}

export default function EksternLenke(props: PropTypes) {
const { lenke } = props;

if (!lenke) return null;
const paddaLenke = lenke && lenke.match(httpRegex) ? lenke : `http://${lenke}`;
return (
<Lenke href={paddaLenke}>
{lenke}
<EksternLenkeIkon />
</Lenke>
);
}
37 changes: 37 additions & 0 deletions src/felleskomponenter/__snapshots__/EksternLenke.test.tsx.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`<EksternLenke/> skal ikke padde href med protokoll, http 1`] = `
<Lenke
href="http://nav.no"
>
http://nav.no
<ForwardRef(SvgEksternLenke) />
</Lenke>
`;

exports[`<EksternLenke/> skal ikke padde href med protokoll, https 1`] = `
<Lenke
href="https://nav.no"
>
https://nav.no
<ForwardRef(SvgEksternLenke) />
</Lenke>
`;

exports[`<EksternLenke/> skal padde href med protokoll når det mangler 1`] = `
<Lenke
href="http://nav.no"
>
nav.no
<ForwardRef(SvgEksternLenke) />
</Lenke>
`;

exports[`<EksternLenke/> skal padde href med protokoll når det mangler, www 1`] = `
<Lenke
href="http://www.nav.no"
>
www.nav.no
<ForwardRef(SvgEksternLenke) />
</Lenke>
`;
16 changes: 16 additions & 0 deletions src/felleskomponenter/ekstern-lenke.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
import Routing from './view/App';
import App from './view/App';

require('./mock');

ReactDOM.render(<Routing />, document.getElementById('root'));
ReactDOM.render(<App />, document.getElementById('root'));
Loading

0 comments on commit 3822be1

Please sign in to comment.