From 29d137cc5e037f1f71b8f3c54ab57bd7ec1a849b Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 6 Nov 2021 22:08:22 +0700 Subject: [PATCH 1/2] [ticket/16909] Add PHP 8.2 builds to test matrix PHPBB3-16909 --- .github/workflows/tests.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c12570098c..7294c7ffe3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -126,6 +126,8 @@ jobs: db: "mysql:5.7" - php: '8.1' db: "mysql:5.7" + - php: '8.2' + db: "mysql:5.7" name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -253,6 +255,10 @@ jobs: db: "postgres:12" - php: '8.0' db: "postgres:13" + - php: '8.1' + db: "postgres:14" + - php: '8.2' + db: "postgres:14" name: PHP ${{ matrix.php }} - ${{ matrix.db }} @@ -442,7 +448,7 @@ jobs: # Test with IIS & PostgreSQL on Windows windows-tests: - runs-on: windows-2016 + runs-on: windows-latest strategy: matrix: include: @@ -455,6 +461,9 @@ jobs: - php: '8.1' db: "postgres" type: 'unit' + - php: '8.2' + db: "postgres" + type: 'unit' - php: '7.4' db: "postgres" type: 'functional' @@ -464,6 +473,9 @@ jobs: - php: '8.1' db: "postgres" type: 'functional' + - php: '8.2' + db: "postgres" + type: 'functional' name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }} - ${{ matrix.type }} From 89ca3f087ee3f190e5e44247ba596267d954182e Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 13 Nov 2021 22:39:55 +0700 Subject: [PATCH 2/2] [ticket/16909] Fix Postgres configuration on Windows, fix auth tests PHPBB3-16909 --- .github/workflows/tests.yml | 1 + tests/functional/auth_test.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7294c7ffe3..ca4574bf6e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -561,6 +561,7 @@ jobs: } [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";${env:PGBIN}") $env:PGPASSWORD = 'root' + psql -c hot_standby=on psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres psql -c 'create database phpbb_tests;' -U postgres Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php index 8bf3e61c1f..6c5e22869e 100644 --- a/tests/functional/auth_test.php +++ b/tests/functional/auth_test.php @@ -101,7 +101,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case $this->assertStringContainsString($this->lang('AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'), $crawler->filter('h3')->text()); $form = $crawler->selectButton($this->lang('UCP_AUTH_LINK_LINK'))->form(); $crawler = self::submit($form); - $this->assertStringContainsString('Google Accounts', $crawler->filter('title')->text()); + $this->assertStringContainsString('accounts.google.com', $crawler->filter('base')->attr('href')); // Test OAuth linking for registration $this->logout(); @@ -111,7 +111,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case $crawler = self::submit($form); $this->assertContainsLang('AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE', $crawler->filter('a[class="button2"]')->text()); $crawler = self::request('GET', 'ucp.php?mode=login&login=external&oauth_service=google'); - $this->assertStringContainsString('Google Accounts', $crawler->filter('title')->text()); + $this->assertStringContainsString('accounts.google.com', $crawler->filter('base')->attr('href')); // Restore default auth method, but unset random keys first // Restart webclient as we were redirected to external site before