git.iko.soy/typeable/bloodhound
on master help sign in
Loosen IndexAliasesSummary

Looks like 1.4.1 produces different outputs (namely an empty object instead of {aliases: null}), even though 1.4.5 does the right thing. This should hopefully clear up the one sticking case in the travis build.

commit10666e6b17c262f2dc0f940a1efa57f66f8c7698 authorMichael Xavier <michael@michaelxavier.net> dateWed 18 Nov 2015, 16:12 (11 years ago) parent8a8492d
2 files changed+3−3
compare with master
unifiedsplit
src/Database/Bloodhound/Types.hs+1−1 tests/tests.hs+2−2
src/Database/Bloodhound/Types.hs+1−1
@@ -3069,7 +3069,7 @@ instance FromJSON IndexAliasesSummary where
30693069 parseJSON = withObject "IndexAliasesSummary" parse
30703070 where parse o = IndexAliasesSummary . mconcat <$> mapM (uncurry go) (HM.toList o)
30713071 go ixn = withObject "index aliases" $ \ia -> do
3072− aliases <- ia .: "aliases"
3072+ aliases <- ia .:? "aliases" .!= mempty
30733073 forM (HM.toList aliases) $ \(aName, v) -> do
30743074 let indexAlias = IndexAlias (IndexName ixn) (IndexAliasName (IndexName aName))
30753075 IndexAliasSummary indexAlias <$> parseJSON v
tests/tests.hs+2−2
@@ -1350,7 +1350,7 @@ main = hspec $ do
13501350 withTestEnv $ do
13511351 resetIndex
13521352 resp <- updateIndexAliases (action :| [])
1353− liftIO $ NHTS.statusCode (responseStatus resp) `shouldBe` 200
1353+ liftIO $ validateStatus resp 200
13541354 let cleanup = withTestEnv (updateIndexAliases (RemoveAlias alias :| []))
13551355 (do aliases <- withTestEnv getIndexAliases
13561356 let expected = IndexAliasSummary alias create
@@ -1371,7 +1371,7 @@ main = hspec $ do
13711371 withTestEnv $ do
13721372 resetIndex
13731373 resp <- updateIndexAliases (action :| [])
1374− liftIO $ NHTS.statusCode (responseStatus resp) `shouldBe` 200
1374+ liftIO $ validateStatus resp 200
13751375 let cleanup = withTestEnv (updateIndexAliases (RemoveAlias alias :| []))
13761376 (do aliases <- withTestEnv getIndexAliases
13771377 let expected = IndexAliasSummary alias create