git.iko.soy/typeable/bloodhound
on master help sign in
purge head, get passing tests
commitb8196f51cfb5f8d8a3bae37a3e86641c1d27b976 authorChris Allen <cma@bitemyapp.com> dateTue 13 Feb 2018, 16:34 (9 years ago) parent22ceaff
2 files changed+10−4
compare with master
unifiedsplit
tests/V5/Test/Common.hs+6−2 tests/V5/Test/Highlights.hs+4−2
tests/V5/Test/Common.hs+6−2
@@ -261,10 +261,14 @@ searchTermsAggHint hints = do
261261 forM_ hints $ searchExpectAggs . search
262262 forM_ hints (\x -> searchValidBucketAgg (search x) "users" toTerms)
263263
264−searchTweetHighlight :: Search -> BH IO (Either EsError (Maybe HitHighlight))
264+searchTweetHighlight :: Search
265+ -> BH IO (Either EsError (Maybe HitHighlight))
265266searchTweetHighlight search = do
266267 result <- searchTweets search
267− let myHighlight = fmap (hitHighlight . head . hits . searchHits) result
268+ let tweetHit :: Either EsError (Maybe (Hit Tweet))
269+ tweetHit = fmap (headMay . hits . searchHits) result
270+ myHighlight :: Either EsError (Maybe HitHighlight)
271+ myHighlight = (join . fmap hitHighlight) <$> tweetHit
268272 return myHighlight
269273
270274searchExpectSource :: Source -> Either EsError Value -> BH IO ()
tests/V5/Test/Highlights.hs+4−2
@@ -22,9 +22,11 @@ spec =
2222 it "returns highlight from query when there should be one" $ withTestEnv $ do
2323 myHighlight <- initHighlights "message"
2424 liftIO $
25− myHighlight `shouldBe` Right (Just (M.fromList [("message",["Use <em>haskell</em>!"])]))
25+ myHighlight `shouldBe`
26+ Right (Just (M.fromList [("message", ["Use <em>haskell</em>!"])]))
2627
2728 it "doesn't return highlight from a query when it shouldn't" $ withTestEnv $ do
2829 myHighlight <- initHighlights "user"
2930 liftIO $
30− myHighlight `shouldBe` Right Nothing
31+ myHighlight `shouldBe`
32+ Right Nothing