Skip to content
This repository was archived by the owner on Feb 18, 2022. It is now read-only.

Commit 833de70

Browse files
committed
Code style change: remove semicolons. Less noise!
1 parent 728e13b commit 833de70

File tree

14 files changed

+141
-141
lines changed

14 files changed

+141
-141
lines changed

src/App.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import React, {Component} from 'react';
2-
import './App.css';
3-
import Header from './layout/Header';
4-
import Footer from './layout/Footer';
5-
import Home from './pages/Home';
6-
import Contact from './pages/Contact';
7-
import { BrowserRouter as Router, Route} from 'react-router-dom';
1+
import React, {Component} from 'react'
2+
import './App.css'
3+
import Header from './layout/Header'
4+
import Footer from './layout/Footer'
5+
import Home from './pages/Home'
6+
import Contact from './pages/Contact'
7+
import { BrowserRouter as Router, Route} from 'react-router-dom'
88
// "npm install --save react-router-dom" - installs latest version of React Router
99

1010
class App extends Component {
@@ -20,8 +20,8 @@ class App extends Component {
2020
<Footer />
2121
</div>
2222
</Router>
23-
);
23+
)
2424
}
2525
}
2626

27-
export default App;
27+
export default App

src/App.test.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
import React from 'react';
2-
import ReactDOM from 'react-dom';
3-
import App from './App';
4-
import { shallow } from 'enzyme';
1+
import React from 'react'
2+
import ReactDOM from 'react-dom'
3+
import App from './App'
4+
import { shallow } from 'enzyme'
55
// run "npm install react-test-renderer --save-dev" and "npm install enzyme --save-dev" to install testing tools.
66

7-
import Home from './pages/Home';
8-
import Contact from './pages/Contact';
9-
import { Route} from 'react-router-dom';
7+
import Home from './pages/Home'
8+
import Contact from './pages/Contact'
9+
import { Route} from 'react-router-dom'
1010

1111
it('renders without crashing', () => {
12-
const div = document.createElement('div');
13-
ReactDOM.render(<App />, div);
14-
});
12+
const div = document.createElement('div')
13+
ReactDOM.render(<App />, div)
14+
})
1515

1616
it('contains Header and Footer components', () => {
17-
const component = shallow(<App />);
18-
expect(component.find('Header')).toBeDefined();
19-
expect(component.find('Footer')).toBeDefined();
20-
});
17+
const component = shallow(<App />)
18+
expect(component.find('Header')).toBeDefined()
19+
expect(component.find('Footer')).toBeDefined()
20+
})
2121

2222
it('renders correct routes', () => {
23-
const wrapper = shallow(<App />);
23+
const wrapper = shallow(<App />)
2424
const pathMap = wrapper.find(Route).reduce((pathMap, route) => {
25-
const routeProps = route.props();
26-
pathMap[routeProps.path] = routeProps.component;
27-
return pathMap;
28-
}, {});
25+
const routeProps = route.props()
26+
pathMap[routeProps.path] = routeProps.component
27+
return pathMap
28+
}, {})
2929

30-
expect(pathMap['/']).toBe(Home);
31-
expect(pathMap['/contact']).toBe(Contact);
32-
});
30+
expect(pathMap['/']).toBe(Home)
31+
expect(pathMap['/contact']).toBe(Contact)
32+
})

src/forms/ContactForm.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, {Component} from 'react';
2-
import './ContactForm.css';
1+
import React, {Component} from 'react'
2+
import './ContactForm.css'
33

44
export class ContactForm extends Component {
55

@@ -14,30 +14,30 @@ export class ContactForm extends Component {
1414
}
1515

1616
handleFormSubmit = (event) => {
17-
event.preventDefault();
17+
event.preventDefault()
1818
// data sending related functionality to follow here
19-
console.log("FORM DATA: ", this.state);
19+
console.log("FORM DATA: ", this.state)
2020
alert("Check your browser console to see object containing form data!")
2121
}
2222

2323
handleChange = (event) => {
24-
const {id, value} = event.target;
24+
const {id, value} = event.target
2525
if (this.defaultState[id] !== undefined) {
2626
let newState = {
2727
...this.state
28-
};
29-
newState[id] = value;
30-
this.setState(newState);
28+
}
29+
newState[id] = value
30+
this.setState(newState)
3131
}
3232
}
3333

3434
resetForm = (event) => {
35-
event.preventDefault();
36-
this.setState({...this.defaultState});
35+
event.preventDefault()
36+
this.setState({...this.defaultState})
3737
}
3838

3939
render() {
40-
const {name, email, message} = this.state;
40+
const {name, email, message} = this.state
4141
return (
4242
<form onSubmit={this.handleFormSubmit}>
4343
<div className="ContactForm-row">
@@ -57,8 +57,8 @@ export class ContactForm extends Component {
5757
<button type="reset" onClick={this.resetForm}>Reset</button>
5858
</div>
5959
</form>
60-
);
60+
)
6161
}
6262
}
6363

64-
export default ContactForm;
64+
export default ContactForm

src/forms/ContactForm.spec.js

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import React from 'react';
2-
import ContactForm from './ContactForm';
3-
import { shallow, mount } from 'enzyme';
1+
import React from 'react'
2+
import ContactForm from './ContactForm'
3+
import { shallow, mount } from 'enzyme'
44

55
const formFields = [{
66
id: 'name',
@@ -11,58 +11,58 @@ const formFields = [{
1111
},{
1212
id: 'message',
1313
value: 'Hello world!'
14-
}];
14+
}]
1515

1616
const mockFormData = {
1717
name: 'John',
1818
email: 'someone@some123domain.com',
1919
message: 'Hello world!'
20-
};
20+
}
2121

2222
it('should render without crashing', () => {
23-
shallow(<ContactForm />);
24-
});
23+
shallow(<ContactForm />)
24+
})
2525

2626
it('should contain all inputs', () => {
27-
const component = shallow(<ContactForm />);
28-
expect(component.find('input').length).toEqual(2);
29-
expect(component.find('textArea').length).toEqual(1);
30-
expect(component.find('button').length).toEqual(2);
31-
});
27+
const component = shallow(<ContactForm />)
28+
expect(component.find('input').length).toEqual(2)
29+
expect(component.find('textArea').length).toEqual(1)
30+
expect(component.find('button').length).toEqual(2)
31+
})
3232

3333
describe('all inputs should update on change', () => {
3434
formFields.forEach((formField) => {
3535
it(`input "${formField.id}" should update the state`, () => {
36-
const component = mount(<ContactForm />);
36+
const component = mount(<ContactForm />)
3737
const mockChangeEvent = {
3838
target: {...formField}
39-
};
40-
component.find(`#${formField.id}`).at(0).simulate("change", mockChangeEvent);
41-
expect(component.state()[formField.id]).toEqual(mockChangeEvent.target.value);
42-
});
43-
});
44-
});
39+
}
40+
component.find(`#${formField.id}`).at(0).simulate("change", mockChangeEvent)
41+
expect(component.state()[formField.id]).toEqual(mockChangeEvent.target.value)
42+
})
43+
})
44+
})
4545

4646
it('form submit should call handleFormSubmit function', () => {
47-
const component = mount(<ContactForm />);
47+
const component = mount(<ContactForm />)
4848
const mockEvent = {
4949
preventDefault: jest.fn()
50-
};
51-
spyOn(component.nodes[0], 'handleFormSubmit').and.callThrough();
52-
component.setState({...mockFormData});
53-
component.find('form').at(0).simulate("submit", mockEvent);
54-
expect(component.nodes[0].handleFormSubmit).toBeCalled();
55-
expect(mockEvent.preventDefault).toBeCalled();
56-
});
50+
}
51+
spyOn(component.nodes[0], 'handleFormSubmit').and.callThrough()
52+
component.setState({...mockFormData})
53+
component.find('form').at(0).simulate("submit", mockEvent)
54+
expect(component.nodes[0].handleFormSubmit).toBeCalled()
55+
expect(mockEvent.preventDefault).toBeCalled()
56+
})
5757

5858
it('reset button should clear the form', () => {
59-
const component = mount(<ContactForm />);
59+
const component = mount(<ContactForm />)
6060
const mockEvent = {
6161
preventDefault: jest.fn()
62-
};
63-
spyOn(component.nodes[0], 'resetForm').and.callThrough();
64-
component.setState({...mockFormData});
65-
component.find('button').at(1).simulate("click", mockEvent);
66-
expect(component.nodes[0].resetForm).toBeCalled();
67-
expect(component.state()).not.toEqual(mockFormData);
68-
});
62+
}
63+
spyOn(component.nodes[0], 'resetForm').and.callThrough()
64+
component.setState({...mockFormData})
65+
component.find('button').at(1).simulate("click", mockEvent)
66+
expect(component.nodes[0].resetForm).toBeCalled()
67+
expect(component.state()).not.toEqual(mockFormData)
68+
})

src/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import React from 'react';
2-
import ReactDOM from 'react-dom';
3-
import App from './App';
4-
import './index.css';
1+
import React from 'react'
2+
import ReactDOM from 'react-dom'
3+
import App from './App'
4+
import './index.css'
55

66
ReactDOM.render(
77
<App />,
88
document.getElementById('mountMyApp')
9-
);
9+
)

src/layout/Footer.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, {Component} from 'react';
2-
import './Footer.css';
1+
import React, {Component} from 'react'
2+
import './Footer.css'
33

44
class Footer extends Component {
55
render() {
@@ -9,8 +9,8 @@ class Footer extends Component {
99
Built to help people learn React! It's 2017 now.
1010
</div>
1111
</footer>
12-
);
12+
)
1313
}
1414
}
1515

16-
export default Footer;
16+
export default Footer

src/layout/Footer.spec.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import React from 'react';
2-
import Footer from './Footer';
3-
import { shallow } from 'enzyme';
1+
import React from 'react'
2+
import Footer from './Footer'
3+
import { shallow } from 'enzyme'
44

55
it('renders without crashing', () => {
6-
shallow(<Footer />);
7-
});
6+
shallow(<Footer />)
7+
})
88

99
it('contains 2017 in the text', () => {
10-
const component = shallow(<Footer />);
11-
expect(component.text()).toContain("2017");
12-
});
10+
const component = shallow(<Footer />)
11+
expect(component.text()).toContain("2017")
12+
})

src/layout/Header.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
import React, {Component} from 'react';
2-
import './Header.css';
3-
import {NavLink} from 'react-router-dom';
4-
import menuItems from '../sampleData/menuItems';
1+
import React, {Component} from 'react'
2+
import './Header.css'
3+
import {NavLink} from 'react-router-dom'
4+
import menuItems from '../sampleData/menuItems'
55

66
class Header extends Component {
77
renderMenuItems(menuItems) {
88
return menuItems.map((menuItem, index) => {
99
const addProps = {
1010
to: menuItem.to,
1111
exact: menuItem.exact
12-
};
12+
}
1313
return (
1414
<li key={index}>
1515
<NavLink className="menu-item"
1616
activeClassName="menu-itm--current"
1717
{...addProps}>{menuItem.caption}</NavLink>
1818
</li>
19-
);
20-
});
19+
)
20+
})
2121
}
2222

2323
render() {
@@ -34,8 +34,8 @@ class Header extends Component {
3434
</nav>
3535
</div>
3636
</header>
37-
);
37+
)
3838
}
3939
}
4040

41-
export default Header;
41+
export default Header

src/layout/Header.spec.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
import React from 'react';
2-
import Header from './Header';
3-
import { shallow } from 'enzyme';
1+
import React from 'react'
2+
import Header from './Header'
3+
import { shallow } from 'enzyme'
44

55
it('renders without crashing', () => {
6-
shallow(<Header />);
7-
});
6+
shallow(<Header />)
7+
})
88

99
it('has h1 title', () => {
10-
const component = shallow(<Header />);
11-
expect(component.find('h1').text()).toContain("My React Site");
12-
});
10+
const component = shallow(<Header />)
11+
expect(component.find('h1').text()).toContain("My React Site")
12+
})
1313

1414
it('contains x2 NavLink (menu items)', () => {
15-
const component = shallow(<Header />);
16-
expect(component.find('li > NavLink').length).toEqual(2);
17-
});
15+
const component = shallow(<Header />)
16+
expect(component.find('li > NavLink').length).toEqual(2)
17+
})
1818

1919
it('navigation has correct links', () => {
20-
const component = shallow(<Header />);
21-
expect(component.find('li > NavLink').at(0).props().children).toContain("Home");
22-
expect(component.find('li > NavLink').at(0).props().to).toEqual("/");
23-
expect(component.find('li > NavLink').at(1).props().children).toContain("Contact");
24-
expect(component.find('li > NavLink').at(1).props().to).toEqual("/contact");
25-
});
20+
const component = shallow(<Header />)
21+
expect(component.find('li > NavLink').at(0).props().children).toContain("Home")
22+
expect(component.find('li > NavLink').at(0).props().to).toEqual("/")
23+
expect(component.find('li > NavLink').at(1).props().children).toContain("Contact")
24+
expect(component.find('li > NavLink').at(1).props().to).toEqual("/contact")
25+
})

0 commit comments

Comments
 (0)