From 25f3630a4f6a81bb9c64fa22eeb2c5725eb33f47 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Tue, 16 Aug 2022 18:38:42 +0200 Subject: [PATCH] Fix bool query test (#22) --- tests/Unit/Query/Compound/BoolQueryTest.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/Unit/Query/Compound/BoolQueryTest.php b/tests/Unit/Query/Compound/BoolQueryTest.php index 75f54e16..959ca075 100644 --- a/tests/Unit/Query/Compound/BoolQueryTest.php +++ b/tests/Unit/Query/Compound/BoolQueryTest.php @@ -83,13 +83,8 @@ public function testBoolConstructor() */ public function testBoolConstructorException() { -<<<<<<< HEAD - $this->expectExceptionMessage("The bool operator acme is not supported"); - $this->expectException(\UnexpectedValueException::class); -======= $this->expectException(\UnexpectedValueException::class); $this->expectExceptionMessage('The bool operator acme is not supported'); ->>>>>>> 6c412555354f92407045a93b42c393bfb49fb0fa new BoolQuery([ 'acme' => [new TermQuery('key1', 'value1')], ]);