@@ -238,7 +238,7 @@ searchExpectNoResults search = do
239searchExpectAggs :: Search -> BH IO ()
239searchExpectAggs :: Search -> BH IO ()
240searchExpectAggs search = do
240searchExpectAggs search = do
241− reply <- searchAll search
241+ reply <- searchByIndex testIndex search
242 let isEmpty x = return (M.null x)
242 let isEmpty x = return (M.null x)
243 let result = decode (responseBody reply) :: Maybe (SearchResult Tweet)
243 let result = decode (responseBody reply) :: Maybe (SearchResult Tweet)
@@ -247,7 +247,7 @@ searchExpectAggs search = do
247searchValidBucketAgg :: (BucketAggregation a, FromJSON a, Show a) =>
247searchValidBucketAgg :: (BucketAggregation a, FromJSON a, Show a) =>
248 Search -> Text -> (Text -> AggregationResults -> Maybe (Bucket a)) -> BH IO ()
248 Search -> Text -> (Text -> AggregationResults -> Maybe (Bucket a)) -> BH IO ()
249searchValidBucketAgg search aggKey extractor = do
249searchValidBucketAgg search aggKey extractor = do
250− reply <- searchAll search
250+ reply <- searchByIndex testIndex search
251 let bucketDocs = docCount . head . buckets
251 let bucketDocs = docCount . head . buckets
252 let result = decode (responseBody reply) :: Maybe (SearchResult Tweet)
252 let result = decode (responseBody reply) :: Maybe (SearchResult Tweet)
253 let count = result >>= aggregations >>= extractor aggKey >>= \x -> return (bucketDocs x)
253 let count = result >>= aggregations >>= extractor aggKey >>= \x -> return (bucketDocs x)
@@ -272,8 +272,8 @@ searchExpectSource src expected = do
272 _ <- insertData
272 _ <- insertData
273 let query = QueryMatchQuery $ mkMatchQuery (FieldName "_all") (QueryString "haskell")
273 let query = QueryMatchQuery $ mkMatchQuery (FieldName "_all") (QueryString "haskell")
274 let search = (mkSearch (Just query) Nothing) { source = Just src }
274 let search = (mkSearch (Just query) Nothing) { source = Just src }
275− reply <- searchAll search
275+ reply <- searchByIndex testIndex search
276− result <- parseEsResponse reply-- :: Either EsError (SearchResult Value)
276+ result <- parseEsResponse reply
277 let value = grabFirst result
277 let value = grabFirst result
279 value `shouldBe` expected
279 value `shouldBe` expected