Clean up some risky test warnings on PHPUnit 5.x

assertwell · Oct 29, 2020 · d139bd0 · d139bd0
1 parent a14f08b
commit d139bd0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/tests/Concerns/RunkitTest.php b/tests/Concerns/RunkitTest.php
@@ -56,8 +56,14 @@ public function it_should_skip_tests_that_require_runkit_if_it_is_unavailable()
         $method = new \ReflectionMethod($this->instance, 'requiresRunkit');
         $method->setAccessible(true);
 
-        $this->expectException(SkippedTestError::class);
+        // Older versions of PHPUnit will actually try to mark this as skipped.
+        try {
+            $method->invoke($this->instance);
+        } catch (SkippedTestError $e) {
+            $this->assertInstanceOf(SkippedTestError::class, $e);
+            return;
+        }
 
-        $method->invoke($this->instance);
+        $this->fail('Did not catch the expected SkippedTestError.');
     }
 }
diff --git a/tests/GlobalVariablesTest.php b/tests/GlobalVariablesTest.php
@@ -9,6 +9,10 @@
  */
 class GlobalVariablesTest extends TestCase
 {
+    protected $backupGlobalsBlacklist = [
+        'setGlobalVariable',
+    ];
+
     /**
      * @test
      * @testdox setGlobalVariable() should be able to handle new global variables