diff --git a/tests/System/Commands/MigrateTest.php b/tests/System/Commands/MigrateTest.php index 4dcfe4c..8548096 100644 --- a/tests/System/Commands/MigrateTest.php +++ b/tests/System/Commands/MigrateTest.php @@ -167,6 +167,12 @@ private function getTestSuffix($api) return '5-2b6'; } + // The folder-level pageUrl segment only included URL aliases as of 5.12.0-alpha + // (matomo-org/matomo#24598). Older core still produces a single-clause segment. + if ($api === ['Actions.getPageUrls'] && version_compare(Version::VERSION, '5.12.0-alpha', '<')) { + return '5-12a'; + } + return ''; } diff --git a/tests/System/expected/test_5-12a__Actions.getPageUrls_day.xml b/tests/System/expected/test_5-12a__Actions.getPageUrls_day.xml new file mode 100644 index 0000000..4c08979 --- /dev/null +++ b/tests/System/expected/test_5-12a__Actions.getPageUrls_day.xml @@ -0,0 +1,152 @@ + + + + + 2 + 2 + 360 + 0 + 0 + + + 1 + 2 + 721 + 0 + 1 + + + 1 + 2541 + 1 + 1 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + + + 0 + 0 + 180 + 0% + 50% + pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub + + + + 2 + 2 + 2 + 360 + 0 + 0 + + + 1 + 1 + 2 + 721 + 0 + 1 + 1 + + + 1 + 2541 + 1 + 1 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + + + 180 + 0% + 50% + http://example.com/sub/page + pageUrl==http%253A%252F%252Fexample.com%252Fsub%252Fpage + + + + + + 1 + 1 + 1 + 360 + 0 + 0 + + + 1 + 1 + 2 + 544 + 0 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + 2541 + 1 + 2541 + 1 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + 5 + 1 + 5 + 1 + + + 0 + 0 + 360 + 0% + 0% + http://example.com/ + pageUrl==http%253A%252F%252Fexample.com%252F + + \ No newline at end of file diff --git a/tests/System/expected/test_5-12a__Actions.getPageUrls_year.xml b/tests/System/expected/test_5-12a__Actions.getPageUrls_year.xml new file mode 100644 index 0000000..23f9031 --- /dev/null +++ b/tests/System/expected/test_5-12a__Actions.getPageUrls_year.xml @@ -0,0 +1,152 @@ + + + + + 2 + 2 + 360 + 0 + 0 + + + 1 + 2 + 721 + 0 + 1 + + + 1 + 2541 + 1 + 1 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + + + 0 + 0 + 180 + 0% + 50% + pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub + + + + 2 + 2 + 360 + 0 + 0 + + + 1 + 2 + 721 + 0 + 1 + + + 1 + 2541 + 1 + 1 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + + + 2 + 1 + 1 + 180 + 0% + 50% + http://example.com/sub/page + pageUrl==http%253A%252F%252Fexample.com%252Fsub%252Fpage + + + + + + 1 + 1 + 360 + 0 + 0 + + + 1 + 2 + 544 + 0 + + + 1 + 2541 + 2 + 0.5 + 1 + 1 + 1270.5 + 2541 + 1 + 2541 + 1 + + + 1 + 5 + 2 + 0.5 + 1 + 1 + 2.5 + 5 + 1 + 5 + 1 + + + 1 + 1 + 0 + 0 + 360 + 0% + 0% + http://example.com/ + pageUrl==http%253A%252F%252Fexample.com%252F + + \ No newline at end of file diff --git a/tests/System/expected/test___Actions.getPageUrls_day.xml b/tests/System/expected/test___Actions.getPageUrls_day.xml index 4c08979..1e45dcb 100644 --- a/tests/System/expected/test___Actions.getPageUrls_day.xml +++ b/tests/System/expected/test___Actions.getPageUrls_day.xml @@ -45,7 +45,7 @@ 180 0% 50% - pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub + pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub,pageUrl=^https%253A%252F%252Fwww.example1.com%252Fsub,pageUrl=^https%253A%252F%252Fwww.example2.net%252Fsub diff --git a/tests/System/expected/test___Actions.getPageUrls_year.xml b/tests/System/expected/test___Actions.getPageUrls_year.xml index 23f9031..4b5e151 100644 --- a/tests/System/expected/test___Actions.getPageUrls_year.xml +++ b/tests/System/expected/test___Actions.getPageUrls_year.xml @@ -45,7 +45,7 @@ 180 0% 50% - pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub + pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub,pageUrl=^https%253A%252F%252Fwww.example1.com%252Fsub,pageUrl=^https%253A%252F%252Fwww.example2.net%252Fsub