From 169bb7764c9c067df7a19c26f6d682bc270979b7 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 16 Apr 2026 16:27:03 -0700 Subject: [PATCH] Update tests --- .github/workflows/merge-master-to-develop.yml | 1 + tests/functional/viewonline_test.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-master-to-develop.yml b/.github/workflows/merge-master-to-develop.yml index c49e7e6..31805ed 100644 --- a/.github/workflows/merge-master-to-develop.yml +++ b/.github/workflows/merge-master-to-develop.yml @@ -59,4 +59,5 @@ jobs: if git rev-parse -q --verify MERGE_HEAD > /dev/null; then git merge --abort fi + exit 1 fi diff --git a/tests/functional/viewonline_test.php b/tests/functional/viewonline_test.php index cbb9ee5..c8a0eb5 100644 --- a/tests/functional/viewonline_test.php +++ b/tests/functional/viewonline_test.php @@ -48,11 +48,14 @@ public function test_viewonline_setup() public function test_viewonline_check($page_title) { // Create user1 and send them to the Viewonline + self::$client->restart(); $this->create_user('user1'); $this->login('user1'); + // PHP goes faster than DBMS, make sure session data got written to the database. + sleep(1); $crawler = self::request('GET', "viewonline.php?sid={$this->sid}"); - // Is admin still viewing the test page + // Is admin still viewing the test page? self::assertStringContainsString('admin', $crawler->filter('#page-body table.table1')->text()); $session_entries = $crawler->filter('#page-body table.table1 tr')->count();