From 34674845f54ccb8f585962c49b4614d4009e7d09 Mon Sep 17 00:00:00 2001 From: yang-wei Date: Fri, 15 Apr 2016 21:45:06 +0900 Subject: [PATCH] Use react-addons-test-utils package in tests --- package.json | 1 + tests/areachart-tests.js | 4 ++-- tests/axes-tests.js | 6 ++---- tests/barchart-tests.js | 6 ++---- tests/basicchart-tests.js | 4 ++-- tests/candlestick-tests.js | 4 ++-- tests/legend-tests.js | 4 ++-- tests/legendchart-tests.js | 4 ++-- tests/linechart-tests.js | 4 ++-- tests/piechart-tests.js | 4 ++-- tests/scatterchart-tests.js | 4 ++-- tests/treemap-tests.js | 4 ++-- tests/utils-tests.js | 2 ++ tests/voronoi-tests.js | 4 ++-- 14 files changed, 27 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index eaa52ed..b2972e1 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "merge-stream": "^0.1.7", "mocha": "^2.2.5", "phantomjs": "^2.1.3", + "react-addons-test-utils": "^15.0.1", "react-tools": "^0.13.3", "reactify": "^1.1.1", "uglify-js": "^2.4.23", diff --git a/tests/areachart-tests.js b/tests/areachart-tests.js index fa957ae..9fa3fa0 100644 --- a/tests/areachart-tests.js +++ b/tests/areachart-tests.js @@ -1,13 +1,13 @@ 'use strict'; var expect = require('chai').expect; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); describe('AreaChart', function() { it('renders stacked areachart with array of objects data', function() { - var React = require('react/addons'); var AreaChart = require('../src/areachart').AreaChart; var generate = require('./utils/datagen').generateArrayOfObjects; - var TestUtils = React.addons.TestUtils; // Render a areachart using data in array of objects var data = [ diff --git a/tests/axes-tests.js b/tests/axes-tests.js index f321ed3..0fa4ee5 100644 --- a/tests/axes-tests.js +++ b/tests/axes-tests.js @@ -1,6 +1,8 @@ 'use strict'; var expect = require('chai').expect; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); function generateData(points) { var generate = require('./utils/datagen').generateArrayOfPoints; @@ -25,10 +27,8 @@ function generateData(points) { describe('Axes', function() { it('renders and tests axes component', function() { - var React = require('react/addons'); var YAxis = require('../src/common/axes').YAxis; var XAxis = require('../src/common/axes').XAxis; - var TestUtils = React.addons.TestUtils; var utils = require('../src/utils'); var points = 5, @@ -57,10 +57,8 @@ describe('Axes', function() { }); it('renders and tests axes component with tickValues', function() { - var React = require('react/addons'); var YAxis = require('../src/common/axes').YAxis; var XAxis = require('../src/common/axes').XAxis; - var TestUtils = React.addons.TestUtils; var utils = require('../src/utils'); var points = 5, diff --git a/tests/barchart-tests.js b/tests/barchart-tests.js index 7ccb21f..496866d 100644 --- a/tests/barchart-tests.js +++ b/tests/barchart-tests.js @@ -1,13 +1,13 @@ 'use strict'; var expect = require('chai').expect; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); describe('BarChart', function() { it('renders barchart', function() { - var React = require('react/addons'); var BarChart = require('../src/barchart').BarChart; var generate = require('./utils/datagen').generateArrayOfPoints; - var TestUtils = React.addons.TestUtils; var length = 5; var data = [ @@ -39,10 +39,8 @@ describe('BarChart', function() { }); it('renders barchart with negative values', function() { - var React = require('react/addons'); var BarChart = require('../src/barchart').BarChart; var generate = require('./utils/datagen').generateArrayOfPoints; - var TestUtils = React.addons.TestUtils; var length = 5; diff --git a/tests/basicchart-tests.js b/tests/basicchart-tests.js index acac9a0..57ee738 100644 --- a/tests/basicchart-tests.js +++ b/tests/basicchart-tests.js @@ -1,13 +1,13 @@ 'use strict'; var expect = require('chai').expect; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); describe('BasicChart', function() { it('renders and tests BasicChart component', function() { - var React = require('react/addons'); var BasicChart = require('../src/common/charts/BasicChart'); var generate = require('./utils/datagen').generateArrayOfPoints; - var TestUtils = React.addons.TestUtils; var chart = TestUtils.renderIntoDocument( diff --git a/tests/candlestick-tests.js b/tests/candlestick-tests.js index fd8fffb..80df2c0 100644 --- a/tests/candlestick-tests.js +++ b/tests/candlestick-tests.js @@ -1,11 +1,11 @@ 'use strict'; var expect = require('chai').expect; -var React = require('react/addons'); +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); var { CandlestickChart } = require('../src/candlestick'); var { generateArrayOfTimeOHLCObjects: generate } = require('./utils/datagen'); -var TestUtils = React.addons.TestUtils; var length = 5; var data, candlestickChart, candlestickChartWithoutAnimation; diff --git a/tests/legend-tests.js b/tests/legend-tests.js index fbbb535..45a5215 100644 --- a/tests/legend-tests.js +++ b/tests/legend-tests.js @@ -1,13 +1,13 @@ 'use strict'; var expect = require('chai').expect; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); describe('Legend', function() { it('renders and tests legend component', function() { - var React = require('react/addons'); var Legend = require('../src/common/Legend'); var generate = require('./utils/datagen').generateArrayOfPoints; - var TestUtils = React.addons.TestUtils; // Render a linechart using array data var data = [ diff --git a/tests/legendchart-tests.js b/tests/legendchart-tests.js index 6b5f85d..5e61235 100644 --- a/tests/legendchart-tests.js +++ b/tests/legendchart-tests.js @@ -1,13 +1,13 @@ 'use strict'; var expect = require('chai').expect; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); describe('LegendChart', function() { it('renders and tests LegendChart component', function() { - var React = require('react/addons'); var LegendChart = require('../src/common/charts/LegendChart'); var generate = require('./utils/datagen').generateArrayOfPoints; - var TestUtils = React.addons.TestUtils; var legend = TestUtils.renderIntoDocument( diff --git a/tests/linechart-tests.js b/tests/linechart-tests.js index 5417fbd..fe432af 100644 --- a/tests/linechart-tests.js +++ b/tests/linechart-tests.js @@ -1,10 +1,10 @@ 'use strict'; var expect = require('chai').expect; -var React = require('react/addons'); +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); var LineChart = require('../src/linechart').LineChart; var generate = require('./utils/datagen').generateArrayOfPoints; -var TestUtils = React.addons.TestUtils; var data, linechart; var length = 5; diff --git a/tests/piechart-tests.js b/tests/piechart-tests.js index cfcfb57..b2df8eb 100644 --- a/tests/piechart-tests.js +++ b/tests/piechart-tests.js @@ -1,10 +1,10 @@ 'use strict'; var expect = require('chai').expect; -var React = require('react/addons'); +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); var PieChart = require('../src/piechart').PieChart; var generatePartsOfWhole = require('./utils/datagen').generatePartsOfWhole; -var TestUtils = React.addons.TestUtils; describe('PieChart', function() { diff --git a/tests/scatterchart-tests.js b/tests/scatterchart-tests.js index 85ffc92..58ce4cf 100644 --- a/tests/scatterchart-tests.js +++ b/tests/scatterchart-tests.js @@ -1,11 +1,11 @@ 'use strict'; var expect = require('chai').expect; -var React = require('react/addons'); +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); var { ScatterChart } = require('../src/scatterchart'); var { generateArrayOfPoints: generate } = require('./utils/datagen'); -var TestUtils = React.addons.TestUtils; var points = 5; var circleRadius = 5; var data, scatterchart; diff --git a/tests/treemap-tests.js b/tests/treemap-tests.js index 758b249..82c69f3 100644 --- a/tests/treemap-tests.js +++ b/tests/treemap-tests.js @@ -1,13 +1,13 @@ 'use strict'; var expect = require('chai').expect; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); describe('Treemap', function() { it('renders treemap', function() { - var React = require('react/addons'); var Treemap = require('../src/treemap').Treemap; var generate = require('./utils/datagen').generateArrayOfNameObjects; - var TestUtils = React.addons.TestUtils; var points = 5; // Render a treemap using array data diff --git a/tests/utils-tests.js b/tests/utils-tests.js index 20bb086..cc818c9 100644 --- a/tests/utils-tests.js +++ b/tests/utils-tests.js @@ -1,6 +1,8 @@ 'use strict'; var expect = require('chai').expect; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); describe('Utils Test', () => { diff --git a/tests/voronoi-tests.js b/tests/voronoi-tests.js index 93ee2ca..3167f04 100644 --- a/tests/voronoi-tests.js +++ b/tests/voronoi-tests.js @@ -1,13 +1,13 @@ 'use strict'; var expect = require('chai').expect; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); describe('Voronoi', function() { it('renders and tests voronoi component', function() { - var React = require('react/addons'); var Voronoi = require('../src/common/Voronoi'); var generate = require('./utils/datagen').generateArrayOfPoints; - var TestUtils = React.addons.TestUtils; var utils = require('../src/utils'); var points = 5,