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.

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

Release 0.8.2 -- Fixed Tests #811

Open
wants to merge 8 commits into
base: release-0.8.2
Choose a base branch
from
1 change: 1 addition & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = function(config) {
basePath: '',
frameworks: ['jasmine'],
files: [
'./node_modules/@babel/polyfill/dist/polyfill.js',
'./node_modules/phantomjs-polyfill/bind-polyfill.js',
'./scripts/__tests__/**/*.js'
],
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"lodash": "^4.17.4"
},
"devDependencies": {
"@babel/polyfill": "^7.0.0-beta.44",
"babel-jest": "^5.2.1",
"babel-loader": "^5.3.3",
"create-react-class": "15.6.2",
Expand All @@ -41,10 +42,10 @@
"phantomjs-polyfill": "0.0.1",
"phantomjs-prebuilt": "^2.1.7",
"prop-types": "^15.6.0",
"react": "^0.14.3 || ^15.0.1 || ^16.0.0",
"react-addons-test-utils": "^0.14.3 || ^15.0.1",
"react-chartist": "^0.10.2",
"react-dom": "^0.14.3 || ^15.0.1 || ^16.0.0",
"react": "^15.5.4 || ^16.0.0",
"react-chartist": "^0.10.1",
"react-dom": "^15.5.4 || ^16.0.0",
"react-test-renderer": "^15.5.4 || ^16.0.0",
"webpack": "1.12.3",
"webpack-dev-server": "1.12.1"
},
Expand Down
6 changes: 3 additions & 3 deletions scripts/__tests__/gridFilter-test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
var React = require('react');
var createReactClass = require('create-react-class');
var TestUtils = require('react-addons-test-utils');
var TestUtils = require('react-dom/test-utils');
var GridFilter = require('../gridFilter.jsx');

describe('GridFilter', function(){

it('calls change filter when clicked', function(){
var mock = jasmine.createSpy();
var mock = jasmine.createSpy();
var filter = TestUtils.renderIntoDocument(<GridFilter changeFilter={mock}/>);

var someEvent = {
Expand All @@ -15,7 +15,7 @@ describe('GridFilter', function(){
}
};

var input = TestUtils.findRenderedDOMComponentWithTag(filter, 'input');
var input = TestUtils.findRenderedDOMComponentWithTag(filter, 'input');
TestUtils.Simulate.change(input, someEvent);

expect(mock.calls.argsFor(0)).toEqual(["hi"]);
Expand Down
2 changes: 1 addition & 1 deletion scripts/__tests__/gridPagination-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var React = require('react');
var createReactClass = require('create-react-class');
var GridPagination = require('../gridPagination.jsx');
var TestUtils = require('react-addons-test-utils');
var TestUtils = require('react-dom/test-utils');

describe('GridPagination', function(){
it('calls change filter when clicked', function(){
Expand Down