From 1dbb9c20f86ff55bbcaef236d1483caae2995abf Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Mon, 15 Mar 2021 14:15:22 -0400
Subject: [PATCH 01/13] fix for display of links with no content

---
 src/Model/RollupPage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Model/RollupPage.php b/src/Model/RollupPage.php
index 54bea7b..1945ae3 100644
--- a/src/Model/RollupPage.php
+++ b/src/Model/RollupPage.php
@@ -82,7 +82,7 @@ public function Content() {
 		// original content.
 		$content = $this->Content;
 
-		if ( $this->ShowLinksOnly === 1 || $this->ShowLinksOnly === 2 ) {
+		if ( $this->ShowLinksOnly === self::DISPLAY_LIST || $this->ShowLinksOnly === self::DISPLAY_TABS ) {
 			$content .= '<nav class="rollup-page-navigation-' . $this->getRollupPageDisplayType() . '"><ul>';
 			foreach ( $this->AllChildren() as $index => $child ) {
 				if ( ! $child->NeverRollup ) {
@@ -91,7 +91,7 @@ public function Content() {
 					if ( $child->ShowInMenus ) {
 						$content .= '<li' . ( $index === 0 ? ' class="active"' : '' ) . '>';
 
-						if ( $childContent ) {
+						if ( $childContent || $this->ShowLinksOnly === self::DISPLAY_LIST ) {
 							$content .= '<a href="' . $child->Link() . '" data-url-segment="' . $child->URLSegment . '">' . $child->MenuTitle . '</a>';
 						} else {
 							$content .= '<span>' . $child->MenuTitle . '</span>';

From 2a68da53c49f650b7c3ffdcc57abfcd830b82406 Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Fri, 12 Jan 2024 09:26:46 -0500
Subject: [PATCH 02/13] begin update to ss5

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 6b582fa..02a1eb5 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
 	}],
 	"require": {
 		"php": "^7.4||^8.0",
-		"silverstripe/cms": "^4.0"
+		"silverstripe/cms": "^4.0||^5.0"
 	},
 	"extra": {
 		"expose": [
@@ -25,9 +25,9 @@
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.5",
-		"silverstripe/sqlite3": "^2.2",
-		"logicbrush/metrics": "^0.2.0",
-		"cmrcx/phptidy": "^3.3"
+		"silverstripe/sqlite3": "*",
+		"logicbrush/metrics": "*",
+		"cmrcx/phptidy": "*"
 	},
 	"autoload": {
 		"psr-4": {

From 733c13caf86575eeb80fc62c29b8f397fc7ba208 Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Sat, 13 Jan 2024 09:27:03 -0500
Subject: [PATCH 03/13] ss5 fies

---
 src/Model/RollupPage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Model/RollupPage.php b/src/Model/RollupPage.php
index b0e5085..e9a7d10 100644
--- a/src/Model/RollupPage.php
+++ b/src/Model/RollupPage.php
@@ -59,6 +59,7 @@ public function getCMSFields() {
 		$fields = parent::getCMSFields();
 
 		$fields->insertBefore(
+			'Content',
 			OptionsetField::create(
 				'ShowLinksOnly',
 				'Rollup Display',
@@ -67,8 +68,7 @@ public function getCMSFields() {
 					2 => 'Show children in tabs',
 					1 => 'Show children as links',
 				]
-			),
-			'Content' );
+			) );
 		$contentField = $fields->dataFieldByName( 'Content' );
 		$contentField->setTitle( 'Introduction' );
 

From 186995f4d3ebb9cf40d7e9dcc930799e35c20afe Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Wed, 25 Sep 2024 09:47:22 -0400
Subject: [PATCH 04/13] adding framework to matrix.

---
 .github/workflows/ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73d94bf..b743bdf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,8 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - operating-system: 'ubuntu-latest'
-            php-version: '8.2'
           - operating-system: 'ubuntu-latest'
             php-version: '8.1'
           - operating-system: 'ubuntu-latest'
@@ -26,6 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: php-actions/composer@v6
         with:
+          args: silverstripe/framework:^5.0
           php_version: ${{ matrix.php-version }}
           php_extensions: intl
       - run: |

From 577f517bb28ed18e50f6a9bd0aa2ad78aa8ba516 Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Wed, 25 Sep 2024 12:40:01 -0400
Subject: [PATCH 05/13] ci fixes

---
 .github/workflows/ci.yml | 10 ++++++----
 .github/workflows/t.yml  |  2 ++
 public/assets/.gitkeep   |  0
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 public/assets/.gitkeep

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b743bdf..0927f16 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,7 @@
 name: "Continuous Integration"
 
 on: 
-  - pull_request
-  - push
+  push:
 
 jobs:
 
@@ -12,19 +11,22 @@ jobs:
       matrix:
         include:
           - operating-system: 'ubuntu-latest'
+            silverstripe-version: '5.0'
             php-version: '8.1'
           - operating-system: 'ubuntu-latest'
+            silverstripe-version: '4.0'
             php-version: '8.0'
           - operating-system: 'ubuntu-latest'
+            silverstripe-version: '4.0'
             php-version: '7.4'
   
-    name: PHP ${{ matrix.php-version }}
+    name: SS ${{ matrix.silverstripe-version }}, PHP ${{ matrix.php-version }}
     runs-on: ${{ matrix.operating-system }}
     steps:
       - uses: actions/checkout@v3
       - uses: php-actions/composer@v6
         with:
-          args: silverstripe/framework:^5.0
+          command: update --with silverstripe/framework:^${{ matrix.silverstripe-version }}
           php_version: ${{ matrix.php-version }}
           php_extensions: intl
       - run: |
diff --git a/.github/workflows/t.yml b/.github/workflows/t.yml
index eb31e9a..87fa1a2 100644
--- a/.github/workflows/t.yml
+++ b/.github/workflows/t.yml
@@ -15,6 +15,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: php-actions/composer@v6
         with:
+          command: update --with silverstripe/framework:^5.0
+          php_version: 8.1
           php_extensions: xdebug intl
       - name: Generate Code Coverage
         run: |
diff --git a/public/assets/.gitkeep b/public/assets/.gitkeep
new file mode 100644
index 0000000..e69de29

From 482c56531abe57a43ec809e9bf3470a150b9f769 Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Wed, 25 Sep 2024 12:41:22 -0400
Subject: [PATCH 06/13] fix tests

---
 tests/unit/Model/RollupPageTest.php | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/unit/Model/RollupPageTest.php b/tests/unit/Model/RollupPageTest.php
index 176663e..75d2133 100644
--- a/tests/unit/Model/RollupPageTest.php
+++ b/tests/unit/Model/RollupPageTest.php
@@ -46,7 +46,7 @@ public function testChildren() {
 		$rollupPage = RollupPage::create();
 		$rollupPage->ShowLinksOnly = 1;
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$this->assertEquals( 0, $rollupPage->Children()->count() );
 
@@ -54,37 +54,37 @@ public function testChildren() {
 		$page1->Content = '<p>Page 1</p>';
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
-		$page1->publish( 'Stage', 'Live' );
+		$page1->publishSingle();
 
 		$page2 = Page::create();
 		$page2->Content = '';
 		$page2->ParentID = $rollupPage->ID;
 		$page2->write();
-		$page2->publish( 'Stage', 'Live' );
+		$page2->publishSingle();
 
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$this->assertEquals( 1, $rollupPage->Children()->count() );
 
 		$page2->Content = '<p>Page 2</p>';
 		$page2->write();
-		$page2->publish( 'Stage', 'Live' );
+		$page2->publishSingle();
 
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$this->assertEquals( 2, $rollupPage->Children()->count() );
 
 		$rollupPage->ShowLinksOnly = 2;
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$this->assertEquals( 0, $rollupPage->Children()->count() );
 
 		$rollupPage->ShowLinksOnly = 0;
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$this->assertEquals( 0, $rollupPage->Children()->count() );
 	}
@@ -120,7 +120,7 @@ public function testContent() {
 		$rollupPage->Title = 'Rollup Page';
 		$rollupPage->ShowLinksOnly = 0;
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 
 		$page1 = Page::create();
@@ -128,14 +128,14 @@ public function testContent() {
 		$page1->Content = '<p>Page 1 content</p>';
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
-		$page1->publish( 'Stage', 'Live' );
+		$page1->publishSingle();
 
 		$page2 = FakePage::create();
 		$page2->Title = 'Page 2';
 		$page2->Content = '<p>Page 2 content</p>';
 		$page2->ParentID = $rollupPage->ID;
 		$page2->write();
-		$page2->publish( 'Stage', 'Live' );
+		$page2->publishSingle();
 
 		$this->assertStringContainsString( '<p>Page 1 content</p>', $rollupPage->Content() );
 		$this->assertStringContainsString( '<p>Page 2 content</p>', $rollupPage->Content() );
@@ -145,13 +145,13 @@ public function testContent() {
 
 		$rollupPage->ShowLinksOnly = 1;
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$page1->write();
-		$page1->publish( 'Stage', 'Live' );
+		$page1->publishSingle();
 
 		$page2->write();
-		$page2->publish( 'Stage', 'Live' );
+		$page2->publishSingle();
 
 		$this->assertStringNotContainsString( '<p>Page 1 content</p>', $rollupPage->Content() );
 		$this->assertStringContainsString( '<nav class="rollup-page-navigation-list">', $rollupPage->Content() );
@@ -162,17 +162,17 @@ public function testContent() {
 
 		$rollupPage->ShowLinksOnly = 2;
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$page1->write();
-		$page1->publish( 'Stage', 'Live' );
+		$page1->publishSingle();
 
 		$page2->Content = '';
 		$page2->write();
-		$page2->publish( 'Stage', 'Live' );
+		$page2->publishSingle();
 
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$this->assertStringContainsString( '<p>Page 1 content</p>', $rollupPage->Content() );
 		$this->assertStringContainsString( '<nav class="rollup-page-navigation-tabs">', $rollupPage->Content() );

From 5ec3f2008ba37cce92d169baa91ff8f329b946f3 Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Wed, 25 Sep 2024 12:42:46 -0400
Subject: [PATCH 07/13] test fix

---
 tests/unit/Controllers/RollupPageControllerTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/unit/Controllers/RollupPageControllerTest.php b/tests/unit/Controllers/RollupPageControllerTest.php
index a97a0d8..f90d466 100644
--- a/tests/unit/Controllers/RollupPageControllerTest.php
+++ b/tests/unit/Controllers/RollupPageControllerTest.php
@@ -42,10 +42,10 @@ public function testDisplayingRollupPageInline() {
 		$rollupPage->Content = '<p>Rollup</p>';
 		$rollupPage->ShowLinksOnly = RollupPage::DISPLAY_INLINE;
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$child1 = $this->addChildPage( $rollupPage, 'Child 1' );
-		$child1->publish( 'Stage', 'Live' );
+		$child1->publishSingle();
 
 		$response = $this->get( $rollupPage->Link() );
 		$this->assertEquals( 200, $response->getStatusCode() );
@@ -66,10 +66,10 @@ public function testDisplayingRollupPageAsTabs() {
 		$rollupPage->Content = '<p>Rollup</p>';
 		$rollupPage->ShowLinksOnly = RollupPage::DISPLAY_TABS;
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$child1 = $this->addChildPage( $rollupPage, 'Child 1' );
-		$child1->publish( 'Stage', 'Live' );
+		$child1->publishSingle();
 
 		$response = $this->get( $rollupPage->Link() );
 		$this->assertEquals( 200, $response->getStatusCode() );
@@ -90,7 +90,7 @@ public function testBlockDefaultRollupPageCSS() {
 		$rollupPage->Title = 'Rollup Page';
 		$rollupPage->Content = '<p>Rollup</p>';
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$response = $this->get( $rollupPage->Link() );
 
@@ -113,7 +113,7 @@ public function testBlockDefaultRollupPageJavascript() {
 		$rollupPage->Title = 'Rollup Page';
 		$rollupPage->Content = '<p>Rollup</p>';
 		$rollupPage->write();
-		$rollupPage->publish( 'Stage', 'Live' );
+		$rollupPage->publishSingle();
 
 		$response = $this->get( $rollupPage->Link() );
 

From 746c5f8200625d69bf941416f9503539982bbd85 Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Wed, 25 Sep 2024 12:45:04 -0400
Subject: [PATCH 08/13] test fix???

---
 tests/unit/Controllers/RollupPageControllerTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/Controllers/RollupPageControllerTest.php b/tests/unit/Controllers/RollupPageControllerTest.php
index f90d466..9462d4d 100644
--- a/tests/unit/Controllers/RollupPageControllerTest.php
+++ b/tests/unit/Controllers/RollupPageControllerTest.php
@@ -96,7 +96,7 @@ public function testBlockDefaultRollupPageCSS() {
 
 		$this->assertStringContainsString( 'css/rolluppage.css', $response->getBody() );
 
-		RollupPage::config()->update( 'block_default_rollup_page_css', true );
+		RollupPage::config()->modify( 'block_default_rollup_page_css', true );
 
 		$response = $this->get( $rollupPage->Link() );
 
@@ -119,7 +119,7 @@ public function testBlockDefaultRollupPageJavascript() {
 
 		$this->assertStringContainsString( 'javascript/rolluppage.js', $response->getBody() );
 
-		RollupPage::config()->update( 'block_default_rollup_page_js', true );
+		RollupPage::config()->modify( 'block_default_rollup_page_js', true );
 
 		$response = $this->get( $rollupPage->Link() );
 

From 16c2e95c4632e71c460136129debb2c77160d891 Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Wed, 25 Sep 2024 12:47:13 -0400
Subject: [PATCH 09/13] test fix

---
 tests/unit/Controllers/RollupPageControllerTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/Controllers/RollupPageControllerTest.php b/tests/unit/Controllers/RollupPageControllerTest.php
index 9462d4d..64171ad 100644
--- a/tests/unit/Controllers/RollupPageControllerTest.php
+++ b/tests/unit/Controllers/RollupPageControllerTest.php
@@ -96,7 +96,7 @@ public function testBlockDefaultRollupPageCSS() {
 
 		$this->assertStringContainsString( 'css/rolluppage.css', $response->getBody() );
 
-		RollupPage::config()->modify( 'block_default_rollup_page_css', true );
+		RollupPage::config()->set( 'block_default_rollup_page_css', true );
 
 		$response = $this->get( $rollupPage->Link() );
 
@@ -119,7 +119,7 @@ public function testBlockDefaultRollupPageJavascript() {
 
 		$this->assertStringContainsString( 'javascript/rolluppage.js', $response->getBody() );
 
-		RollupPage::config()->modify( 'block_default_rollup_page_js', true );
+		RollupPage::config()->set( 'block_default_rollup_page_js', true );
 
 		$response = $this->get( $rollupPage->Link() );
 

From 3d330176f72775c1cbe371b64365a944e0c244ef Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Wed, 25 Sep 2024 12:51:56 -0400
Subject: [PATCH 10/13] test fix

---
 tests/unit/Model/WithRollupSupportExtensionTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/Model/WithRollupSupportExtensionTest.php b/tests/unit/Model/WithRollupSupportExtensionTest.php
index be99631..8d998c7 100644
--- a/tests/unit/Model/WithRollupSupportExtensionTest.php
+++ b/tests/unit/Model/WithRollupSupportExtensionTest.php
@@ -43,7 +43,7 @@ public function testLink() {
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		$this->assertEquals( '/rollup-page/page-1/', $page1->Link() );
+		// $this->assertEquals( '/rollup-page/page-1/', $page1->Link() );
 
 		$rollupPage->ShowLinksOnly = 0;
 		$rollupPage->write();

From 493759afd11d813b08da27e14cf3632c151d26c9 Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Wed, 25 Sep 2024 13:01:49 -0400
Subject: [PATCH 11/13] test fix??

---
 tests/unit/Model/WithRollupSupportExtensionTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/Model/WithRollupSupportExtensionTest.php b/tests/unit/Model/WithRollupSupportExtensionTest.php
index 8d998c7..c825bc4 100644
--- a/tests/unit/Model/WithRollupSupportExtensionTest.php
+++ b/tests/unit/Model/WithRollupSupportExtensionTest.php
@@ -43,21 +43,21 @@ public function testLink() {
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		// $this->assertEquals( '/rollup-page/page-1/', $page1->Link() );
+		$this->asserContains( $page1->Link(), ['/rollup-page/page-1/','/rollup-page/page-1'] );
 
 		$rollupPage->ShowLinksOnly = 0;
 		$rollupPage->write();
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		$this->assertEquals( '/rollup-page/#page-1', $page1->Link() );
+		$this->asserContains( $page1->Link(), ['/rollup-page/#page-1','/rollup-page#page-1'] );
 
 		$rollupPage->ShowLinksOnly = 2;
 		$rollupPage->write();
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		$this->assertEquals( '/rollup-page/#page-1', $page1->Link() );
+		$this->asserContains( $page1->Link(), ['/rollup-page/#page-1','/rollup-page#page-1'] );
 	}
 
 

From 40b879363ed3431c45af81be7748c63a5832b1aa Mon Sep 17 00:00:00 2001
From: John Learn <jflearn@logicbrush.com>
Date: Wed, 25 Sep 2024 13:03:17 -0400
Subject: [PATCH 12/13] typo

---
 tests/unit/Model/WithRollupSupportExtensionTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/Model/WithRollupSupportExtensionTest.php b/tests/unit/Model/WithRollupSupportExtensionTest.php
index c825bc4..2647f29 100644
--- a/tests/unit/Model/WithRollupSupportExtensionTest.php
+++ b/tests/unit/Model/WithRollupSupportExtensionTest.php
@@ -43,21 +43,21 @@ public function testLink() {
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		$this->asserContains( $page1->Link(), ['/rollup-page/page-1/','/rollup-page/page-1'] );
+		$this->assertContains( $page1->Link(), ['/rollup-page/page-1/','/rollup-page/page-1'] );
 
 		$rollupPage->ShowLinksOnly = 0;
 		$rollupPage->write();
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		$this->asserContains( $page1->Link(), ['/rollup-page/#page-1','/rollup-page#page-1'] );
+		$this->assertContains( $page1->Link(), ['/rollup-page/#page-1','/rollup-page#page-1'] );
 
 		$rollupPage->ShowLinksOnly = 2;
 		$rollupPage->write();
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		$this->asserContains( $page1->Link(), ['/rollup-page/#page-1','/rollup-page#page-1'] );
+		$this->assertContains( $page1->Link(), ['/rollup-page/#page-1','/rollup-page#page-1'] );
 	}
 
 

From 973312a75b9a3904f2de1b85aee9c54ceb7c76b0 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 25 Sep 2024 17:03:43 +0000
Subject: [PATCH 13/13] tidy

---
 tests/unit/Model/WithRollupSupportExtensionTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/Model/WithRollupSupportExtensionTest.php b/tests/unit/Model/WithRollupSupportExtensionTest.php
index 2647f29..fdb69c6 100644
--- a/tests/unit/Model/WithRollupSupportExtensionTest.php
+++ b/tests/unit/Model/WithRollupSupportExtensionTest.php
@@ -43,21 +43,21 @@ public function testLink() {
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		$this->assertContains( $page1->Link(), ['/rollup-page/page-1/','/rollup-page/page-1'] );
+		$this->assertContains( $page1->Link(), ['/rollup-page/page-1/', '/rollup-page/page-1'] );
 
 		$rollupPage->ShowLinksOnly = 0;
 		$rollupPage->write();
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		$this->assertContains( $page1->Link(), ['/rollup-page/#page-1','/rollup-page#page-1'] );
+		$this->assertContains( $page1->Link(), ['/rollup-page/#page-1', '/rollup-page#page-1'] );
 
 		$rollupPage->ShowLinksOnly = 2;
 		$rollupPage->write();
 		$page1->ParentID = $rollupPage->ID;
 		$page1->write();
 
-		$this->assertContains( $page1->Link(), ['/rollup-page/#page-1','/rollup-page#page-1'] );
+		$this->assertContains( $page1->Link(), ['/rollup-page/#page-1', '/rollup-page#page-1'] );
 	}