fingerprint/mtlstats
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use ?~ operator (where applicable)

This commit is contained in:
Jonathan Lamothe 2019-08-22 10:25:23 -04:00
parent 2e6a0f5ba4
commit 4f2dd119d2
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mtlstats/Actions.hs
View File

@ -29,7 +29,7 @@ module Mtlstats.Actions
, setAwayGame
) where
import Lens.Micro (over, (&), (.~), (%~))
import Lens.Micro (over, (&), (.~), (?~), (%~))
import Mtlstats.Types
@ -52,11 +52,11 @@ startNewGame
-- | Sets the game type to 'HomeGame'
setHomeGame :: ProgState -> ProgState
setHomeGame = over progMode $ \case
NewGame gs -> NewGame (gs & gameType .~ Just HomeGame)
_ -> NewGame $ newGameState & gameType .~ Just HomeGame
NewGame gs -> NewGame (gs & gameType ?~ HomeGame)
_ -> NewGame $ newGameState & gameType ?~ HomeGame
-- | Sets the game type to 'AwayGame'
setAwayGame :: ProgState -> ProgState
setAwayGame = over progMode $ \case
NewGame gs -> NewGame (gs & gameType .~ Just AwayGame)
_ -> NewGame $ newGameState & gameType .~ Just AwayGame
NewGame gs -> NewGame (gs & gameType ?~ AwayGame)
_ -> NewGame $ newGameState & gameType ?~ AwayGame

6
test/ActionsSpec.hs
View File

@ -22,7 +22,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
module ActionsSpec (spec) where
import Control.Monad (replicateM)
import Lens.Micro ((&), (.~), (^.))
import Lens.Micro ((&), (.~), (?~), (^.))
import System.Random (randomRIO)
import Test.Hspec (Spec, context, describe, it, shouldBe, shouldNotBe)
@ -108,7 +108,7 @@ resetYtdSpec = describe "resetYtd" $
setHomeGameSpec :: Spec
setHomeGameSpec = describe "setHomeGame" $ do
let m = NewGame $ newGameState & gameType .~ Just HomeGame
let m = NewGame $ newGameState & gameType ?~ HomeGame
context "unexpected mode" $
it "should set the game type" $ let
@ -124,7 +124,7 @@ setHomeGameSpec = describe "setHomeGame" $ do
setAwayGameSpec :: Spec
setAwayGameSpec = describe "setAwayGame" $ do
let m = NewGame $ newGameState & gameType .~ Just AwayGame
let m = NewGame $ newGameState & gameType ?~ AwayGame
context "unexpected mode" $
it "should set the game type" $ let

8
test/TypesSpec.hs
View File

@ -25,7 +25,7 @@ module TypesSpec (spec) where
import Data.Aeson (decode, encode)
import Data.ByteString.Lazy (ByteString)
import Lens.Micro ((&), (.~))
import Lens.Micro ((&), (.~), (?~))
import Test.Hspec (Spec, context, describe, it, shouldBe)
import Text.RawString.QQ (r)
import Mtlstats.Types
@ -63,9 +63,9 @@ teamPointsSpec :: Spec
teamPointsSpec = describe "teamPoints" $ do
let
m t = NewGame $ newGameState
& gameType .~ Just t
& homeScore .~ Just 1
& awayScore .~ Just 2
& gameType ?~ t
& homeScore ?~ 1
& awayScore ?~ 2
s t = newProgState
& progMode .~ m t