Merge branch 'next'

Conflicts: .travis.yml addons/circe-json/src/main/scala/com/github/tminglei/slickpg/PgCirceJsonSupport.scala addons/circe-json/src/test/scala/com/github/tminglei/slickpg/PgCirceJsonSupportSuite.scala project/Build.scala
tminglei · Dec 10, 2016 · cc8a0d9 · cc8a0d9
1 parent 2188735
commit cc8a0d9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/addons/circe-json/src/test/scala/com/github/tminglei/slickpg/PgCirceJsonSupportSuite.scala b/addons/circe-json/src/test/scala/com/github/tminglei/slickpg/PgCirceJsonSupportSuite.scala
@@ -57,10 +57,6 @@ class PgCirceJsonSupportSuite extends FunSuite {
           JsonTests.filter(_.id === testRec2.id.bind).map(_.json).result.head.map(
             r => assert(Json.arr(json1, json2) === r)
           ),
-          // null return
-          JsonTests.filter(_.json.+>>("a") === "101").map(_.json.+>("d")).result.head.map(
-            r => assert(Json.Null === r)
-          ),
           // ->>/->
           JsonTests.filter(_.json.+>>("a") === "101".bind).map(_.json.+>>("c")).result.head.map(
             r => assert("[3,4,5,9]" === r.replace(" ", ""))