use Election instead of Ballot (to be coherent with MVAPI)

pull/4/head
Clement G 5 years ago committed by guhur
parent 03d28c2007
commit bc04d85aea

@ -8,7 +8,7 @@ import Adapter from 'enzyme-adapter-react-16';
import {mount, configure} from 'enzyme';
import Home from "./components/views/Home.js";
import CreateBallot from "./components/views/CreateBallot.js";
import CreateElection from "./components/views/CreateElection.js";
import Result from "./components/views/Result.js";
import Vote from "./components/views/Vote.js";
import UnknownView from "./components/views/UnknownView";
@ -35,21 +35,21 @@ describe('open good View component for each route', () => {
});
it('should show CreateBallot view component for `/create-ballot`', () => {
const wrapper = mount(<MemoryRouter initialEntries={['/create-ballot']}>
it('should show CreateElection view component for `/create-election`', () => {
const wrapper = mount(<MemoryRouter initialEntries={['/create-election']}>
<Routes/>
</MemoryRouter>
);
expect(wrapper.find(CreateBallot)).toHaveLength(1);
expect(wrapper.find(CreateElection)).toHaveLength(1);
expect(wrapper.find(UnknownView)).toHaveLength(0);
});
it('should show CreateBallot view component with title for `/create-ballot/?title=test%20with%20title`', () => {
const wrapper = mount(<MemoryRouter initialEntries={['/create-ballot/?title=test%20with%20title']}>
it('should show CreateElection view component with title for `/create-election/?title=test%20with%20title`', () => {
const wrapper = mount(<MemoryRouter initialEntries={['/create-election/?title=test%20with%20title']}>
<Routes/>
</MemoryRouter>
);
expect(wrapper.find(CreateBallot)).toHaveLength(1);
expect(wrapper.find(CreateElection)).toHaveLength(1);
expect(wrapper.find('input[name="title"]').props().defaultValue).toBe("test with title");
expect(wrapper.find(UnknownView)).toHaveLength(0);
});

@ -2,7 +2,7 @@ import React from 'react';
import {Switch, Route } from "react-router-dom";
import Home from "./components/views/Home.js";
import CreateBallot from "./components/views/CreateBallot.js";
import CreateElection from "./components/views/CreateElection.js";
import Vote from "./components/views/Vote";
import Result from "./components/views/Result";
import UnknownView from "./components/views/UnknownView";
@ -11,7 +11,7 @@ function Routes() {
return (<main className="d-flex flex-column justify-content-center" >
<Switch>
<Route exact path="/" component={Home} />
<Route path="/create-ballot" component={CreateBallot} />
<Route path="/create-election" component={CreateElection} />
<Route path="/vote" component={Vote} />
<Route path="/result" component={Result} />
<Route component={UnknownView} />

@ -52,7 +52,7 @@ class Header extends Component {
<Collapse isOpen={this.state.isOpen} navbar>
<Nav className="ml-auto" navbar>
<NavItem>
<Link className="text-primary nav-link" to="/create-ballot/"><FontAwesomeIcon icon={faRocket} className="mr-2"/> Démarrer un vote</Link>
<Link className="text-primary nav-link" to="/create-election/"><FontAwesomeIcon icon={faRocket} className="mr-2"/> Démarrer un vote</Link>
</NavItem>
</Nav>
</Collapse>

@ -42,7 +42,7 @@ const SortableCandidatesContainer = sortableContainer(({items, form}) => {
))}</ul>;
});
class CreateBallot extends Component {
class CreateElection extends Component {
constructor(props) {
super(props);
@ -216,4 +216,4 @@ class CreateBallot extends Component {
)
}
}
export default CreateBallot;
export default CreateElection;

@ -29,7 +29,7 @@ class Home extends Component {
const redirect = this.state.redirect;
if (redirect) {
return <Redirect to={ '/create-ballot/?title='+encodeURIComponent(this.state.title)} />;
return <Redirect to={ '/create-election/?title='+encodeURIComponent(this.state.title)} />;
}
return(
<Container>

Loading…
Cancel
Save