From 11361fd8147e7238e2308f26654f09f9679ca022 Mon Sep 17 00:00:00 2001 From: Thomas Hintz Date: Tue, 28 Apr 2020 17:27:30 -0700 Subject: [PATCH] Markup updates for automated testing. --- .../create-or-join/CreateOrJoin.jsx | 2 +- src/components/farm/Board.jsx | 32 ++++++++++--------- .../LoginOrCreateAccount.jsx | 2 +- src/components/welcome/Welcome.jsx | 2 +- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/components/create-or-join/CreateOrJoin.jsx b/src/components/create-or-join/CreateOrJoin.jsx index 471f5d8..7ac1dce 100644 --- a/src/components/create-or-join/CreateOrJoin.jsx +++ b/src/components/create-or-join/CreateOrJoin.jsx @@ -35,7 +35,7 @@ class CreateOrJoin extends React.Component { return (
text
- {(this.props.start.start.games.length > 0) || (this.props.start.start.openGames.length > 0) ? ( diff --git a/src/components/farm/Board.jsx b/src/components/farm/Board.jsx index dc05838..3c63962 100644 --- a/src/components/farm/Board.jsx +++ b/src/components/farm/Board.jsx @@ -51,6 +51,8 @@ import { buy, roll, endTurn, loan, trade, submitTradeAccept, leaveGame, kickPlayer, toggleRevealForTrade, addAIPlayer } from './interface.js' +const showScreenDelay = 2000; + function netWorth(player) { return ((player.assets.hay + player.assets.grain) * 2000) + (player.assets.fruit * 5000) + @@ -212,7 +214,7 @@ class PlayerTurnContainer extends React.Component { } else if (player.state === GAME_STATES.preTurn) { view = ( - {' '}{auditButton} + {' '}{auditButton} ); } else if (player.state === GAME_STATES.midTurn) { @@ -235,7 +237,7 @@ class PlayerTurnContainer extends React.Component { } else { view = ( - {' '}{auditButton} ); @@ -1249,7 +1251,7 @@ class Die extends React.Component { {this.props.skip && !this.state.finalFace ? (
- +
) : ()} @@ -1342,7 +1344,7 @@ class Harvest extends React.Component { {this.props.crop === 'cows' ? ' head of cow' : ' acres'}! {isCurrentPlayer || this.props.currentPlayer.ai ? ( - ) : ()} @@ -1359,7 +1361,7 @@ class Harvest extends React.Component { showScreen={() => this.nextView('income')} skip={this.props.player.name === this.props.game.currentPlayer || this.props.currentPlayer.ai} autoSkip={this.props.autoSkip === 'die'} - showScreenDelay={2000} />); + showScreenDelay={showScreenDelay} />); break; case 'income': view = ( @@ -1392,7 +1394,7 @@ class Harvest extends React.Component { {isCurrentPlayer || this.props.currentPlayer.ai ? (
- +
) : ()} @@ -1428,7 +1430,7 @@ class Harvest extends React.Component { {isCurrentPlayer || this.props.currentPlayer.ai ? (
- +
) : ()} @@ -1454,9 +1456,9 @@ class Moving extends React.Component { buttons = (); } else if (this.props.ui.playerSpaces[(this.props.currentPlayer.ai && this.props.currentPlayer.color) || this.props.player.color] === this.props.ui.actionValue.to) { - buttons = (); + buttons = (); } else { - buttons = (); + buttons = (); } const { currentPlayer } = this.props; return ( @@ -1518,7 +1520,7 @@ class Action extends React.Component { ); } - buttons = (); + buttons = (); break; case 'farmers-fate': view = ( @@ -1529,7 +1531,7 @@ class Action extends React.Component { ); - buttons = (); + buttons = (); break; case 'ff-uncle-bert': const { cash } = this.props.player; @@ -1593,7 +1595,7 @@ class Action extends React.Component { ); - buttons = (); + buttons = (); break; case 'info': view = ( @@ -1601,7 +1603,7 @@ class Action extends React.Component {

{this.props.ui.actionValue}

); - buttons = (); + buttons = (); break; case 'harvest': view = (); + showScreenDelay={showScreenDelay} />); buttons = (); break; default: @@ -1693,7 +1695,7 @@ class Action extends React.Component { game={this.props.game} />); } else if (currentPlayer.ai) { view = ( - ); diff --git a/src/components/login-or-create-account/LoginOrCreateAccount.jsx b/src/components/login-or-create-account/LoginOrCreateAccount.jsx index 37b6f78..378878d 100644 --- a/src/components/login-or-create-account/LoginOrCreateAccount.jsx +++ b/src/components/login-or-create-account/LoginOrCreateAccount.jsx @@ -42,7 +42,7 @@ export default class LoginOrCreateAccount extends React.Component { createAccount={this.props.createAccount} /> )} ); diff --git a/src/components/welcome/Welcome.jsx b/src/components/welcome/Welcome.jsx index c047a8a..31a94e2 100644 --- a/src/components/welcome/Welcome.jsx +++ b/src/components/welcome/Welcome.jsx @@ -32,7 +32,7 @@ class Welcome extends React.Component { Your ancestors were farmers on one of the first transports to Alpha Centuari{`'`}s Proxima b. The growing season is short and harsh but the colonists depend on you for their food. Are you up to the challenge? -