Standardize error messages a little more.

SamirTalwar · Aug 6, 2022 · 857a5a2 · 857a5a2
1 parent 729c64c
commit 857a5a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/spec/malformed-specs.yaml b/spec/malformed-specs.yaml
@@ -46,10 +46,10 @@ tests:
     stderr:
       - |
         The test specification "fixtures/malformed-specs/wrong-type.yaml" is invalid:
-          Error in $.tests[0].stdout[0]: expected contents, but encountered Number
+          Error in $.tests[0].stdout[0]: expected "contents" or a "file", but encountered Number
       - |
         The test specification "fixtures\malformed-specs\wrong-type.yaml" is invalid:
-          Error in $.tests[0].stdout[0]: expected contents, but encountered Number
+          Error in $.tests[0].stdout[0]: expected "contents" or a "file", but encountered Number
 
   - name: unknown-matcher
     args:
@@ -58,7 +58,7 @@ tests:
     stderr:
       - |
         The test specification "fixtures/malformed-specs/unknown-matcher.yaml" is invalid:
-          Error in $.tests[0].stdout: Expected "contents" or a "file".
+          Error in $.tests[0].stdout: Expected "contents" or a "file"
       - |
         The test specification "fixtures\malformed-specs\unknown-matcher.yaml" is invalid:
-          Error in $.tests[0].stdout: Expected "contents" or a "file".
+          Error in $.tests[0].stdout: Expected "contents" or a "file"
diff --git a/src/lib/Test/Smoke/Types/Values.hs b/src/lib/Test/Smoke/Types/Values.hs
@@ -22,11 +22,11 @@ instance (FixtureType a, FromJSON a) => FromJSON (Contents a) where
     maybeContents <- v .:? "contents"
     maybeFile <- v .:? "file"
     case (maybeContents, maybeFile) of
-      (Just _, Just _) -> fail "Expected \"contents\" or a \"file\", not both."
+      (Just _, Just _) -> fail "Expected \"contents\" or a \"file\", not both"
       (Just contents, Nothing) -> Inline <$> parseJSON contents
       (Nothing, Just file) -> return $ FileLocation file
-      (Nothing, Nothing) -> fail "Expected \"contents\" or a \"file\"."
-  parseJSON invalid = typeMismatch "contents" invalid
+      (Nothing, Nothing) -> fail "Expected \"contents\" or a \"file\""
+  parseJSON invalid = typeMismatch "\"contents\" or a \"file\"" invalid
 
 data TestInput a where
   TestInput :: Contents a -> TestInput a