Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnyreilly committed May 15, 2017
1 parent f27b313 commit 75ca23e
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Expand Up @@ -10,6 +10,6 @@ npm-debug.log
/.vscode/
/test/execution-tests/**/typings
!/test/**/expectedOutput-*/**
/node_modules
/dist
/**/node_modules
/**/dist
!build.js
2 changes: 1 addition & 1 deletion examples/react-babel-karma-gulp/gulpFile.js
Expand Up @@ -20,7 +20,7 @@ gulp.task('build-other', ['delete-dist'], function() {
staticFiles.build();
});

gulp.task('build', ['build-js', 'build-other', 'lint'], function () {
gulp.task('build', ['build-js', 'build-other'], function () {
inject.build();
});

Expand Down
6 changes: 4 additions & 2 deletions examples/react-babel-karma-gulp/package.json
Expand Up @@ -31,11 +31,12 @@
"@types/jasmine": "^2.5.35",
"@types/react": "^0.14.41",
"@types/react-addons-test-utils": "^0.14.15",
"@types/react-test-renderer": "^15.5.0",
"@types/react-bootstrap": "0.0.33",
"@types/react-dom": "^0.14.18",
"babel": "^6.0.0",
"babel-core": "^6.0.0",
"babel-loader": "^6.0.0",
"babel-loader": "^7.0.0",
"babel-preset-es2015": "^6.0.0",
"babel-preset-es2016": "^6.16.0",
"babel-preset-react": "^6.0.0",
Expand Down Expand Up @@ -65,6 +66,8 @@
"karma-sourcemap-loader": "^0.3.6",
"karma-webpack": "^2.0.1",
"phantomjs-prebuilt": "^2.1.4",
"react-addons-test-utils": "^15.3.1",
"react-test-renderer": "^15.5.4",
"ts-loader": "^2.0.0",
"typescript": "^2.1.4",
"webpack": "^2.2.0",
Expand All @@ -76,7 +79,6 @@
"flux": "^2.0.3",
"fbemitter": "^2.0.2",
"react": "^15.4.1",
"react-addons-test-utils": "^15.4.1",
"react-dom": "^15.4.1"
}
}
4 changes: 0 additions & 4 deletions examples/react-babel-karma-gulp/src/components/Greeting.tsx
Expand Up @@ -12,10 +12,6 @@ class Greeting extends React.Component<Props, any> {
super(props);
}

static propTypes: React.ValidationMap<Props> = {
targetOfGreeting: React.PropTypes.string.isRequired
}

render() {
return (
<p>
Expand Down
4 changes: 0 additions & 4 deletions examples/react-babel-karma-gulp/src/components/WhoToGreet.tsx
Expand Up @@ -11,10 +11,6 @@ class WhoToGreet extends React.Component<Props, any> {
super(props);
}

static propTypes: React.ValidationMap<Props> = {
newGreeting: React.PropTypes.string.isRequired
}

render() {
return (
<form role="form">
Expand Down
4 changes: 2 additions & 2 deletions examples/react-babel-karma-gulp/test/components/App.tests.tsx
@@ -1,5 +1,5 @@
import React from 'react';
import TestUtils from 'react-addons-test-utils';
import { createRenderer } from 'react-test-renderer/shallow';

import App from '../../src/components/App';
import WhoToGreet from '../../src/components/WhoToGreet';
Expand All @@ -23,7 +23,7 @@ describe('App', () => {
});

function render(state: any) {
const shallowRenderer = TestUtils.createRenderer();
const shallowRenderer = createRenderer();
spyOn(GreetingStore, 'getState').and.returnValue(state);

shallowRenderer.render(<App />);
Expand Down
@@ -1,5 +1,5 @@
import React from 'react';
import TestUtils from 'react-addons-test-utils';
import { createRenderer } from 'react-test-renderer/shallow';

import Greeting from '../../src/components/Greeting';
import * as GreetingActions from '../../src/actions/GreetingActions';
Expand Down Expand Up @@ -38,7 +38,7 @@ describe('Greeting', () => {
});

function render({ targetOfGreeting }: { targetOfGreeting: string; }) {
const shallowRenderer = TestUtils.createRenderer();
const shallowRenderer = createRenderer();
shallowRenderer.render(<Greeting key={ 0 } targetOfGreeting={ targetOfGreeting } />);
return shallowRenderer.getRenderOutput();
}
Expand Down
@@ -1,5 +1,5 @@
import React from 'react';
import TestUtils from 'react-addons-test-utils';
import { createRenderer } from 'react-test-renderer/shallow';

import WhoToGreet from '../../src/components/WhoToGreet';
import * as GreetingActions from '../../src/actions/GreetingActions';
Expand All @@ -21,7 +21,7 @@ describe('WhoToGreet', () => {
expect(formGroup.type).toBe('div');
expect(formGroup.props.className).toBe('form-group');

const [ input, button ] = formGroup.props.children;
const [input, button] = formGroup.props.children;

expect(input.type).toBe('input');
expect(input.props.type).toBe('text');
Expand All @@ -40,10 +40,10 @@ describe('WhoToGreet', () => {
const newGreeting = 'Benjamin';
const form = render({ newGreeting });
const formGroup = form.props.children;
const [ input ] = formGroup.props.children;
const [input] = formGroup.props.children;
spyOn(GreetingActions, 'newGreetingChanged');

input.props.onChange({ target: { value: newGreeting }});
input.props.onChange({ target: { value: newGreeting } });

expect(GreetingActions.newGreetingChanged).toHaveBeenCalledWith(newGreeting);
});
Expand All @@ -52,17 +52,17 @@ describe('WhoToGreet', () => {
const newGreeting = 'Benjamin';
const form = render({ newGreeting });
const formGroup = form.props.children;
const [ , button ] = formGroup.props.children;
const [, button] = formGroup.props.children;
spyOn(GreetingActions, 'addGreeting');

button.props.onClick({ preventDefault: () => {} });
button.props.onClick({ preventDefault: () => { } });

expect(GreetingActions.addGreeting).toHaveBeenCalledWith(newGreeting);
});

function render({ newGreeting }: { newGreeting: string }) {
const shallowRenderer = TestUtils.createRenderer();
shallowRenderer.render(<WhoToGreet newGreeting={ newGreeting } />);
const shallowRenderer = createRenderer();
shallowRenderer.render(<WhoToGreet newGreeting={newGreeting} />);
return shallowRenderer.getRenderOutput();
}
});

0 comments on commit 75ca23e

Please sign in to comment.