b8196f5 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

on master help sign in

purge head, get passing tests

b8196f5Chris Allen9 years ago

tests/V5/Test/Common.hs+6−2

@@ -261,10 +261,14 @@ searchTermsAggHint hints = do

261 forM_ hints $ searchExpectAggs . search

262 forM_ hints (\x -> searchValidBucketAgg (search x) "users" toTerms)

263

264+searchTweetHighlight :: Search

264−searchTweetHighlight :: Search -> BH IO (Either EsError (Maybe HitHighlight))

265+ -> BH IO (Either EsError (Maybe HitHighlight))

265searchTweetHighlight search = do

266searchTweetHighlight search = do

266 result <- searchTweets search

267 result <- searchTweets search

268+ let tweetHit :: Either EsError (Maybe (Hit Tweet))

267− let myHighlight = fmap (hitHighlight . head . hits . searchHits) result

269+ tweetHit = fmap (headMay . hits . searchHits) result

270+ myHighlight :: Either EsError (Maybe HitHighlight)

271+ myHighlight = (join . fmap hitHighlight) <$> tweetHit

268 return myHighlight

272 return myHighlight

269

273

270searchExpectSource :: Source -> Either EsError Value -> BH IO ()

274searchExpectSource :: Source -> Either EsError Value -> BH IO ()

tests/V5/Test/Highlights.hs+4−2

@@ -22,9 +22,11 @@ spec =

22 it "returns highlight from query when there should be one" $ withTestEnv $ do

23 myHighlight <- initHighlights "message"

24 liftIO $

25+ myHighlight `shouldBe`

25− myHighlight `shouldBe` Right (Just (M.fromList [("message",["Use <em>haskell</em>!"])]))

26+ Right (Just (M.fromList [("message", ["Use <em>haskell</em>!"])]))

27 it "doesn't return highlight from a query when it shouldn't" $ withTestEnv $ do

28 it "doesn't return highlight from a query when it shouldn't" $ withTestEnv $ do

28 myHighlight <- initHighlights "user"

29 myHighlight <- initHighlights "user"

29 liftIO $

30 liftIO $

30− myHighlight `shouldBe` Right Nothing

31+ myHighlight `shouldBe`

32+ Right Nothing