diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-01-13 05:02:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 05:02:55 +0300 |
| commit | ab23645e48b9e6abc42c811ad75a148a5105cde9 (patch) | |
| tree | e6b2532d509f7c68a9e360355f5ca0998c3e134d /tests | |
| parent | 25920eb1c36340705a76bfb376b7051a6c15879d (diff) | |
Add release channels 3.x-dev (#15381)
Diffstat (limited to 'tests')
6 files changed, 12 insertions, 12 deletions
diff --git a/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php b/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php index 7b43b423bb..3d2eae212b 100644 --- a/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php +++ b/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php @@ -79,7 +79,7 @@ class ReleaseChannelsTest extends IntegrationTestCase return array( array($exists = true, $id = 'latest_stable'), array($exists = true, $id = 'latest_beta'), - array($exists = true, $id = 'latest_2x_stable'), + array($exists = true, $id = 'latest_3x_stable'), array($exists = true, $id = 'laTest_stable'), // we do not check for exact match array($exists = false, $id = ''), array($exists = false, $id = 'latest'), @@ -92,7 +92,7 @@ class ReleaseChannelsTest extends IntegrationTestCase { return array( array('latest_stable', 'latest_stable'), - array('latest_2x_stable', 'latest_2x_stable'), + array('latest_3x_stable', 'latest_3x_stable'), array('latest_beta', 'latest_beta'), array('latest_beta', 'latEst_betA'), array('latest_stable', ''), // if nothing configured should return default (the one with lowest order) diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml index 1775d8b5ea..a234c57a46 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml @@ -322,8 +322,8 @@ <availableValues> <latest_stable>Latest stable release (Recommended)</latest_stable> <latest_beta>Latest beta release</latest_beta> - <latest_2x_stable>Latest stable 2.X (Long Term Support version)</latest_2x_stable> - <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> + <latest_3x_stable>Latest stable 3.X (Long Term Support version)</latest_3x_stable> + <latest_3x_beta>Latest beta 3.X (Long Term Support version)</latest_3x_beta> </availableValues> <description /> <inlineHelp>While our development process includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Matomo.<br/>If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml index 665e721923..5d30c8a96b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml @@ -284,8 +284,8 @@ <availableValues> <latest_stable>Latest stable release (Recommended)</latest_stable> <latest_beta>Latest beta release</latest_beta> - <latest_2x_stable>Latest stable 2.X (Long Term Support version)</latest_2x_stable> - <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> + <latest_3x_stable>Latest stable 3.X (Long Term Support version)</latest_3x_stable> + <latest_3x_beta>Latest beta 3.X (Long Term Support version)</latest_3x_beta> </availableValues> <description /> <inlineHelp>While our <a target='_blank' rel='noreferrer noopener' href='https://matomo.org/participate/development-process/'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Matomo.<br/>If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index 1775d8b5ea..a234c57a46 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml @@ -322,8 +322,8 @@ <availableValues> <latest_stable>Latest stable release (Recommended)</latest_stable> <latest_beta>Latest beta release</latest_beta> - <latest_2x_stable>Latest stable 2.X (Long Term Support version)</latest_2x_stable> - <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> + <latest_3x_stable>Latest stable 3.X (Long Term Support version)</latest_3x_stable> + <latest_3x_beta>Latest beta 3.X (Long Term Support version)</latest_3x_beta> </availableValues> <description /> <inlineHelp>While our development process includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Matomo.<br/>If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml index 1775d8b5ea..a234c57a46 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml @@ -322,8 +322,8 @@ <availableValues> <latest_stable>Latest stable release (Recommended)</latest_stable> <latest_beta>Latest beta release</latest_beta> - <latest_2x_stable>Latest stable 2.X (Long Term Support version)</latest_2x_stable> - <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> + <latest_3x_stable>Latest stable 3.X (Long Term Support version)</latest_3x_stable> + <latest_3x_beta>Latest beta 3.X (Long Term Support version)</latest_3x_beta> </availableValues> <description /> <inlineHelp>While our development process includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Matomo.<br/>If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index 3655d223cf..5df8af21f3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4e01c9ef7c6168ec6d1b3c2bd67d7d6031fedc693f8b076cb132945de00d64b -size 1032268 +oid sha256:897f2a94a6c40124829adb89eb7c116055c7b05e82a19f3d05fc189ac583f844 +size 1032341 |
