From bc04d85aea467557ac7e4dd5972e1d776fa9f730 Mon Sep 17 00:00:00 2001 From: Clement G Date: Mon, 10 Jun 2019 15:11:59 +0200 Subject: [PATCH] use Election instead of Ballot (to be coherent with MVAPI) --- src/App.test.js | 14 +++++++------- src/Routes.js | 4 ++-- src/components/layouts/Header.js | 2 +- .../views/{CreateBallot.js => CreateElection.js} | 4 ++-- src/components/views/Home.js | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) rename src/components/views/{CreateBallot.js => CreateElection.js} (99%) diff --git a/src/App.test.js b/src/App.test.js index a73e9c6..d931f2d 100644 --- a/src/App.test.js +++ b/src/App.test.js @@ -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( + it('should show CreateElection view component for `/create-election`', () => { + const wrapper = mount( ); - 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( + it('should show CreateElection view component with title for `/create-election/?title=test%20with%20title`', () => { + const wrapper = mount( ); - 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); }); diff --git a/src/Routes.js b/src/Routes.js index 5d67835..ac5e0bf 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -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 (
- + diff --git a/src/components/layouts/Header.js b/src/components/layouts/Header.js index 235fe15..e3b4c89 100644 --- a/src/components/layouts/Header.js +++ b/src/components/layouts/Header.js @@ -52,7 +52,7 @@ class Header extends Component { diff --git a/src/components/views/CreateBallot.js b/src/components/views/CreateElection.js similarity index 99% rename from src/components/views/CreateBallot.js rename to src/components/views/CreateElection.js index 362696a..e6ce140 100644 --- a/src/components/views/CreateBallot.js +++ b/src/components/views/CreateElection.js @@ -42,7 +42,7 @@ const SortableCandidatesContainer = sortableContainer(({items, form}) => { ))}; }); -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; diff --git a/src/components/views/Home.js b/src/components/views/Home.js index 3f6a76f..ffdb8ca 100644 --- a/src/components/views/Home.js +++ b/src/components/views/Home.js @@ -29,7 +29,7 @@ class Home extends Component { const redirect = this.state.redirect; if (redirect) { - return