From 1fb6fece20bda8bb315e978ca5d4b2acd63904b9 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 18 Aug 2020 09:21:34 +0200
Subject: [PATCH] Fix unit tests
---
tests/lib/SimpleSAML/SessionHandlerPHPTest.php | 16 ++++++++--------
tests/lib/SimpleSAML/Utils/HTTPTest.php | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
index a7c8e5ba0..fe354e3ad 100644
--- a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
+++ b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
@@ -76,11 +76,11 @@ class SessionHandlerPHPTest extends ClearStateTestCase
$headers = xdebug_get_headers();
$this->assertStringContainsString('SimpleSAML=1;', $headers[0]);
- $this->assertRegExp('/\b[Ee]xpires=([Mm]on|[Tt]ue|[Ww]ed|[Tt]hu|[Ff]ri|[Ss]at|[Ss]un)/', $headers[0]);
- $this->assertRegExp('/\b[Pp]ath=\/ourPath(;|$)/', $headers[0]);
- $this->assertRegExp('/\b[Dd]omain=example.com(;|$)/', $headers[0]);
- $this->assertRegExp('/\b[Ss]ecure(;|$)/', $headers[0]);
- $this->assertRegExp('/\b[Hh]ttp[Oo]nly(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Ee]xpires=([Mm]on|[Tt]ue|[Ww]ed|[Tt]hu|[Ff]ri|[Ss]at|[Ss]un)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Pp]ath=\/ourPath(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Dd]omain=example.com(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Ss]ecure(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Hh]ttp[Oo]nly(;|$)/', $headers[0]);
}
@@ -102,7 +102,7 @@ class SessionHandlerPHPTest extends ClearStateTestCase
$headers = xdebug_get_headers();
$this->assertStringContainsString('SimpleSAML=None;', $headers[0]);
- $this->assertRegExp('/\b[Ss]ame[Ss]ite=None(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Ss]ame[Ss]ite=None(;|$)/', $headers[0]);
}
@@ -124,7 +124,7 @@ class SessionHandlerPHPTest extends ClearStateTestCase
$headers = xdebug_get_headers();
$this->assertStringContainsString('SimpleSAML=Lax;', $headers[0]);
- $this->assertRegExp('/\b[Ss]ame[Ss]ite=Lax(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Ss]ame[Ss]ite=Lax(;|$)/', $headers[0]);
}
@@ -146,7 +146,7 @@ class SessionHandlerPHPTest extends ClearStateTestCase
$headers = xdebug_get_headers();
$this->assertStringContainsString('SimpleSAML=Strict;', $headers[0]);
- $this->assertRegExp('/\b[Ss]ame[Ss]ite=Strict(;|$)/', $headers[0]);
+ $this->assertMatchesRegularExpression('/\b[Ss]ame[Ss]ite=Strict(;|$)/', $headers[0]);
}
diff --git a/tests/lib/SimpleSAML/Utils/HTTPTest.php b/tests/lib/SimpleSAML/Utils/HTTPTest.php
index 965f5df75..2fc35c22c 100644
--- a/tests/lib/SimpleSAML/Utils/HTTPTest.php
+++ b/tests/lib/SimpleSAML/Utils/HTTPTest.php
@@ -533,7 +533,7 @@ class HTTPTest extends ClearStateTestCase
HTTP::setCookie('SSStrict', 'value', ['samesite' => 'Strict']);
$headers = xdebug_get_headers();
- $this->assertNotMatchesRegularExpression('/\b[Ss]ame[Ss]ite=/', $headers[0]);
+ $this->assertDoesNotMatchRegularExpression('/\b[Ss]ame[Ss]ite=/', $headers[0]);
$this->assertMatchesRegularExpression('/\b[Ss]ame[Ss]ite=None(;|$)/', $headers[1]);
$this->assertMatchesRegularExpression('/\b[Ss]ame[Ss]ite=Lax(;|$)/', $headers[2]);
$this->assertMatchesRegularExpression('/\b[Ss]ame[Ss]ite=Strict(;|$)/', $headers[3]);
--
GitLab