fix tests

euZebe · Apr 13, 2018 · 042e730 · 042e730
1 parent 48ee24f
commit 042e730
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/src/store/reducers.js b/src/store/reducers.js
@@ -10,6 +10,8 @@ import {
 
 export const getTableOfCellsSelector = state => state.cellsTable.present;
 export const getHoneyCombSelector = state => state.hexaCells.present;
+export const getPastHoneyCombSelector = state => state.hexaCells.past;
+export const getFutureHoneyCombSelector = state => state.hexaCells.future;
 export const honeyCombAsSingleArraySelector = createSelector(
  getHoneyCombSelector,
  arrayOfRows => [].concat.apply([], arrayOfRows),

diff --git a/src/store/reducers.spec.js b/src/store/reducers.spec.js
@@ -5,11 +5,14 @@ import { RECTANGLE, HEXAGON } from '../model/shapes';
 describe('getTableOfCellsSelector', () => {
  test('should select cells in a table according to their position', () => {
  const state = {
- cellsTable: [
- [ALIVE, DEAD],
- [DEAD, DEAD],
- [ALIVE, ALIVE],
- ],
+ cellsTable: {
+ past:[],
+ present: [
+ [ALIVE, DEAD],
+ [DEAD, DEAD],
+ [ALIVE, ALIVE],
+ ],
+ },
  shape: {
  shape: RECTANGLE.value,
  height: 3,
@@ -23,12 +26,14 @@ describe('getTableOfCellsSelector', () => {
 
  test('should return an empty array if hexagon is current', () => {
  const state = {
- cellsTable: [],
- hexaCells: [
- [ALIVE, DEAD],
- [DEAD, DEAD],
- [ALIVE, ALIVE],
- ],
+ cellsTable: {present:[]},
+ hexaCells: {
+ present: [
+ [ALIVE, DEAD],
+ [DEAD, DEAD],
+ [ALIVE, ALIVE],
+ ],
+ },
  shape: {
  shape: HEXAGON.value,
  height: 3,
@@ -42,12 +47,14 @@ describe('getTableOfCellsSelector', () => {
 describe('getHoneyCombSelector', () => {
  test('should select cells in a table according to their position', () => {
  const state = {
- hexaCells: [
+ hexaCells: {present:[
  [ALIVE, DEAD],
  [DEAD, DEAD],
  [ALIVE, ALIVE],
- ],
- cellsTable: [],
+ ],},
+ cellsTable: {
+ present: []
+ },
  shape: {
  shape: HEXAGON.value,
  rows: 3,

diff --git a/src/ui/BoardContainer.js b/src/ui/BoardContainer.js
@@ -1,15 +1,18 @@
 import { connect } from 'react-redux';
 import { ActionCreators as UndoActionCreators } from 'redux-undo'
 import Board from './Board';
-import {getHoneyCombSelector, getShapeSelector, getTableOfCellsSelector} from '../store/reducers';
+import {
+ getFutureHoneyCombSelector, getHoneyCombSelector, getPastHoneyCombSelector, getShapeSelector,
+ getTableOfCellsSelector
+} from '../store/reducers';
 import { toggleStatus } from '../store/cell-duck';
 
 const mapStateToProps = (state) => ({
  tableOfCells: getTableOfCellsSelector(state),
  honeyComb: getHoneyCombSelector(state),
  shape: getShapeSelector,
- canRedo: true,
- canUndo: true,
+ canRedo: getFutureHoneyCombSelector(state).length,
+ canUndo: getPastHoneyCombSelector(state).length,
 
 });