Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable inline diff rendering from CLI #42

Merged
merged 1 commit into from
Jun 30, 2017
Merged

Enable inline diff rendering from CLI #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions src/components/test/code-snippet.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
/* eslint-disable import/no-dynamic-require, react/no-danger */
import React, { Component } from 'react';
import { inject } from 'mobx-react';
import PropTypes from 'prop-types';
import isEqual from 'lodash/isEqual';
import isArray from 'lodash/isArray';
import hljs from 'highlight.js/lib/highlight';
import classNames from 'classnames/bind';
import styles from './test.css';

const cx = classNames.bind(styles);

@inject(stores => ({ useInlineDiffs: stores.reportStore && stores.reportStore.useInlineDiffs }))
class CodeSnippet extends Component {
static displayName = 'CodeSnippet';

Expand All @@ -19,8 +18,7 @@ class CodeSnippet extends Component {
lang: PropTypes.string,
highlight: PropTypes.bool,
label: PropTypes.string,
showLabel: PropTypes.bool,
useInlineDiffs: PropTypes.bool
showLabel: PropTypes.bool
};

static defaultProps = {
Expand All @@ -38,8 +36,8 @@ class CodeSnippet extends Component {
}

shouldHighlight() {
const { code, highlight, lang, useInlineDiffs } = this.props;
if (lang === 'diff' && useInlineDiffs) {
const { code, highlight, lang } = this.props;
if (lang === 'diff' && isArray(code)) {
return false;
}
return code && highlight;
Expand All @@ -52,24 +50,23 @@ class CodeSnippet extends Component {
}

render() {
const { className, code, lang, label, showLabel, useInlineDiffs } = this.props;
const { className, code, lang, label, showLabel } = this.props;
const isDiff = lang === 'diff';
const isInlineDiff = isDiff && isArray(code);
const shouldHighlight = this.shouldHighlight();
const cxName = cx(className, {
[lang]: shouldHighlight,
hljs: !shouldHighlight,
'code-diff': isDiff,
'inline-diff': isDiff && useInlineDiffs
'inline-diff': isInlineDiff
});

const renderLegendLeft = () => isDiff && (
useInlineDiffs
const renderLegendLeft = () => (isInlineDiff
? <span className={ cx('code-diff-actual') }>actual</span>
: <span className={ cx('code-diff-expected') }>+ expected</span>
);

const renderLegendRight = () => isDiff && (
useInlineDiffs
const renderLegendRight = () => (isInlineDiff
? <span className={ cx('code-diff-expected') }>{'expected\n\n'}</span>
: <span className={ cx('code-diff-actual') }>{'- actual\n\n'}</span>
);
Expand All @@ -91,7 +88,7 @@ class CodeSnippet extends Component {
<code>
{ renderLegendLeft() }
{ renderLegendRight() }
{ (isDiff && useInlineDiffs) ? code.map(mapInlineDiffCode) : code }
{ isInlineDiff ? code.map(mapInlineDiffCode) : code }
</code>
{ !!label && showLabel && <span className={ cx('code-label') }>{ label }</span> }
</pre>
Expand Down
19 changes: 7 additions & 12 deletions test/spec/components/test/code-snippet.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { mount } from 'enzyme';
import chai, { expect } from 'chai';
import chaiEnzyme from 'chai-enzyme';
import sinon from 'sinon';
import { Provider } from 'mobx-react';
import CodeSnippet from 'components/test/code-snippet';
import hljs from 'highlight.js/lib/highlight';

Expand All @@ -12,16 +11,12 @@ chai.use(chaiEnzyme());
describe('<CodeSnippet />', () => {
let node;

const getInstance = (instanceProps, store = {}) => {
const wrapper = mount(
<Provider reportStore={ store }>
<CodeSnippet { ...instanceProps } />
</Provider>, {
attachTo: node
}
);
return wrapper;
};
const getInstance = instanceProps => (
mount(
<CodeSnippet { ...instanceProps } />,
{ attachTo: node }
)
);

beforeEach(() => {
node = document.createElement('div');
Expand Down Expand Up @@ -113,7 +108,7 @@ describe('<CodeSnippet />', () => {
const props = {
code: 'function(){console.log(\'sample code\');}'
};
const wrapper = mount(<CodeSnippet { ...props } />);
const wrapper = getInstance(props);
sinon.spy(CodeSnippet.prototype, 'shouldComponentUpdate');
wrapper.setProps({
highlight: false
Expand Down