Direclty use HackTest ExpectationFailedException

Now that PHPUnit is no longer supported by fbexpect, use it directly. This restores HackTest correctly detecting errors vs failures
hhvm · Nov 29, 2018 · 22b9d59 · 22b9d59
1 parent beff712
commit 22b9d59
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 83 deletions.
diff --git a/composer.json b/composer.json
@@ -2,11 +2,9 @@
   "name": "facebook/fbexpect",
   "description": "Unit test helpers for Facebook projects",
   "license": "MIT",
-  "require-dev": {
-    "hhvm/hacktest": "^1.0"
-  },
   "require": {
     "hhvm": "^3.28",
+    "hhvm/hacktest": "^1.0",
     "hhvm/hsl": "^3.26",
     "hhvm/hhvm-autoload": "^1.6",
     "facebook/difflib": "^1.0.0"

diff --git a/composer.lock b/composer.lock
diff --git a/src/Assert.php b/src/Assert.php
@@ -12,6 +12,7 @@
 
 use namespace HH\Lib\Str;
 use type Facebook\DiffLib\StringDiff;
+use type Facebook\HackTest\ExpectationFailedException;
 
 abstract class Assert {
 

diff --git a/src/Exception/ExpectationFailedException.php b/src/Exception/ExpectationFailedException.php
diff --git a/tests/ExpectObjTest.php b/tests/ExpectObjTest.php
@@ -10,7 +10,7 @@
 
 namespace Facebook\FBExpect;
 
-use type Facebook\HackTest\{DataProvider, HackTest};
+use type Facebook\HackTest\{DataProvider, ExpectationFailedException, HackTest};
 
 final class ExpectObjTestException extends \Exception {}