From c713b52bd26d3a28cf00243e8123699264933b6b Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 01/79] accumulate: Remove test group with exercise's name --- exercises/accumulate/package.yaml | 2 +- exercises/accumulate/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/accumulate/package.yaml b/exercises/accumulate/package.yaml index 9c03189ef..037e179fd 100644 --- a/exercises/accumulate/package.yaml +++ b/exercises/accumulate/package.yaml @@ -1,5 +1,5 @@ name: accumulate -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/accumulate/test/Tests.hs b/exercises/accumulate/test/Tests.hs index 1ecc7839d..cee88bd74 100644 --- a/exercises/accumulate/test/Tests.hs +++ b/exercises/accumulate/test/Tests.hs @@ -1,5 +1,5 @@ import Data.Char (toUpper) -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Accumulate (accumulate) @@ -8,7 +8,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "accumulate" $ do +specs = do let square x = x * x :: Int From 7157446ebf5ef7bbc65727c9361d4a9e5a9015d9 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 02/79] acronym: Remove test group with exercise's name --- exercises/acronym/package.yaml | 2 +- exercises/acronym/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/acronym/package.yaml b/exercises/acronym/package.yaml index 52304d796..7ecbc93cb 100644 --- a/exercises/acronym/package.yaml +++ b/exercises/acronym/package.yaml @@ -1,5 +1,5 @@ name: acronym -version: 1.0.0.1 +version: 1.0.0.2 dependencies: - base diff --git a/exercises/acronym/test/Tests.hs b/exercises/acronym/test/Tests.hs index b1cc3eab1..d729d3125 100644 --- a/exercises/acronym/test/Tests.hs +++ b/exercises/acronym/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "acronym" $ - describe "abbreviate" $ for_ cases test +specs = describe "abbreviate" $ for_ cases test where test Case {..} = it description $ abbreviate input `shouldBe` expected From dcef07f99c7cbe14f7cbe835271ce3e06ab22864 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 03/79] all-your-base: Remove test group with exercise's name --- exercises/all-your-base/package.yaml | 2 +- exercises/all-your-base/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/all-your-base/package.yaml b/exercises/all-your-base/package.yaml index 271a1b692..8c53f1eca 100644 --- a/exercises/all-your-base/package.yaml +++ b/exercises/all-your-base/package.yaml @@ -1,5 +1,5 @@ name: all-your-base -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/all-your-base/test/Tests.hs b/exercises/all-your-base/test/Tests.hs index 98f22e732..57579b51f 100644 --- a/exercises/all-your-base/test/Tests.hs +++ b/exercises/all-your-base/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "all-your-base" $ - describe "rebase" $ for_ cases test +specs = describe "rebase" $ for_ cases test where test Case{..} = it description assertion From 93430969fd438304e8e358c7e2c2008fd119f900 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 04/79] allergies: Remove test group with exercise's name --- exercises/allergies/package.yaml | 2 +- exercises/allergies/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/allergies/package.yaml b/exercises/allergies/package.yaml index 631990890..9f9304a32 100644 --- a/exercises/allergies/package.yaml +++ b/exercises/allergies/package.yaml @@ -1,5 +1,5 @@ name: allergies -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/allergies/test/Tests.hs b/exercises/allergies/test/Tests.hs index 4d18ac096..548496768 100644 --- a/exercises/allergies/test/Tests.hs +++ b/exercises/allergies/test/Tests.hs @@ -21,7 +21,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "allergies" $ do +specs = do describe "isAllergicTo" $ do From e7a92fc0375faa4528eb022404106b7ef445741a Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 05/79] alphametics: Remove test group with exercise's name --- exercises/alphametics/package.yaml | 2 +- exercises/alphametics/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/alphametics/package.yaml b/exercises/alphametics/package.yaml index 275f613b7..c774ad610 100644 --- a/exercises/alphametics/package.yaml +++ b/exercises/alphametics/package.yaml @@ -1,5 +1,5 @@ name: alphametics -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/alphametics/test/Tests.hs b/exercises/alphametics/test/Tests.hs index eda3e3257..8ef726c44 100644 --- a/exercises/alphametics/test/Tests.hs +++ b/exercises/alphametics/test/Tests.hs @@ -12,8 +12,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "alphametics" $ - describe "solve" $ for_ cases test +specs = describe "solve" $ for_ cases test where test Case{..} = it description assertion From 132f01047bfea63d81ebeacaefbf99daa3c4e486 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 06/79] anagram: Remove test group with exercise's name --- exercises/anagram/package.yaml | 2 +- exercises/anagram/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/anagram/package.yaml b/exercises/anagram/package.yaml index 9baeb6c3b..44e79a9f0 100644 --- a/exercises/anagram/package.yaml +++ b/exercises/anagram/package.yaml @@ -1,5 +1,5 @@ name: anagram -version: 1.0.1.3 +version: 1.0.1.4 dependencies: - base diff --git a/exercises/anagram/test/Tests.hs b/exercises/anagram/test/Tests.hs index db9eed1cf..6d02d851f 100644 --- a/exercises/anagram/test/Tests.hs +++ b/exercises/anagram/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "anagram" $ - describe "anagramsFor" $ for_ cases test +specs = describe "anagramsFor" $ for_ cases test where test Case{..} = it description $ expression `shouldMatchList` expected From d69f6f25a667fed6544cb37c213e2e3d9ad67245 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 07/79] atbash-cipher: Remove test group with exercise's name --- exercises/atbash-cipher/package.yaml | 2 +- exercises/atbash-cipher/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/atbash-cipher/package.yaml b/exercises/atbash-cipher/package.yaml index f39d3513f..ce496785f 100644 --- a/exercises/atbash-cipher/package.yaml +++ b/exercises/atbash-cipher/package.yaml @@ -1,5 +1,5 @@ name: atbash-cipher -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/atbash-cipher/test/Tests.hs b/exercises/atbash-cipher/test/Tests.hs index 40d2a605c..ded0cb1dd 100644 --- a/exercises/atbash-cipher/test/Tests.hs +++ b/exercises/atbash-cipher/test/Tests.hs @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "atbash-cipher" $ do +specs = do describe "encode" $ for_ encodeCases $ test encode describe "decode" $ for_ decodeCases $ test decode where From 1a1b7d85488b6f9c900a7f837811012c48522722 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 08/79] bank-account: Remove test group with exercise's name --- exercises/bank-account/package.yaml | 2 +- exercises/bank-account/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/bank-account/package.yaml b/exercises/bank-account/package.yaml index 9649ed7ee..dd8dac798 100644 --- a/exercises/bank-account/package.yaml +++ b/exercises/bank-account/package.yaml @@ -1,5 +1,5 @@ name: bank-account -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/bank-account/test/Tests.hs b/exercises/bank-account/test/Tests.hs index 25f7b665f..8f58f82bd 100644 --- a/exercises/bank-account/test/Tests.hs +++ b/exercises/bank-account/test/Tests.hs @@ -1,7 +1,7 @@ import Control.Concurrent (forkIO, newEmptyMVar, putMVar, takeMVar) import Control.Monad (replicateM) import Data.Foldable (for_) -import Test.Hspec (Spec, describe, it, shouldReturn) +import Test.Hspec (Spec, it, shouldReturn) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import BankAccount @@ -15,7 +15,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "bank-account" $ do +specs = do it "initial balance is 0" $ do account <- openAccount From 31b61ed024904ffe342846b6ee0d0f12bd5fa5ce Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 09/79] beer-song: Remove test group with exercise's name --- exercises/beer-song/package.yaml | 2 +- exercises/beer-song/test/Tests.hs | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/exercises/beer-song/package.yaml b/exercises/beer-song/package.yaml index 46bc5d3e2..46994eb3f 100644 --- a/exercises/beer-song/package.yaml +++ b/exercises/beer-song/package.yaml @@ -1,5 +1,5 @@ name: beer-song -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/beer-song/test/Tests.hs b/exercises/beer-song/test/Tests.hs index 96df729c2..a1eb0db4e 100644 --- a/exercises/beer-song/test/Tests.hs +++ b/exercises/beer-song/test/Tests.hs @@ -9,20 +9,18 @@ main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "beer-song" $ +specs = describe "song" $ do - describe "song" $ do + -- First we test the input, line by line, to give more + -- useful error messages. - -- First we test the input, line by line, to give more - -- useful error messages. + it "matches lines" $ sequence_ lineAssertions - it "matches lines" $ sequence_ lineAssertions + -- Finally, because testing lines we are unable + -- to detect a missing newline at the end of the + -- lyrics, we test the full song. - -- Finally, because testing lines we are unable - -- to detect a missing newline at the end of the - -- lyrics, we test the full song. - - it "matches full song" $ song `shouldBe` lyrics + it "matches full song" $ song `shouldBe` lyrics where lineAssertions = zipWith checkLine [1 :: Int ..] $ zipMaybe (lines song) (lines lyrics) From 0ca6aa0b4d753ce5aa8cbdd959095b6b378c5afa Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 10/79] binary: Remove test group with exercise's name --- exercises/binary/package.yaml | 2 +- exercises/binary/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/binary/package.yaml b/exercises/binary/package.yaml index e901d330b..93455d973 100644 --- a/exercises/binary/package.yaml +++ b/exercises/binary/package.yaml @@ -1,5 +1,5 @@ name: binary -version: 0.9.0.1 # 2016-07-26 +version: 0.9.0.2 # 2016-07-26 dependencies: - base diff --git a/exercises/binary/test/Tests.hs b/exercises/binary/test/Tests.hs index dd731b829..620031ae9 100644 --- a/exercises/binary/test/Tests.hs +++ b/exercises/binary/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "binary" $ - describe "toDecimal" $ for_ cases test +specs = describe "toDecimal" $ for_ cases test where test Case{..} = it description assertion From ca9e31cad7a344084bfd58d96463fb6e4a9e2b88 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 11/79] binary-search-tree: Remove test group with exercise's name --- exercises/binary-search-tree/package.yaml | 2 +- exercises/binary-search-tree/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/binary-search-tree/package.yaml b/exercises/binary-search-tree/package.yaml index 19aec6ff3..b59971588 100644 --- a/exercises/binary-search-tree/package.yaml +++ b/exercises/binary-search-tree/package.yaml @@ -1,5 +1,5 @@ name: binary-search-tree -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/binary-search-tree/test/Tests.hs b/exercises/binary-search-tree/test/Tests.hs index 22ff57567..3f9098217 100644 --- a/exercises/binary-search-tree/test/Tests.hs +++ b/exercises/binary-search-tree/test/Tests.hs @@ -1,4 +1,4 @@ -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import BST @@ -16,7 +16,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "binary-seach-tree" $ do +specs = do let int4 = 4 :: Int let noInts = [] :: [Int] From f49582208f48929c3234783d29a89ea00650880f Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 12/79] bob: Remove test group with exercise's name --- exercises/bob/package.yaml | 2 +- exercises/bob/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/bob/package.yaml b/exercises/bob/package.yaml index 0f396471c..f17bd4c60 100644 --- a/exercises/bob/package.yaml +++ b/exercises/bob/package.yaml @@ -1,5 +1,5 @@ name: bob -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/bob/test/Tests.hs b/exercises/bob/test/Tests.hs index 53d1fb876..30a0c18d4 100644 --- a/exercises/bob/test/Tests.hs +++ b/exercises/bob/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "bob" $ - describe "responseFor" $ for_ cases test +specs = describe "responseFor" $ for_ cases test where test Case{..} = it description $ responseFor input `shouldBe` expected From cdb1e2b03d0c7ff782893bab32dab3645e1dddbb Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 13/79] bowling: Remove test group with exercise's name --- exercises/bowling/package.yaml | 2 +- exercises/bowling/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/bowling/package.yaml b/exercises/bowling/package.yaml index ec3932e58..85e3ca310 100644 --- a/exercises/bowling/package.yaml +++ b/exercises/bowling/package.yaml @@ -1,5 +1,5 @@ name: bowling -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/bowling/test/Tests.hs b/exercises/bowling/test/Tests.hs index 5a1b0ec78..aab069882 100644 --- a/exercises/bowling/test/Tests.hs +++ b/exercises/bowling/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "bowling" $ - describe "roll, score" $ for_ cases test +specs = describe "roll, score" $ for_ cases test where test Case{..} = it description assertion From 5e7f8df7a94da64ff09d75af6c04c1ebdfdd8f86 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 14/79] bracket-push: Remove test group with exercise's name --- exercises/bracket-push/package.yaml | 2 +- exercises/bracket-push/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/bracket-push/package.yaml b/exercises/bracket-push/package.yaml index f542ac8da..e6a4dd7ce 100644 --- a/exercises/bracket-push/package.yaml +++ b/exercises/bracket-push/package.yaml @@ -1,5 +1,5 @@ name: bracket-push -version: 1.1.0.1 +version: 1.1.0.2 dependencies: - base diff --git a/exercises/bracket-push/test/Tests.hs b/exercises/bracket-push/test/Tests.hs index 1de8ba9e2..fbee1f3e5 100644 --- a/exercises/bracket-push/test/Tests.hs +++ b/exercises/bracket-push/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "bracket-push" $ - describe "arePaired" $ for_ cases test +specs = describe "arePaired" $ for_ cases test where test Case{..} = it description $ arePaired input `shouldBe` expected From b2b92890959d39fe12862d48070c170ef1762320 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 15/79] clock: Remove test group with exercise's name --- exercises/clock/package.yaml | 2 +- exercises/clock/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/clock/package.yaml b/exercises/clock/package.yaml index c59d6e54e..297263065 100644 --- a/exercises/clock/package.yaml +++ b/exercises/clock/package.yaml @@ -1,5 +1,5 @@ name: clock -version: 1.0.1.2 +version: 1.0.1.3 dependencies: - base diff --git a/exercises/clock/test/Tests.hs b/exercises/clock/test/Tests.hs index b4f72e9a5..d9d228a7a 100644 --- a/exercises/clock/test/Tests.hs +++ b/exercises/clock/test/Tests.hs @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "clock" $ do +specs = do -- Track-specific tests. From 9b02394981f019287c5097ef1d6c888fb9f1f06e Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 16/79] connect: Remove test group with exercise's name --- exercises/connect/package.yaml | 2 +- exercises/connect/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/connect/package.yaml b/exercises/connect/package.yaml index 2ab9b8bd0..e962a1828 100644 --- a/exercises/connect/package.yaml +++ b/exercises/connect/package.yaml @@ -1,5 +1,5 @@ name: connect -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/connect/test/Tests.hs b/exercises/connect/test/Tests.hs index 674677619..c733f5795 100644 --- a/exercises/connect/test/Tests.hs +++ b/exercises/connect/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "connect" $ - describe "winner" $ for_ cases test +specs = describe "winner" $ for_ cases test where test Case{..} = it description assertion From 5e9f03ad5a16a4708e8ca91807f94d654219acb6 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 17/79] crypto-square: Remove test group with exercise's name --- exercises/crypto-square/package.yaml | 2 +- exercises/crypto-square/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/crypto-square/package.yaml b/exercises/crypto-square/package.yaml index 74d0e7826..ea1cc2e70 100644 --- a/exercises/crypto-square/package.yaml +++ b/exercises/crypto-square/package.yaml @@ -1,5 +1,5 @@ name: crypto-square -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/crypto-square/test/Tests.hs b/exercises/crypto-square/test/Tests.hs index d6eec8406..a7a7c1975 100644 --- a/exercises/crypto-square/test/Tests.hs +++ b/exercises/crypto-square/test/Tests.hs @@ -12,8 +12,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "crypto-square" $ - describe "encode" $ for_ cases test +specs = describe "encode" $ for_ cases test where test Case{..} = describe description $ do From bbaf630f6f8fab40e93b65021465496e83ea4b0c Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 18/79] custom-set: Remove test group with exercise's name --- exercises/custom-set/package.yaml | 2 +- exercises/custom-set/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/custom-set/package.yaml b/exercises/custom-set/package.yaml index 1a7f05ae6..db243a34f 100644 --- a/exercises/custom-set/package.yaml +++ b/exercises/custom-set/package.yaml @@ -1,5 +1,5 @@ name: custom-set -version: 1.0.1.2 +version: 1.0.1.3 dependencies: - base diff --git a/exercises/custom-set/test/Tests.hs b/exercises/custom-set/test/Tests.hs index 249a58c02..eb325877e 100644 --- a/exercises/custom-set/test/Tests.hs +++ b/exercises/custom-set/test/Tests.hs @@ -25,7 +25,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "custom-set" $ do +specs = do describe "standard tests" $ do From c3f71c4652141b7d7c5b42b5c45e2c2b6ffdf731 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 19/79] difference-of-squares: Remove test group with exercise's name --- exercises/difference-of-squares/package.yaml | 2 +- exercises/difference-of-squares/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/difference-of-squares/package.yaml b/exercises/difference-of-squares/package.yaml index ddacfebc8..45c0ef079 100644 --- a/exercises/difference-of-squares/package.yaml +++ b/exercises/difference-of-squares/package.yaml @@ -1,5 +1,5 @@ name: difference-of-squares -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/difference-of-squares/test/Tests.hs b/exercises/difference-of-squares/test/Tests.hs index 2712d1fb3..c871c84c6 100644 --- a/exercises/difference-of-squares/test/Tests.hs +++ b/exercises/difference-of-squares/test/Tests.hs @@ -9,7 +9,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "differenceOfSquares" $ do +specs = do describe "squareOfSums" $ do it "square of sum 5" $ squareOfSums 5 `shouldBe` 225 From 6b2335a2704d5ca1ddea20595ad6376f5a889735 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 20/79] dominoes: Remove test group with exercise's name --- exercises/dominoes/package.yaml | 2 +- exercises/dominoes/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/dominoes/package.yaml b/exercises/dominoes/package.yaml index 76b1e649a..beefb1712 100644 --- a/exercises/dominoes/package.yaml +++ b/exercises/dominoes/package.yaml @@ -1,5 +1,5 @@ name: dominoes -version: 1.0.1.3 +version: 1.0.1.4 dependencies: - base diff --git a/exercises/dominoes/test/Tests.hs b/exercises/dominoes/test/Tests.hs index dbdfe22e2..c7ff0e8ef 100644 --- a/exercises/dominoes/test/Tests.hs +++ b/exercises/dominoes/test/Tests.hs @@ -14,8 +14,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "dominoes" $ - describe "chain" $ for_ cases test +specs = describe "chain" $ for_ cases test where test Case{..} = it description assertion From d54eb00795b35cece08b12b12d051ea713343d84 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 21/79] etl: Remove test group with exercise's name --- exercises/etl/package.yaml | 2 +- exercises/etl/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/etl/package.yaml b/exercises/etl/package.yaml index c36399cdc..8688f1feb 100644 --- a/exercises/etl/package.yaml +++ b/exercises/etl/package.yaml @@ -1,5 +1,5 @@ name: etl -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/etl/test/Tests.hs b/exercises/etl/test/Tests.hs index e42a746b5..2b297cf9d 100644 --- a/exercises/etl/test/Tests.hs +++ b/exercises/etl/test/Tests.hs @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "etl" $ +specs = describe "transform" $ do From 6c76b0d63cd925ea6d0090984c49abf59718ac9c Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 22/79] food-chain: Remove test group with exercise's name --- exercises/food-chain/package.yaml | 2 +- exercises/food-chain/test/Tests.hs | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/exercises/food-chain/package.yaml b/exercises/food-chain/package.yaml index b91f94f81..c05202599 100644 --- a/exercises/food-chain/package.yaml +++ b/exercises/food-chain/package.yaml @@ -1,5 +1,5 @@ name: food-chain -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/food-chain/test/Tests.hs b/exercises/food-chain/test/Tests.hs index 831f2fbb9..4bcad0092 100644 --- a/exercises/food-chain/test/Tests.hs +++ b/exercises/food-chain/test/Tests.hs @@ -8,20 +8,18 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "food-chain" $ +specs = describe "song" $ do - describe "song" $ do + -- First we test the input, line by line, to give more + -- useful error messages. - -- First we test the input, line by line, to give more - -- useful error messages. + it "matches lines" $ sequence_ lineAssertions - it "matches lines" $ sequence_ lineAssertions + -- Finally, because testing lines we are unable + -- to detect a missing newline at the end of the + -- lyrics, we test the full song. - -- Finally, because testing lines we are unable - -- to detect a missing newline at the end of the - -- lyrics, we test the full song. - - it "matches full song" $ song `shouldBe` lyrics + it "matches full song" $ song `shouldBe` lyrics where lineAssertions = zipWith checkLine [1 :: Int ..] $ zipMaybe (lines song) (lines lyrics) From 07438cd6931753ec88fb18767122175ac9e3fbc2 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 23/79] forth: Remove test group with exercise's name --- exercises/forth/package.yaml | 2 +- exercises/forth/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/forth/package.yaml b/exercises/forth/package.yaml index 6158651cc..443d42245 100644 --- a/exercises/forth/package.yaml +++ b/exercises/forth/package.yaml @@ -1,5 +1,5 @@ name: forth -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/forth/test/Tests.hs b/exercises/forth/test/Tests.hs index 933345918..e614b2f07 100644 --- a/exercises/forth/test/Tests.hs +++ b/exercises/forth/test/Tests.hs @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "forth" $ do +specs = do let runTexts = fmap toList . foldM (flip evalText) empty From c1d48b527b97771cb19cb03c09f4ba1b48edee10 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 24/79] gigasecond: Remove test group with exercise's name --- exercises/gigasecond/package.yaml | 2 +- exercises/gigasecond/test/Tests.hs | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/exercises/gigasecond/package.yaml b/exercises/gigasecond/package.yaml index 07a298ced..0cec14813 100644 --- a/exercises/gigasecond/package.yaml +++ b/exercises/gigasecond/package.yaml @@ -1,5 +1,5 @@ name: gigasecond -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/gigasecond/test/Tests.hs b/exercises/gigasecond/test/Tests.hs index f99f96d19..9d8119dd7 100644 --- a/exercises/gigasecond/test/Tests.hs +++ b/exercises/gigasecond/test/Tests.hs @@ -19,20 +19,19 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "gigasecond" $ - describe "fromDay" $ do +specs = describe "fromDay" $ do - let dt = readTime defaultTimeLocale - (iso8601DateFormat (Just "%T%Z")) :: String -> UTCTime + let dt = readTime defaultTimeLocale + (iso8601DateFormat (Just "%T%Z")) :: String -> UTCTime - it "from apr 25 2011" $ - fromDay (dt "2011-04-25T00:00:00Z") - `shouldBe` dt "2043-01-01T01:46:40Z" + it "from apr 25 2011" $ + fromDay (dt "2011-04-25T00:00:00Z") + `shouldBe` dt "2043-01-01T01:46:40Z" - it "from jun 13 1977" $ - fromDay (dt "1977-06-13T00:00:00Z") - `shouldBe` dt "2009-02-19T01:46:40Z" + it "from jun 13 1977" $ + fromDay (dt "1977-06-13T00:00:00Z") + `shouldBe` dt "2009-02-19T01:46:40Z" - it "from jul 19 1959" $ - fromDay (dt "1959-07-19T00:00:00Z") - `shouldBe` dt "1991-03-27T01:46:40Z" + it "from jul 19 1959" $ + fromDay (dt "1959-07-19T00:00:00Z") + `shouldBe` dt "1991-03-27T01:46:40Z" From cd940a5edfa7c1efb7973a95412a572408358ceb Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 25/79] go-counting: Remove test group with exercise's name --- exercises/go-counting/package.yaml | 2 +- exercises/go-counting/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/go-counting/package.yaml b/exercises/go-counting/package.yaml index 82adb282a..32757375b 100644 --- a/exercises/go-counting/package.yaml +++ b/exercises/go-counting/package.yaml @@ -1,5 +1,5 @@ name: go-counting -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/go-counting/test/Tests.hs b/exercises/go-counting/test/Tests.hs index e4123538b..299d96153 100644 --- a/exercises/go-counting/test/Tests.hs +++ b/exercises/go-counting/test/Tests.hs @@ -2,7 +2,7 @@ import Data.Bifunctor (first) import Data.MultiSet (fromOccurList, toOccurList) import Data.Set (toAscList) import Data.Tuple (swap) -import Test.Hspec (Spec, describe, it, shouldBe, shouldMatchList) +import Test.Hspec (Spec, it, shouldBe, shouldMatchList) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Counting (Color(Black,White), territories, territoryFor) @@ -11,7 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "go-counting" $ do +specs = do let board5x5 = [ " B " , " B B " From fd062e8f2b505749b6dc252fb2d2c30950c02382 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 26/79] grade-school: Remove test group with exercise's name --- exercises/grade-school/package.yaml | 2 +- exercises/grade-school/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/grade-school/package.yaml b/exercises/grade-school/package.yaml index b699155ef..bf1df70dd 100644 --- a/exercises/grade-school/package.yaml +++ b/exercises/grade-school/package.yaml @@ -1,5 +1,5 @@ name: grade-school -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/grade-school/test/Tests.hs b/exercises/grade-school/test/Tests.hs index 3c4de69d5..b25494469 100644 --- a/exercises/grade-school/test/Tests.hs +++ b/exercises/grade-school/test/Tests.hs @@ -1,6 +1,6 @@ {-# OPTIONS_GHC -fno-warn-type-defaults #-} -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import School (add, empty, grade, sorted) @@ -9,7 +9,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "grade-school" $ do +specs = do let fromList = foldr (uncurry add) empty let fromGrade g = fromList . zip (repeat g) From 1b88c29076da23211e86c060be94f569e8f41eb5 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 27/79] grains: Remove test group with exercise's name --- exercises/grains/package.yaml | 2 +- exercises/grains/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/grains/package.yaml b/exercises/grains/package.yaml index 0274b5d30..445498b02 100644 --- a/exercises/grains/package.yaml +++ b/exercises/grains/package.yaml @@ -1,5 +1,5 @@ name: grains -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/grains/test/Tests.hs b/exercises/grains/test/Tests.hs index 7a9a6c3d8..030908f31 100644 --- a/exercises/grains/test/Tests.hs +++ b/exercises/grains/test/Tests.hs @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "grains" $ do +specs = do describe "square" $ for_ squareCases squareTest describe "total" $ totalTest totalCase where From 30ea2a4285b6472c49bce49e9542e5e931c8208e Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 28/79] hamming: Remove test group with exercise's name --- exercises/hamming/package.yaml | 2 +- exercises/hamming/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/hamming/package.yaml b/exercises/hamming/package.yaml index 0a978e515..ed0b941e5 100644 --- a/exercises/hamming/package.yaml +++ b/exercises/hamming/package.yaml @@ -1,5 +1,5 @@ name: hamming -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/hamming/test/Tests.hs b/exercises/hamming/test/Tests.hs index 8cdfc6202..673ef326d 100644 --- a/exercises/hamming/test/Tests.hs +++ b/exercises/hamming/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "hamming" $ - describe "distance" $ for_ cases test +specs = describe "distance" $ for_ cases test where test Case{..} = it description assertion From f5933ac952b4293fe7c00eaf66b9ddf27d370ffb Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 29/79] hello-world: Remove test group with exercise's name --- exercises/hello-world/package.yaml | 2 +- exercises/hello-world/test/Tests.hs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/exercises/hello-world/package.yaml b/exercises/hello-world/package.yaml index 168753bb5..cb71b1a1e 100644 --- a/exercises/hello-world/package.yaml +++ b/exercises/hello-world/package.yaml @@ -1,5 +1,5 @@ name: hello-world -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/hello-world/test/Tests.hs b/exercises/hello-world/test/Tests.hs index 422d785ce..531f54d1b 100644 --- a/exercises/hello-world/test/Tests.hs +++ b/exercises/hello-world/test/Tests.hs @@ -1,4 +1,4 @@ -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import HelloWorld (hello) @@ -7,7 +7,5 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "hello-world" $ - - it "hello" $ - hello `shouldBe` "Hello, World!" +specs = it "hello" $ + hello `shouldBe` "Hello, World!" From a70eebcc5330d20afeaa429bd0474eba5fcd00f8 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 30/79] hexadecimal: Remove test group with exercise's name --- exercises/hexadecimal/package.yaml | 2 +- exercises/hexadecimal/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/hexadecimal/package.yaml b/exercises/hexadecimal/package.yaml index 95877d9e7..e044dcc34 100644 --- a/exercises/hexadecimal/package.yaml +++ b/exercises/hexadecimal/package.yaml @@ -1,5 +1,5 @@ name: hexadecimal -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/hexadecimal/test/Tests.hs b/exercises/hexadecimal/test/Tests.hs index f511815fe..1197dc18f 100644 --- a/exercises/hexadecimal/test/Tests.hs +++ b/exercises/hexadecimal/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "hexadecimal" $ - describe "hexToInt" $ for_ cases test +specs = describe "hexToInt" $ for_ cases test where test (input, expected) = it description assertion From f11c8cc566acf3edd2c2bff062a1541b0dc390d0 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 31/79] house: Remove test group with exercise's name --- exercises/house/package.yaml | 2 +- exercises/house/test/Tests.hs | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/exercises/house/package.yaml b/exercises/house/package.yaml index c29888049..043b2b854 100644 --- a/exercises/house/package.yaml +++ b/exercises/house/package.yaml @@ -1,5 +1,5 @@ name: house -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/house/test/Tests.hs b/exercises/house/test/Tests.hs index 5dce04e32..7a4dd7b8b 100644 --- a/exercises/house/test/Tests.hs +++ b/exercises/house/test/Tests.hs @@ -8,20 +8,18 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "house" $ +specs = describe "rhyme" $ do - describe "rhyme" $ do + -- First we test the input, line by line, to give more + -- useful error messages. - -- First we test the input, line by line, to give more - -- useful error messages. + it "matches lines" $ sequence_ lineAssertions - it "matches lines" $ sequence_ lineAssertions + -- Finally, because testing lines we are unable + -- to detect a missing newline at the end of the + -- lyrics, we test the full song. - -- Finally, because testing lines we are unable - -- to detect a missing newline at the end of the - -- lyrics, we test the full song. - - it "matches full song" $ rhyme `shouldBe` lyrics + it "matches full song" $ rhyme `shouldBe` lyrics where lineAssertions = zipWith checkLine [1 :: Int ..] $ zipMaybe (lines rhyme) (lines lyrics) From bc8007064c544c41d4063052f32a9fd7714fc281 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 32/79] kindergarten-garden: Remove test group with exercise's name --- exercises/kindergarten-garden/package.yaml | 2 +- exercises/kindergarten-garden/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/kindergarten-garden/package.yaml b/exercises/kindergarten-garden/package.yaml index ca590e45f..4454635c7 100644 --- a/exercises/kindergarten-garden/package.yaml +++ b/exercises/kindergarten-garden/package.yaml @@ -1,5 +1,5 @@ name: kindergarten-garden -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/kindergarten-garden/test/Tests.hs b/exercises/kindergarten-garden/test/Tests.hs index 80bb18f3b..63fc772a7 100644 --- a/exercises/kindergarten-garden/test/Tests.hs +++ b/exercises/kindergarten-garden/test/Tests.hs @@ -1,4 +1,4 @@ -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Garden @@ -16,7 +16,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "kindergarten-garden" $ do +specs = do it "garden with single student" $ do From fc1bc38749da315fc4d806338d8ccda1466d2b31 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 33/79] largest-series-product: Remove test group with exercise's name --- exercises/largest-series-product/package.yaml | 2 +- exercises/largest-series-product/test/Tests.hs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/exercises/largest-series-product/package.yaml b/exercises/largest-series-product/package.yaml index 705bd5a00..773472343 100644 --- a/exercises/largest-series-product/package.yaml +++ b/exercises/largest-series-product/package.yaml @@ -1,5 +1,5 @@ name: largest-series-product -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/largest-series-product/test/Tests.hs b/exercises/largest-series-product/test/Tests.hs index 05230043a..f6de1cf42 100644 --- a/exercises/largest-series-product/test/Tests.hs +++ b/exercises/largest-series-product/test/Tests.hs @@ -9,9 +9,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "largest-series-product" $ - - describe "largestProduct" $ do +specs = describe "largestProduct" $ do it "finds the largest product if span equals length" $ largestProduct 2 "29" From d80d9d69e871bcdfc4c2d74d2663c5a3938f9a78 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 34/79] leap: Remove test group with exercise's name --- exercises/leap/package.yaml | 2 +- exercises/leap/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/leap/package.yaml b/exercises/leap/package.yaml index 01607c014..195153f5a 100644 --- a/exercises/leap/package.yaml +++ b/exercises/leap/package.yaml @@ -1,5 +1,5 @@ name: leap -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/leap/test/Tests.hs b/exercises/leap/test/Tests.hs index 24934466a..eeb93955e 100644 --- a/exercises/leap/test/Tests.hs +++ b/exercises/leap/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "leap" $ - describe "isLeapYear" $ for_ cases test +specs = describe "isLeapYear" $ for_ cases test where test Case{..} = it explanation assertion From b5eba7d386e029cfb411a1f25783c88d74f6702e Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 35/79] lens-person: Remove test group with exercise's name --- exercises/lens-person/package.yaml | 2 +- exercises/lens-person/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/lens-person/package.yaml b/exercises/lens-person/package.yaml index eb05b6e32..6f50c1283 100644 --- a/exercises/lens-person/package.yaml +++ b/exercises/lens-person/package.yaml @@ -1,5 +1,5 @@ name: lens-person -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/lens-person/test/Tests.hs b/exercises/lens-person/test/Tests.hs index df8a6972d..ef165acfc 100644 --- a/exercises/lens-person/test/Tests.hs +++ b/exercises/lens-person/test/Tests.hs @@ -1,6 +1,6 @@ import Data.Char (toUpper) import Data.Time.Calendar (fromGregorian) -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Person @@ -18,7 +18,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "lens-person" $ do +specs = do it "bornStreet" $ (bornStreet . _born) testPerson From 278a47f89c5ac354c837da4e41030c435c2c369d Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 36/79] linked-list: Remove test group with exercise's name --- exercises/linked-list/package.yaml | 2 +- exercises/linked-list/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/linked-list/package.yaml b/exercises/linked-list/package.yaml index 58a0c6f61..af844f4f1 100644 --- a/exercises/linked-list/package.yaml +++ b/exercises/linked-list/package.yaml @@ -1,5 +1,5 @@ name: linked-list -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/linked-list/test/Tests.hs b/exercises/linked-list/test/Tests.hs index 8d83b43ad..1b483741d 100644 --- a/exercises/linked-list/test/Tests.hs +++ b/exercises/linked-list/test/Tests.hs @@ -1,4 +1,4 @@ -import Test.Hspec (Spec, describe, it, shouldReturn) +import Test.Hspec (Spec, it, shouldReturn) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Deque (mkDeque, pop, push, shift, unshift) @@ -8,7 +8,7 @@ main = hspecWith defaultConfig {configFastFail = True} specs {-# ANN module "HLint: ignore Reduce duplication" #-} specs :: Spec -specs = describe "linked-list" $ do +specs = do it "push pop" $ do deque <- mkDeque From e993f48a960d93f296f2186024ad88dbf4131e44 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 37/79] list-ops: Remove test group with exercise's name --- exercises/list-ops/package.yaml | 2 +- exercises/list-ops/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/list-ops/package.yaml b/exercises/list-ops/package.yaml index 0d9e54eeb..bf39ecb0b 100644 --- a/exercises/list-ops/package.yaml +++ b/exercises/list-ops/package.yaml @@ -1,5 +1,5 @@ name: list-ops -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/list-ops/test/Tests.hs b/exercises/list-ops/test/Tests.hs index cb605a619..f97226f86 100644 --- a/exercises/list-ops/test/Tests.hs +++ b/exercises/list-ops/test/Tests.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DeriveAnyClass #-} import Control.Exception (Exception, throw, evaluate) -import Test.Hspec (Spec, describe, it, shouldBe, shouldThrow) +import Test.Hspec (Spec, it, shouldBe, shouldThrow) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Prelude hiding @@ -31,7 +31,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "list-ops" $ do +specs = do let big = 100000 :: Int From f8782b3bfa8ec17e92cf01307f3d0c5df357bb4b Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 38/79] matrix: Remove test group with exercise's name --- exercises/matrix/package.yaml | 2 +- exercises/matrix/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/matrix/package.yaml b/exercises/matrix/package.yaml index 91ea22ba7..0fa3f06b0 100644 --- a/exercises/matrix/package.yaml +++ b/exercises/matrix/package.yaml @@ -1,5 +1,5 @@ name: matrix -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/matrix/test/Tests.hs b/exercises/matrix/test/Tests.hs index dd1d42fe0..e9931920d 100644 --- a/exercises/matrix/test/Tests.hs +++ b/exercises/matrix/test/Tests.hs @@ -1,5 +1,5 @@ import Control.Arrow ((&&&)) -import Test.Hspec (Spec, describe, it, shouldBe, shouldNotBe) +import Test.Hspec (Spec, it, shouldBe, shouldNotBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import qualified Data.Vector as Vector (fromList) @@ -22,7 +22,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "matrix" $ do +specs = do let intMatrix = fromString :: String -> Matrix Int let vector = Vector.fromList From d11ceced92e0b5684e33d9b8ae98c113434d17ca Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 39/79] meetup: Remove test group with exercise's name --- exercises/meetup/package.yaml | 2 +- exercises/meetup/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/meetup/package.yaml b/exercises/meetup/package.yaml index 2918ab241..6f0291107 100644 --- a/exercises/meetup/package.yaml +++ b/exercises/meetup/package.yaml @@ -1,5 +1,5 @@ name: meetup -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/meetup/test/Tests.hs b/exercises/meetup/test/Tests.hs index b860de496..78181a07d 100644 --- a/exercises/meetup/test/Tests.hs +++ b/exercises/meetup/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "meetup" $ - describe "meetupDay" $ for_ cases test +specs = describe "meetupDay" $ for_ cases test where test Case{..} = it description assertion From 40b5d3aa8eefe367ad27762e2ee22f5d1164704b Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 40/79] minesweeper: Remove test group with exercise's name --- exercises/minesweeper/package.yaml | 2 +- exercises/minesweeper/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/minesweeper/package.yaml b/exercises/minesweeper/package.yaml index db201361d..86cc35ab5 100644 --- a/exercises/minesweeper/package.yaml +++ b/exercises/minesweeper/package.yaml @@ -1,5 +1,5 @@ name: minesweeper -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/minesweeper/test/Tests.hs b/exercises/minesweeper/test/Tests.hs index c488ab45f..f1e09de86 100644 --- a/exercises/minesweeper/test/Tests.hs +++ b/exercises/minesweeper/test/Tests.hs @@ -8,8 +8,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "minesweeper" $ - describe "annotate" $ for_ cases test +specs = describe "annotate" $ for_ cases test where test (description, board) = it description assertion From 33614bd9ef10ab7edbb066c07d74666b39ff5794 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 41/79] nth-prime: Remove test group with exercise's name --- exercises/nth-prime/package.yaml | 2 +- exercises/nth-prime/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/nth-prime/package.yaml b/exercises/nth-prime/package.yaml index 3d79d55a4..fa374f7a0 100644 --- a/exercises/nth-prime/package.yaml +++ b/exercises/nth-prime/package.yaml @@ -1,5 +1,5 @@ name: nth-prime -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/nth-prime/test/Tests.hs b/exercises/nth-prime/test/Tests.hs index 0a5b4fbbb..0b1ef1537 100644 --- a/exercises/nth-prime/test/Tests.hs +++ b/exercises/nth-prime/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "nth-prime" $ - describe "nth" $ for_ cases test +specs = describe "nth" $ for_ cases test where test Case{..} = it description assertion From 5ec1613ddc39c87d375fc673df16547c1e05305e Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 42/79] nucleotide-count: Remove test group with exercise's name --- exercises/nucleotide-count/package.yaml | 2 +- exercises/nucleotide-count/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/nucleotide-count/package.yaml b/exercises/nucleotide-count/package.yaml index 68f8755ed..69dea0f39 100644 --- a/exercises/nucleotide-count/package.yaml +++ b/exercises/nucleotide-count/package.yaml @@ -1,5 +1,5 @@ name: nucleotide-count -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/nucleotide-count/test/Tests.hs b/exercises/nucleotide-count/test/Tests.hs index 8c449ce23..5df0080e8 100644 --- a/exercises/nucleotide-count/test/Tests.hs +++ b/exercises/nucleotide-count/test/Tests.hs @@ -11,7 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "nucleotide-count" $ do +specs = do let x `matchesMap` y = x `shouldBe` (Right . fromList) y From 15c3d56bb5dda6b335d8d8960c760461d0f48b23 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 43/79] ocr-numbers: Remove test group with exercise's name --- exercises/ocr-numbers/package.yaml | 2 +- exercises/ocr-numbers/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/ocr-numbers/package.yaml b/exercises/ocr-numbers/package.yaml index a4d2735dc..c13bc37e3 100644 --- a/exercises/ocr-numbers/package.yaml +++ b/exercises/ocr-numbers/package.yaml @@ -1,5 +1,5 @@ name: ocr-numbers -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/ocr-numbers/test/Tests.hs b/exercises/ocr-numbers/test/Tests.hs index 4469dd167..268c3cf1e 100644 --- a/exercises/ocr-numbers/test/Tests.hs +++ b/exercises/ocr-numbers/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "ocr-numbers" $ - describe "convert" $ for_ cases test +specs = describe "convert" $ for_ cases test where test Case{..} = it description assertion From d6642486b9c5afc61dd6789b0e0d47c5f94f5180 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 44/79] octal: Remove test group with exercise's name --- exercises/octal/package.yaml | 2 +- exercises/octal/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/octal/package.yaml b/exercises/octal/package.yaml index a9e0706a6..23495219c 100644 --- a/exercises/octal/package.yaml +++ b/exercises/octal/package.yaml @@ -1,5 +1,5 @@ name: octal -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/octal/test/Tests.hs b/exercises/octal/test/Tests.hs index 60723260d..8b04f0a47 100644 --- a/exercises/octal/test/Tests.hs +++ b/exercises/octal/test/Tests.hs @@ -1,4 +1,4 @@ -import Test.Hspec (Spec, describe, it) +import Test.Hspec (Spec, it) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Test.QuickCheck (Positive(Positive), property) @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "octal" $ do +specs = do it "can show Int octal" $ property $ \(Positive n) -> Num.showOct n "" == showOct (n :: Int) From 4135e85f70f4c1b1337f656f04d92d9fc29302bb Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 45/79] palindrome-products: Remove test group with exercise's name --- exercises/palindrome-products/package.yaml | 2 +- exercises/palindrome-products/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/palindrome-products/package.yaml b/exercises/palindrome-products/package.yaml index ad039f5c6..b03c35a54 100644 --- a/exercises/palindrome-products/package.yaml +++ b/exercises/palindrome-products/package.yaml @@ -1,5 +1,5 @@ name: palindrome-products -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/palindrome-products/test/Tests.hs b/exercises/palindrome-products/test/Tests.hs index 48a5b15f2..5ffa7ecc6 100644 --- a/exercises/palindrome-products/test/Tests.hs +++ b/exercises/palindrome-products/test/Tests.hs @@ -11,7 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "palindrome-products" $ for_ cases test +specs = for_ cases test where test (desc, minFactor, maxFactor, sPal, sPalFactors, lPal, lPalFactors) = describe desc $ do From c598cdb29627257882c78b2234239c3df61f78cf Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 46/79] pangram: Remove test group with exercise's name --- exercises/pangram/package.yaml | 2 +- exercises/pangram/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/pangram/package.yaml b/exercises/pangram/package.yaml index 68d2660cd..461fbb482 100644 --- a/exercises/pangram/package.yaml +++ b/exercises/pangram/package.yaml @@ -1,5 +1,5 @@ name: pangram -version: 1.0.0.1 +version: 1.0.0.2 dependencies: - base diff --git a/exercises/pangram/test/Tests.hs b/exercises/pangram/test/Tests.hs index a258b3d01..22834d454 100644 --- a/exercises/pangram/test/Tests.hs +++ b/exercises/pangram/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "pangram" $ - describe "isPangram" $ for_ cases test +specs = describe "isPangram" $ for_ cases test where test Case{..} = it description $ isPangram input `shouldBe` expected From 3c1fe687396924ac905e10d1c692dc4a8d1129b9 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 47/79] parallel-letter-frequency: Remove test group with exercise's name --- exercises/parallel-letter-frequency/package.yaml | 2 +- exercises/parallel-letter-frequency/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/parallel-letter-frequency/package.yaml b/exercises/parallel-letter-frequency/package.yaml index 11d561516..d50640bdb 100644 --- a/exercises/parallel-letter-frequency/package.yaml +++ b/exercises/parallel-letter-frequency/package.yaml @@ -1,5 +1,5 @@ name: parallel-letter-frequency -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/parallel-letter-frequency/test/Tests.hs b/exercises/parallel-letter-frequency/test/Tests.hs index 712ef66eb..b4ca7ac56 100644 --- a/exercises/parallel-letter-frequency/test/Tests.hs +++ b/exercises/parallel-letter-frequency/test/Tests.hs @@ -12,7 +12,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "parallel-letter-frequency" $ do +specs = do let odeAnDieFreude = concat -- Poem by Friedrich Schiller. [ "Freude schöner Götterfunken" -- The corresponding music is From 2935d1325cd63361587fcfe3a10e671801453937 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 48/79] pascals-triangle: Remove test group with exercise's name --- exercises/pascals-triangle/package.yaml | 2 +- exercises/pascals-triangle/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/pascals-triangle/package.yaml b/exercises/pascals-triangle/package.yaml index d904f4812..ab1608597 100644 --- a/exercises/pascals-triangle/package.yaml +++ b/exercises/pascals-triangle/package.yaml @@ -1,5 +1,5 @@ name: pascals-triangle -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/pascals-triangle/test/Tests.hs b/exercises/pascals-triangle/test/Tests.hs index c1bcf8816..e07b85a7b 100644 --- a/exercises/pascals-triangle/test/Tests.hs +++ b/exercises/pascals-triangle/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "pascals-triangle" $ - describe "rows" $ for_ rowsCases rowsTest +specs = describe "rows" $ for_ rowsCases rowsTest where rowsTest (description, n, expected) = it description assertion From 0e9ab8bb065bc45fa5a421cf541818837394a55d Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 49/79] phone-number: Remove test group with exercise's name --- exercises/phone-number/package.yaml | 2 +- exercises/phone-number/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/phone-number/package.yaml b/exercises/phone-number/package.yaml index 71b9b207d..47ec99552 100644 --- a/exercises/phone-number/package.yaml +++ b/exercises/phone-number/package.yaml @@ -1,5 +1,5 @@ name: phone-number -version: 1.2.0.3 +version: 1.2.0.4 dependencies: - base diff --git a/exercises/phone-number/test/Tests.hs b/exercises/phone-number/test/Tests.hs index 19b4728c2..68d2545d1 100644 --- a/exercises/phone-number/test/Tests.hs +++ b/exercises/phone-number/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "phone-number" $ - describe "number" $ for_ cases test +specs = describe "number" $ for_ cases test where test Case{..} = it description $ number input `shouldBe` expected From 3e2c035a8b8ed8d685137b0708482108c9832a87 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 50/79] pig-latin: Remove test group with exercise's name --- exercises/pig-latin/package.yaml | 2 +- exercises/pig-latin/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/pig-latin/package.yaml b/exercises/pig-latin/package.yaml index 331f2ce15..3b855575e 100644 --- a/exercises/pig-latin/package.yaml +++ b/exercises/pig-latin/package.yaml @@ -1,5 +1,5 @@ name: pig-latin -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/pig-latin/test/Tests.hs b/exercises/pig-latin/test/Tests.hs index 0c5acdcfc..8d60d460c 100644 --- a/exercises/pig-latin/test/Tests.hs +++ b/exercises/pig-latin/test/Tests.hs @@ -7,8 +7,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "pig-latin" $ - describe "translate" $ do +specs = describe "translate" $ do describe "ay is added to words that start with vowels" $ do it "word beginning with a" $ translate "apple" `shouldBe` "appleay" From 17ec36972022bfde2df0df166b04f413fabbc658 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 51/79] pov: Remove test group with exercise's name --- exercises/pov/package.yaml | 2 +- exercises/pov/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/pov/package.yaml b/exercises/pov/package.yaml index b0d67fc94..bcfb076bd 100644 --- a/exercises/pov/package.yaml +++ b/exercises/pov/package.yaml @@ -1,5 +1,5 @@ name: pov -version: 1.1.1.3 +version: 1.1.1.4 dependencies: - base diff --git a/exercises/pov/test/Tests.hs b/exercises/pov/test/Tests.hs index 9a9744bc9..deaebb1e1 100644 --- a/exercises/pov/test/Tests.hs +++ b/exercises/pov/test/Tests.hs @@ -13,7 +13,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "pov" $ do +specs = do describe "fromPOV" $ do From 730f6841a8f711b2be77da8bbbfd03c56cabaa4d Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 52/79] prime-factors: Remove test group with exercise's name --- exercises/prime-factors/package.yaml | 2 +- exercises/prime-factors/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/prime-factors/package.yaml b/exercises/prime-factors/package.yaml index c3eae6d10..b345a2ba1 100644 --- a/exercises/prime-factors/package.yaml +++ b/exercises/prime-factors/package.yaml @@ -1,5 +1,5 @@ name: prime-factors -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/prime-factors/test/Tests.hs b/exercises/prime-factors/test/Tests.hs index 930358cce..878f84d2d 100644 --- a/exercises/prime-factors/test/Tests.hs +++ b/exercises/prime-factors/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "prime-factors" $ - describe "primeFactors" $ for_ cases test +specs = describe "primeFactors" $ for_ cases test where test (description, n, expected) = it description assertion From 02ba72edeeaeed96f344251e0e40dbbe854852e8 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 53/79] pythagorean-triplet: Remove test group with exercise's name --- exercises/pythagorean-triplet/package.yaml | 2 +- exercises/pythagorean-triplet/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/pythagorean-triplet/package.yaml b/exercises/pythagorean-triplet/package.yaml index 63287cb2d..4294c8b44 100644 --- a/exercises/pythagorean-triplet/package.yaml +++ b/exercises/pythagorean-triplet/package.yaml @@ -1,5 +1,5 @@ name: pythagorean-triplet -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/pythagorean-triplet/test/Tests.hs b/exercises/pythagorean-triplet/test/Tests.hs index b0ce28453..b5d94b96e 100644 --- a/exercises/pythagorean-triplet/test/Tests.hs +++ b/exercises/pythagorean-triplet/test/Tests.hs @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "pythagorean-triplet" $ do +specs = do describe "isPythagorean" $ for_ isPythagoreanCases isPythagoreanTest describe "pythagoreanTriplets" $ for_ pythagoreanTripletsCases pythagoreanTripletsTest where From 383d6dcc4d0af22ed5c5ebae6d6713ca1c8e6ac4 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 54/79] queen-attack: Remove test group with exercise's name --- exercises/queen-attack/package.yaml | 2 +- exercises/queen-attack/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/queen-attack/package.yaml b/exercises/queen-attack/package.yaml index 9a3c8dc01..37857876f 100644 --- a/exercises/queen-attack/package.yaml +++ b/exercises/queen-attack/package.yaml @@ -1,5 +1,5 @@ name: queen-attack -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/queen-attack/test/Tests.hs b/exercises/queen-attack/test/Tests.hs index 2c9726f96..d14224d0c 100644 --- a/exercises/queen-attack/test/Tests.hs +++ b/exercises/queen-attack/test/Tests.hs @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "queen-attack" $ do +specs = do -- Track-specific test cases. From 257b1a5d7afd93822b61e384353ebe2beee4cc8c Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 55/79] raindrops: Remove test group with exercise's name --- exercises/raindrops/package.yaml | 2 +- exercises/raindrops/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/raindrops/package.yaml b/exercises/raindrops/package.yaml index 8af5a3ca2..5ab29bfa3 100644 --- a/exercises/raindrops/package.yaml +++ b/exercises/raindrops/package.yaml @@ -1,5 +1,5 @@ name: raindrops -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/raindrops/test/Tests.hs b/exercises/raindrops/test/Tests.hs index 6eb0082d6..32b4a499c 100644 --- a/exercises/raindrops/test/Tests.hs +++ b/exercises/raindrops/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "raindrops" $ - describe "convert" $ for_ cases test +specs = describe "convert" $ for_ cases test where test (number, expected) = it description assertion From 23611dcbca79b0246c273034b1b5646bc99fb0da Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 56/79] rna-transcription: Remove test group with exercise's name --- exercises/rna-transcription/package.yaml | 2 +- exercises/rna-transcription/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/rna-transcription/package.yaml b/exercises/rna-transcription/package.yaml index eb01191be..360fd04ed 100644 --- a/exercises/rna-transcription/package.yaml +++ b/exercises/rna-transcription/package.yaml @@ -1,5 +1,5 @@ name: rna-transcription -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/rna-transcription/test/Tests.hs b/exercises/rna-transcription/test/Tests.hs index f491db69d..7b641de91 100644 --- a/exercises/rna-transcription/test/Tests.hs +++ b/exercises/rna-transcription/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "rna-transcription" $ - describe "toRNA" $ for_ cases test +specs = describe "toRNA" $ for_ cases test where test Case{..} = it description $ toRNA dna `shouldBe` expected From 7ad257874c1caa46c8216ab1a126708caa610f46 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 57/79] robot-name: Remove test group with exercise's name --- exercises/robot-name/package.yaml | 2 +- exercises/robot-name/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/robot-name/package.yaml b/exercises/robot-name/package.yaml index f63b517c1..7199a001f 100644 --- a/exercises/robot-name/package.yaml +++ b/exercises/robot-name/package.yaml @@ -1,5 +1,5 @@ name: robot-name -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/robot-name/test/Tests.hs b/exercises/robot-name/test/Tests.hs index 0e3d68389..4647dfbd8 100644 --- a/exercises/robot-name/test/Tests.hs +++ b/exercises/robot-name/test/Tests.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-type-defaults #-} import Data.Ix (inRange) -import Test.Hspec (Spec, describe, it, shouldBe, shouldNotBe, shouldSatisfy) +import Test.Hspec (Spec, it, shouldBe, shouldNotBe, shouldSatisfy) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Robot (mkRobot, resetName, robotName) @@ -16,7 +16,7 @@ real "robot generator" would use a proper serial number system and would likely not be in the business of resetting the name. -} specs :: Spec -specs = describe "robot-name" $ do +specs = do let a = ('A', 'Z') let d = ('0', '9') From 1b244a1154b07b3b4ddb7799f26a8d53fca8b80e Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 58/79] robot-simulator: Remove test group with exercise's name --- exercises/robot-simulator/package.yaml | 2 +- exercises/robot-simulator/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/robot-simulator/package.yaml b/exercises/robot-simulator/package.yaml index cb1dd1ce4..d87e6dc3c 100644 --- a/exercises/robot-simulator/package.yaml +++ b/exercises/robot-simulator/package.yaml @@ -1,5 +1,5 @@ name: robot-simulator -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/robot-simulator/test/Tests.hs b/exercises/robot-simulator/test/Tests.hs index 9d2fff5e7..2f7f060ad 100644 --- a/exercises/robot-simulator/test/Tests.hs +++ b/exercises/robot-simulator/test/Tests.hs @@ -21,7 +21,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "robot-simulator" $ do +specs = do describe "mkRobot" $ do From 08ff037e00aae009aa420120b515d048b08a3fd6 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 59/79] roman-numerals: Remove test group with exercise's name --- exercises/roman-numerals/package.yaml | 2 +- exercises/roman-numerals/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/roman-numerals/package.yaml b/exercises/roman-numerals/package.yaml index 48ccdadf9..40ff3a591 100644 --- a/exercises/roman-numerals/package.yaml +++ b/exercises/roman-numerals/package.yaml @@ -1,5 +1,5 @@ name: roman-numerals -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/roman-numerals/test/Tests.hs b/exercises/roman-numerals/test/Tests.hs index a7c42586f..b16b85b6f 100644 --- a/exercises/roman-numerals/test/Tests.hs +++ b/exercises/roman-numerals/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "roman-numerals" $ - describe "numerals" $ for_ cases test +specs = describe "numerals" $ for_ cases test where test Case{..} = it explanation assertion From 23c8e1801569ed599715004bf1cf46db74ecb8dc Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 60/79] run-length-encoding: Remove test group with exercise's name --- exercises/run-length-encoding/package.yaml | 2 +- exercises/run-length-encoding/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/run-length-encoding/package.yaml b/exercises/run-length-encoding/package.yaml index 81533927a..584c30020 100644 --- a/exercises/run-length-encoding/package.yaml +++ b/exercises/run-length-encoding/package.yaml @@ -1,5 +1,5 @@ name: run-length-encoding -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/run-length-encoding/test/Tests.hs b/exercises/run-length-encoding/test/Tests.hs index 9e991ffa8..185d1496a 100644 --- a/exercises/run-length-encoding/test/Tests.hs +++ b/exercises/run-length-encoding/test/Tests.hs @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "run-length-encoding" $ do +specs = do describe "decode" $ for_ decodeCases $ test decode describe "encode" $ for_ encodeCases $ test encode describe "both" $ for_ bothCases $ test (decode . encode) From 994bea6b9f28cb1eb955bddf025aef380d49c064 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 61/79] saddle-points: Remove test group with exercise's name --- exercises/saddle-points/package.yaml | 2 +- exercises/saddle-points/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/saddle-points/package.yaml b/exercises/saddle-points/package.yaml index 09735c563..be70b34b9 100644 --- a/exercises/saddle-points/package.yaml +++ b/exercises/saddle-points/package.yaml @@ -1,5 +1,5 @@ name: saddle-points -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - array diff --git a/exercises/saddle-points/test/Tests.hs b/exercises/saddle-points/test/Tests.hs index abd6b6c08..72d8ced8d 100644 --- a/exercises/saddle-points/test/Tests.hs +++ b/exercises/saddle-points/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "saddle-points" $ - describe "saddlePoints" $ for_ cases test +specs = describe "saddlePoints" $ for_ cases test where test (description, xss, expected) = it description assertion From f687b76e2875aa90036a454c8c370730647c20bd Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 62/79] say: Remove test group with exercise's name --- exercises/say/package.yaml | 2 +- exercises/say/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/say/package.yaml b/exercises/say/package.yaml index a090f5637..aa475b58e 100644 --- a/exercises/say/package.yaml +++ b/exercises/say/package.yaml @@ -1,5 +1,5 @@ name: say -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/say/test/Tests.hs b/exercises/say/test/Tests.hs index c9873395f..5bf4041de 100644 --- a/exercises/say/test/Tests.hs +++ b/exercises/say/test/Tests.hs @@ -10,8 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "say" $ - describe "inEnglish" $ for_ cases test +specs = describe "inEnglish" $ for_ cases test where test (n, expected) = it description assertion From b8ca3e4bfc6354737f04add84ad2209d9c49370e Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 63/79] scrabble-score: Remove test group with exercise's name --- exercises/scrabble-score/package.yaml | 2 +- exercises/scrabble-score/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/scrabble-score/package.yaml b/exercises/scrabble-score/package.yaml index b6c825db2..233cdbb51 100644 --- a/exercises/scrabble-score/package.yaml +++ b/exercises/scrabble-score/package.yaml @@ -1,5 +1,5 @@ name: scrabble-score -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/scrabble-score/test/Tests.hs b/exercises/scrabble-score/test/Tests.hs index b39e77449..3b01f3808 100644 --- a/exercises/scrabble-score/test/Tests.hs +++ b/exercises/scrabble-score/test/Tests.hs @@ -11,7 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "scrabble-score" $ do +specs = do describe "scoreLetter" $ do it "'a'" $ scoreLetter 'a' `shouldBe` 1 it "'Z'" $ scoreLetter 'Z' `shouldBe` 10 From c060e4cced55109f1ea52740aada8dbcfb7c40d1 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 64/79] secret-handshake: Remove test group with exercise's name --- exercises/secret-handshake/package.yaml | 2 +- exercises/secret-handshake/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/secret-handshake/package.yaml b/exercises/secret-handshake/package.yaml index aaa8e142b..1e2bab6be 100644 --- a/exercises/secret-handshake/package.yaml +++ b/exercises/secret-handshake/package.yaml @@ -1,5 +1,5 @@ name: secret-handshake -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/secret-handshake/test/Tests.hs b/exercises/secret-handshake/test/Tests.hs index 92ae60f12..976db40c9 100644 --- a/exercises/secret-handshake/test/Tests.hs +++ b/exercises/secret-handshake/test/Tests.hs @@ -1,4 +1,4 @@ -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import SecretHandshake (handshake) @@ -7,7 +7,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "secret-handshake" $ do +specs = do it "wink for 1" $ handshake (1 :: Int) `shouldBe` ["wink"] From 781912a74d53c06ef15283afc4903beca057dd11 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 65/79] series: Remove test group with exercise's name --- exercises/series/package.yaml | 2 +- exercises/series/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/series/package.yaml b/exercises/series/package.yaml index 5f7ac71f5..50afcf1cf 100644 --- a/exercises/series/package.yaml +++ b/exercises/series/package.yaml @@ -1,5 +1,5 @@ name: series -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/series/test/Tests.hs b/exercises/series/test/Tests.hs index c3753e036..8c633e448 100644 --- a/exercises/series/test/Tests.hs +++ b/exercises/series/test/Tests.hs @@ -3,7 +3,7 @@ {-# LANGUAGE OverloadedStrings #-} import GHC.Exts (toList) -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Series (slices) @@ -12,7 +12,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "series" $ do +specs = do let x `shouldHaveSlices` yss = (map toList . toList) x `shouldBe` yss From 9ee641be94f0310188679c9d08b831d04b54b19b Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 66/79] sgf-parsing: Remove test group with exercise's name --- exercises/sgf-parsing/package.yaml | 2 +- exercises/sgf-parsing/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/sgf-parsing/package.yaml b/exercises/sgf-parsing/package.yaml index b8b1f8995..951841223 100644 --- a/exercises/sgf-parsing/package.yaml +++ b/exercises/sgf-parsing/package.yaml @@ -1,5 +1,5 @@ name: sgf-parsing -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/sgf-parsing/test/Tests.hs b/exercises/sgf-parsing/test/Tests.hs index c0abca464..acffad35b 100644 --- a/exercises/sgf-parsing/test/Tests.hs +++ b/exercises/sgf-parsing/test/Tests.hs @@ -12,8 +12,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "sgf-parsing" $ - describe "parseSgf" $ for_ cases test +specs = describe "parseSgf" $ for_ cases test where test (input, expected) = it description assertion From 725664e4148ae2c182dfb036a08819fc6013525f Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 67/79] sieve: Remove test group with exercise's name --- exercises/sieve/package.yaml | 2 +- exercises/sieve/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/sieve/package.yaml b/exercises/sieve/package.yaml index 4f750d83f..7518cc760 100644 --- a/exercises/sieve/package.yaml +++ b/exercises/sieve/package.yaml @@ -1,5 +1,5 @@ name: sieve -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/sieve/test/Tests.hs b/exercises/sieve/test/Tests.hs index 91f293717..611e32be7 100644 --- a/exercises/sieve/test/Tests.hs +++ b/exercises/sieve/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "sieve" $ - describe "primesUpTo" $ for_ cases test +specs = describe "primesUpTo" $ for_ cases test where test Case{..} = it description assertion From cbdd305bd853f5034c72aaf607bc1f7592496132 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 68/79] simple-cipher: Remove test group with exercise's name --- exercises/simple-cipher/package.yaml | 2 +- exercises/simple-cipher/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/simple-cipher/package.yaml b/exercises/simple-cipher/package.yaml index b8678044f..bcf128e30 100644 --- a/exercises/simple-cipher/package.yaml +++ b/exercises/simple-cipher/package.yaml @@ -1,5 +1,5 @@ name: simple-cipher -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/simple-cipher/test/Tests.hs b/exercises/simple-cipher/test/Tests.hs index 046af6675..93eac091e 100644 --- a/exercises/simple-cipher/test/Tests.hs +++ b/exercises/simple-cipher/test/Tests.hs @@ -1,4 +1,4 @@ -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Cipher (caesarDecode, caesarEncode, caesarEncodeRandom) @@ -7,7 +7,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "simple-cipher" $ do +specs = do it "no-op encode" $ do caesarEncode "a" ['a'..'z'] `shouldBe` ['a'..'z'] From a087231e5d7b7a5351432e0dfcea3577f5b29ec1 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 69/79] simple-linked-list: Remove test group with exercise's name --- exercises/simple-linked-list/package.yaml | 2 +- exercises/simple-linked-list/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/simple-linked-list/package.yaml b/exercises/simple-linked-list/package.yaml index 481eab8fb..a9bfbb94d 100644 --- a/exercises/simple-linked-list/package.yaml +++ b/exercises/simple-linked-list/package.yaml @@ -1,5 +1,5 @@ name: simple-linked-list -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/simple-linked-list/test/Tests.hs b/exercises/simple-linked-list/test/Tests.hs index 117271c9b..e7b4d59de 100644 --- a/exercises/simple-linked-list/test/Tests.hs +++ b/exercises/simple-linked-list/test/Tests.hs @@ -1,7 +1,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# OPTIONS_GHC -fno-warn-orphans #-} -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Test.QuickCheck (property) import Test.QuickCheck.Arbitrary @@ -29,7 +29,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "simple-linked-list" $ do +specs = do let n1 = new (1 :: Int) nil let n21 = new 2 n1 From 5b79c6d2113cfdd291d88f8b7dd6483361bfd100 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 70/79] space-age: Remove test group with exercise's name --- exercises/space-age/package.yaml | 2 +- exercises/space-age/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/space-age/package.yaml b/exercises/space-age/package.yaml index 12d554015..8c7539555 100644 --- a/exercises/space-age/package.yaml +++ b/exercises/space-age/package.yaml @@ -1,5 +1,5 @@ name: space-age -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/space-age/test/Tests.hs b/exercises/space-age/test/Tests.hs index dc9d47aaf..ec18c8938 100644 --- a/exercises/space-age/test/Tests.hs +++ b/exercises/space-age/test/Tests.hs @@ -12,8 +12,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "space-age" $ - describe "ageOn" $ for_ cases test +specs = describe "ageOn" $ for_ cases test where -- Here we used `fromIntegral`, `fromRational` and `toRational` to -- generalize the test suite, allowing any function that takes a From a5043a3765f97e6cffb62973e91c65ecfd037758 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 71/79] strain: Remove test group with exercise's name --- exercises/strain/package.yaml | 2 +- exercises/strain/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/strain/package.yaml b/exercises/strain/package.yaml index 2edad14e3..99d994e50 100644 --- a/exercises/strain/package.yaml +++ b/exercises/strain/package.yaml @@ -1,5 +1,5 @@ name: strain -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/strain/test/Tests.hs b/exercises/strain/test/Tests.hs index a9f414a0d..8f33067f8 100644 --- a/exercises/strain/test/Tests.hs +++ b/exercises/strain/test/Tests.hs @@ -1,4 +1,4 @@ -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Data.List (isPrefixOf) @@ -9,7 +9,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "strain" $ do +specs = do it "empty keep" $ keep (<10) [] `shouldBe` ([] :: [Int]) From b87246a937cb36851d76e32b2f249e6a6db29911 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 72/79] sublist: Remove test group with exercise's name --- exercises/sublist/package.yaml | 2 +- exercises/sublist/test/Tests.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/sublist/package.yaml b/exercises/sublist/package.yaml index e9f57cbd7..d6a42dfc3 100644 --- a/exercises/sublist/package.yaml +++ b/exercises/sublist/package.yaml @@ -1,5 +1,5 @@ name: sublist -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/sublist/test/Tests.hs b/exercises/sublist/test/Tests.hs index 7d87d9870..53eab2d3f 100644 --- a/exercises/sublist/test/Tests.hs +++ b/exercises/sublist/test/Tests.hs @@ -10,7 +10,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "sublist" $ do +specs = do describe "standard tests" $ for_ cases test describe "track specific tests" $ do From ff5fc3425266452c7fe1b0f3ed378e299068637e Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 73/79] sum-of-multiples: Remove test group with exercise's name --- exercises/sum-of-multiples/package.yaml | 2 +- exercises/sum-of-multiples/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/sum-of-multiples/package.yaml b/exercises/sum-of-multiples/package.yaml index bb24878d8..339e79657 100644 --- a/exercises/sum-of-multiples/package.yaml +++ b/exercises/sum-of-multiples/package.yaml @@ -1,5 +1,5 @@ name: sum-of-multiples -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/sum-of-multiples/test/Tests.hs b/exercises/sum-of-multiples/test/Tests.hs index 56bb097c0..e194a9a73 100644 --- a/exercises/sum-of-multiples/test/Tests.hs +++ b/exercises/sum-of-multiples/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "sum-of-multiples" $ - describe "sumOfMultiples" $ for_ cases test +specs = describe "sumOfMultiples" $ for_ cases test where test Case{..} = it description assertion where From 47b5c6754a177ebcc7993585844f5acc41311804 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 74/79] triangle: Remove test group with exercise's name --- exercises/triangle/package.yaml | 2 +- exercises/triangle/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/triangle/package.yaml b/exercises/triangle/package.yaml index 84387a26d..4386bf6e7 100644 --- a/exercises/triangle/package.yaml +++ b/exercises/triangle/package.yaml @@ -1,5 +1,5 @@ name: triangle -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/triangle/test/Tests.hs b/exercises/triangle/test/Tests.hs index dd46a6d1e..80ed8fa20 100644 --- a/exercises/triangle/test/Tests.hs +++ b/exercises/triangle/test/Tests.hs @@ -17,8 +17,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "triangle" $ - describe "triangleType" $ for_ cases test +specs = describe "triangleType" $ for_ cases test where test (description, (a, b, c), expected) = it description assertion From c77219decb980d87a0e03eeecc0629333a57fe0c Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 75/79] trinary: Remove test group with exercise's name --- exercises/trinary/package.yaml | 2 +- exercises/trinary/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/trinary/package.yaml b/exercises/trinary/package.yaml index 62936fbcb..1e0aa6551 100644 --- a/exercises/trinary/package.yaml +++ b/exercises/trinary/package.yaml @@ -1,5 +1,5 @@ name: trinary -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/trinary/test/Tests.hs b/exercises/trinary/test/Tests.hs index 7ba77831b..092c5efd3 100644 --- a/exercises/trinary/test/Tests.hs +++ b/exercises/trinary/test/Tests.hs @@ -1,5 +1,5 @@ import Data.Char (intToDigit) -import Test.Hspec (Spec, describe, it) +import Test.Hspec (Spec, it) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Test.QuickCheck (Positive(Positive), (==>), property) @@ -11,7 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "trinary" $ do +specs = do let refShowTri n = Num.showIntAtBase 3 intToDigit n "" From 15847d2dffa3e5510be88771a91851641e4606f7 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 76/79] word-count: Remove test group with exercise's name --- exercises/word-count/package.yaml | 2 +- exercises/word-count/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/word-count/package.yaml b/exercises/word-count/package.yaml index fe3af2b6b..399ac6d15 100644 --- a/exercises/word-count/package.yaml +++ b/exercises/word-count/package.yaml @@ -1,5 +1,5 @@ name: word-count -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/word-count/test/Tests.hs b/exercises/word-count/test/Tests.hs index b9c03b268..4ae8ffb20 100644 --- a/exercises/word-count/test/Tests.hs +++ b/exercises/word-count/test/Tests.hs @@ -14,8 +14,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "word-count" $ - describe "wordCount" $ for_ cases test +specs = describe "wordCount" $ for_ cases test where -- Here we used `fromIntegral`, `fromList` and `toList` to generalize -- the tests, accepting any function that receives a string-like argumment From f91df8bcff1a54d68e858e9a7bb5c2fd89ecdbf5 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 77/79] wordy: Remove test group with exercise's name --- exercises/wordy/package.yaml | 2 +- exercises/wordy/test/Tests.hs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exercises/wordy/package.yaml b/exercises/wordy/package.yaml index 886fcb166..8111feef9 100644 --- a/exercises/wordy/package.yaml +++ b/exercises/wordy/package.yaml @@ -1,5 +1,5 @@ name: wordy -version: 1.0.0.2 +version: 1.0.0.3 dependencies: - base diff --git a/exercises/wordy/test/Tests.hs b/exercises/wordy/test/Tests.hs index e023c0a69..a7e6911d6 100644 --- a/exercises/wordy/test/Tests.hs +++ b/exercises/wordy/test/Tests.hs @@ -11,8 +11,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "wordy" $ - describe "answer" $ for_ cases test +specs = describe "answer" $ for_ cases test where test Case{..} = it description assertion From ee37b22cd5919aea4deccefc49b594ce09da340c Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 78/79] zebra-puzzle: Remove test group with exercise's name --- exercises/zebra-puzzle/package.yaml | 2 +- exercises/zebra-puzzle/test/Tests.hs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/exercises/zebra-puzzle/package.yaml b/exercises/zebra-puzzle/package.yaml index dc8f73285..e1ab04144 100644 --- a/exercises/zebra-puzzle/package.yaml +++ b/exercises/zebra-puzzle/package.yaml @@ -1,5 +1,5 @@ name: zebra-puzzle -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/zebra-puzzle/test/Tests.hs b/exercises/zebra-puzzle/test/Tests.hs index 55a29e3d0..1c932f472 100644 --- a/exercises/zebra-puzzle/test/Tests.hs +++ b/exercises/zebra-puzzle/test/Tests.hs @@ -1,4 +1,4 @@ -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import ZebraPuzzle (Resident(..), Solution(..), solve) @@ -7,7 +7,6 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "zebra-puzzle" $ - it "solve" $ solve `shouldBe` Solution { waterDrinker = Norwegian - , zebraOwner = Japanese } +specs = it "solve" $ solve `shouldBe` Solution { waterDrinker = Norwegian + , zebraOwner = Japanese } From 2fd6ff1620b1032887a7db07f9a1801787667212 Mon Sep 17 00:00:00 2001 From: rbasso Date: Wed, 10 May 2017 14:49:09 +0900 Subject: [PATCH 79/79] zipper: Remove test group with exercise's name --- exercises/zipper/package.yaml | 2 +- exercises/zipper/test/Tests.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/zipper/package.yaml b/exercises/zipper/package.yaml index 72ee3eabe..3a0f03b7f 100644 --- a/exercises/zipper/package.yaml +++ b/exercises/zipper/package.yaml @@ -1,5 +1,5 @@ name: zipper -version: 0.1.0.1 +version: 0.1.0.2 dependencies: - base diff --git a/exercises/zipper/test/Tests.hs b/exercises/zipper/test/Tests.hs index 3536c9477..40a0b2afe 100644 --- a/exercises/zipper/test/Tests.hs +++ b/exercises/zipper/test/Tests.hs @@ -1,5 +1,5 @@ import Data.Maybe (fromJust) -import Test.Hspec (Spec, describe, it, shouldBe) +import Test.Hspec (Spec, it, shouldBe) import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith) import Zipper @@ -19,7 +19,7 @@ main :: IO () main = hspecWith defaultConfig {configFastFail = True} specs specs :: Spec -specs = describe "zipper" $ do +specs = do let leaf v = node v Nothing Nothing node v l r = Just (BT v l r :: BinTree Int)