Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/react-art/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

'use strict';

var ReactART = require('./src/ReactART');
const ReactART = require('./src/ReactART');

module.exports = ReactART;
70 changes: 35 additions & 35 deletions packages/react-art/src/__tests__/ReactART-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@

'use strict';

var React = require('react');
var ReactDOM = require('react-dom');
var ReactTestUtils = require('react-dom/test-utils');
const React = require('react');
const ReactDOM = require('react-dom');
const ReactTestUtils = require('react-dom/test-utils');

var Group;
var Shape;
var Surface;
var TestComponent;
let Group;
let Shape;
let Surface;
let TestComponent;

var Missing = {};
const Missing = {};

var ReactART = require('react-art');
var ARTSVGMode = require('art/modes/svg');
var ARTCurrentMode = require('art/modes/current');
const ReactART = require('react-art');
const ARTSVGMode = require('art/modes/svg');
const ARTCurrentMode = require('art/modes/current');

function testDOMNodeStructure(domNode, expectedStructure) {
expect(domNode).toBeDefined();
expect(domNode.nodeName).toBe(expectedStructure.nodeName);
for (var prop in expectedStructure) {
for (const prop in expectedStructure) {
if (!expectedStructure.hasOwnProperty(prop)) {
continue;
}
Expand Down Expand Up @@ -58,7 +58,7 @@ describe('ReactART', () => {

TestComponent = class extends React.Component {
render() {
var a = (
const a = (
<Shape
d="M0,0l50,0l0,50l-50,0z"
fill={new ReactART.LinearGradient(['black', 'white'])}
Expand All @@ -71,7 +71,7 @@ describe('ReactART', () => {
/>
);

var b = (
const b = (
<Shape
fill="#3C5A99"
key="b"
Expand All @@ -86,7 +86,7 @@ describe('ReactART', () => {
</Shape>
);

var c = <Group key="c" />;
const c = <Group key="c" />;

return (
<Surface width={150} height={200}>
Expand All @@ -100,18 +100,18 @@ describe('ReactART', () => {
});

it('should have the correct lifecycle state', () => {
var instance = <TestComponent />;
let instance = <TestComponent />;
instance = ReactTestUtils.renderIntoDocument(instance);
var group = instance.refs.group;
const group = instance.refs.group;
// Duck type test for an ART group
expect(typeof group.indicate).toBe('function');
});

it('should render a reasonable SVG structure in SVG mode', () => {
var instance = <TestComponent />;
let instance = <TestComponent />;
instance = ReactTestUtils.renderIntoDocument(instance);

var expectedStructure = {
const expectedStructure = {
nodeName: 'svg',
width: '150',
height: '200',
Expand All @@ -132,18 +132,18 @@ describe('ReactART', () => {
],
};

var realNode = ReactDOM.findDOMNode(instance);
const realNode = ReactDOM.findDOMNode(instance);
testDOMNodeStructure(realNode, expectedStructure);
});

it('should be able to reorder components', () => {
var container = document.createElement('div');
var instance = ReactDOM.render(
const container = document.createElement('div');
const instance = ReactDOM.render(
<TestComponent flipped={false} />,
container,
);

var expectedStructure = {
const expectedStructure = {
nodeName: 'svg',
children: [
{nodeName: 'defs'},
Expand All @@ -159,12 +159,12 @@ describe('ReactART', () => {
],
};

var realNode = ReactDOM.findDOMNode(instance);
const realNode = ReactDOM.findDOMNode(instance);
testDOMNodeStructure(realNode, expectedStructure);

ReactDOM.render(<TestComponent flipped={true} />, container);

var expectedNewStructure = {
const expectedNewStructure = {
nodeName: 'svg',
children: [
{nodeName: 'defs'},
Expand All @@ -184,11 +184,11 @@ describe('ReactART', () => {
});

it('should be able to reorder many components', () => {
var container = document.createElement('div');
const container = document.createElement('div');

class Component extends React.Component {
render() {
var chars = this.props.chars.split('');
const chars = this.props.chars.split('');
return (
<Surface>
{chars.map(text => <Shape key={text} title={text} />)}
Expand All @@ -198,11 +198,11 @@ describe('ReactART', () => {
}

// Mini multi-child stress test: lots of reorders, some adds, some removes.
var before = 'abcdefghijklmnopqrst';
var after = 'mxhpgwfralkeoivcstzy';
const before = 'abcdefghijklmnopqrst';
const after = 'mxhpgwfralkeoivcstzy';

var instance = ReactDOM.render(<Component chars={before} />, container);
var realNode = ReactDOM.findDOMNode(instance);
let instance = ReactDOM.render(<Component chars={before} />, container);
const realNode = ReactDOM.findDOMNode(instance);
expect(realNode.textContent).toBe(before);

instance = ReactDOM.render(<Component chars={after} />, container);
Expand All @@ -212,7 +212,7 @@ describe('ReactART', () => {
});

it('renders composite with lifecycle inside group', () => {
var mounted = false;
let mounted = false;

class CustomShape extends React.Component {
render() {
Expand Down Expand Up @@ -241,7 +241,7 @@ describe('ReactART', () => {
}
}

var ref = null;
let ref = null;

class Outer extends React.Component {
componentDidMount() {
Expand Down Expand Up @@ -270,7 +270,7 @@ describe('ReactART', () => {
}
}

var ref = {};
let ref = {};

class Outer extends React.Component {
componentDidMount() {
Expand All @@ -292,7 +292,7 @@ describe('ReactART', () => {
}
}

var container = document.createElement('div');
const container = document.createElement('div');
ReactDOM.render(<Outer />, container);
expect(ref).not.toBeDefined();
ReactDOM.render(<Outer mountCustomShape={true} />, container);
Expand Down