support and require fbexpect 2.6.1+

composer.json

@@ -15,7 +15,7 @@
         "hhvm/hhast": "^4.6",
         "hhvm/hhvm-autoload": "^2.0",
         "hhvm/hacktest": "^1.1",
-        "facebook/fbexpect": "^2.1",
+        "facebook/fbexpect": "^2.6.1",
         "usox/hackttp": "^0.3"
     },
     "extra": {

tests/RouterCLILookupCodegenBuilderTest.hack

@@ -81,10 +81,10 @@ final class RouterCLILookupCodegenBuilderTest extends BaseCodegenTestCase {
     );
     $output = \implode("\n", $output);
     expect($exit_code)->toBeGreaterThan(0);
-    expect($output)->toNotContain('HEAD');
-    expect($output)->toNotContain('GET');
+    expect($output)->toNotContainSubstring('HEAD');
+    expect($output)->toNotContainSubstring('GET');
     // Brittle - don't care about this string, just that there's a friendly
     // error message rather than a hack error, exception, etc
-    expect($output)->toContain('No controller found');
+    expect($output)->toContainSubstring('No controller found');
   }
 }

tests/RouterCodegenBuilderTest.hack

@@ -71,14 +71,14 @@ final class RouterCodegenBuilderTest extends BaseCodegenTestCase {
 
   public async function testMapOnlyContainsUsedMethods(): Awaitable<void> {
     $code = $this->renderToString(await $this->getBuilderAsync());
-    expect($code)->toContain('HttpMethod::GET');
-    expect($code)->toNotContain('HttpMethod::POST');
+    expect($code)->toContainSubstring('HttpMethod::GET');
+    expect($code)->toNotContainSubstring('HttpMethod::POST');
   }
 
   public async function testDefaultGeneratedFrom(): Awaitable<void> {
     $code = $this->renderToString(await $this->getBuilderAsync());
-    expect($code)->toContain('To re-generate this file run');
-    expect($code)->toContain('vendor/hhvm/hacktest/bin/hacktest');
+    expect($code)->toContainSubstring('To re-generate this file run');
+    expect($code)->toContainSubstring('vendor/hhvm/hacktest/bin/hacktest');
   }
 
   public async function testOverriddenGeneratedFrom(): Awaitable<void> {
@@ -87,7 +87,8 @@ final class RouterCodegenBuilderTest extends BaseCodegenTestCase {
         $this->getCodegenFactory()->codegenGeneratedFromClass(self::class),
       ),
     );
-    expect($code)->toContain('Generated from '.RouterCodegenBuilder::class);
+    expect($code)
+      ->toContainSubstring('Generated from '.RouterCodegenBuilder::class);
   }
 
   public async function testCreatesFinalByDefault(): Awaitable<void> {