From c4c587f9289f6fc37b5730d9ad3b5c8412cffc4b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 23 Mar 2021 10:20:26 +0100 Subject: [PATCH] Change stable14 tests to stable19 Signed-off-by: Morris Jobke --- .drone.yml | 24 +++++------ Makefile | 4 +- tests/features/bootstrap/FeatureContext.php | 48 --------------------- tests/features/stable14.feature | 32 -------------- tests/features/stable19.feature | 32 ++++++++++++++ 5 files changed, 46 insertions(+), 94 deletions(-) delete mode 100644 tests/features/stable14.feature create mode 100644 tests/features/stable19.feature diff --git a/.drone.yml b/.drone.yml index 3d96580d..f61d735f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -71,13 +71,13 @@ trigger: # --- kind: pipeline -name: php70-stable14 +name: php72-stable19 steps: - - name: php70-stable14 - image: nextcloudci/php7.0:php7.0-19 + - name: php72-stable19 + image: nextcloudci/php7.2:php7.2-14 commands: - - make test-stable14 + - make test-stable19 trigger: branch: @@ -89,13 +89,13 @@ trigger: --- kind: pipeline -name: php71-stable14 +name: php73-stable19 steps: - - name: php71-stable14 - image: nextcloudci/php7.1:php7.1-16 + - name: php73-stable19 + image: nextcloudci/php7.3:php7.3-5 commands: - - make test-stable14 + - make test-stable19 trigger: branch: @@ -107,13 +107,13 @@ trigger: --- kind: pipeline -name: php72-stable14 +name: php74-stable19 steps: - - name: php72-stable14 - image: nextcloudci/php7.2:php7.2-12 + - name: php74-stable19 + image: nextcloudci/php7.4:php7.4-3 commands: - - make test-stable14 + - make test-stable19 trigger: branch: diff --git a/Makefile b/Makefile index 2bc7e2af..7ab7f636 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,8 @@ test: updater.phar test/vendor test-cli: updater.phar test/vendor cd tests && vendor/behat/behat/bin/behat features/cli.feature -test-stable14: updater.phar test/vendor - cd tests && vendor/behat/behat/bin/behat features/stable14.feature +test-stable19: updater.phar test/vendor + cd tests && vendor/behat/behat/bin/behat features/stable19.feature test-stable15: updater.phar test/vendor cd tests && vendor/behat/behat/bin/behat features/stable15.feature diff --git a/tests/features/bootstrap/FeatureContext.php b/tests/features/bootstrap/FeatureContext.php index 301030ff..bafb141e 100644 --- a/tests/features/bootstrap/FeatureContext.php +++ b/tests/features/bootstrap/FeatureContext.php @@ -196,54 +196,6 @@ public function theCliUpdaterIsRun() */ public function getSignatureForVersion($version) { $signatures = [ - '11.0.2' => 'hvw4zZs6gSeP4TlU0kkfpJ1tgaSrD2M8V/MANX/YqwZBy9mG8z67Mtt07sbYByHh -kWVd2uVmVoiEcmNEtiJUE1WEcrC+YSAFUTl8P4MjUa2jEC3k37zIn1WcFI8ZqRiH -EBYiSef87rZXjcvuta5fC4O0cOaxU3pVkNVqeP9T0tHEI4Oorj5Uj8qoiuIH2Xbc -chLfk+x/EatNAlTE6NJo6rJnquCErooOPgLl6k48oOcgJZZtOQ1xDhb69Yug25bv -V12smv+3iUGpQBIJnBhIZY+Ww7SOCCca/ss1f+/uEMr3NFGiDgJ4KYoxF/pYaGo4 -MgK0pHPeAIesiUnEEq8y6w==', - '12.0.0' => 'My4ZSUly2nD1t+pKhS4uzzlkVt08TQi64DbICxO2nIGB1I3RpyqXgd+BXWobTG35 -116 J7DiJ6LEbHw/YMuzYj/vi+XJxbmkGrsHxWhlc5jdn3sc406Dgr4ywyZztiS2SCMy -117 tTAg0vwiH3pBP68rx/2ltPN7hS3HkReqb/28rAegntXVd35R9w9YGbOl4zfqmnSJ -118 zUBXGiOmKhh6KPcPaiavxDXCgR+4v2pgu9J3RmPgkq0m2AsDl6YPOxN+FGVHKbBP -119 TJw0efCxt7Q3Mdo70zmJbyE+Dal+UV+EgZC3tU+zd2vUckrs6B2xNoSBlo1UOjo2 -120 dL+1Gy7Ry+R0Y1eFw+XYJQ==', - '12.0.1' => 'R6+aQoW/L0L7RyM/ER06kH7XJHyskvmuOHcUKIydWGbFN1PQTjblqXiiUcsmFtsD -+ZLeiPtWg3wquzuA3GWk7vrJrRvIKguULBEdtaDv76jeOxX8IVtPZYyq9ywSleHU -qd9CCurtREBZVmaQLy79+aXvan+pSvq4f9kl9jVVDp/v9QDpaHSLtKrUCHGgyQZO -0APf4QTMn+Jlw40JD3vbQSPkxWb7dcQEE6gGg6htN7iLHRRVXf8sJWFrLGotCHCH -RVY+A9o0d/+e49hXBsqNA03y1ZETQkVle1X7618aFj+Rfekq+yANXG1w2yD69Erv -DB8RQvd5QS/1Igt4LyTdMw==', - '13.0.1' => 'AG3egWHJkQaqCraVLiRq5Q7GvqArmBgVv8PNAfVYTOXPN6xWmw8cbUeBvBZ3OS1/ -bup1ktLDwTLDjWm1XMBUhhQCxVDLtEd3A6WfaVJz9BWoz1MyxUGlaIJSzTHLoEfz -nFVUdoGH0mAdq8WtxRQSNwQWeKn+iF1jpbtIbDc29POtWvvzEgT/KW8MDzeidx6s -W78tH4vldR0/aBn1D3hwnkQEQ8+Kz+Y4ItjHHi6XpJEfRQzYD0j9T+VTQ9IX4Xf/ -XqTrcaUCqwOlSC4pM7aUUzgaePPcYU2zrRDRaEgLma9eSkVMzkkc4kfM3izBG0Iv -STb5hZFB2HMLyJxuj1l05w==', - '13.0.4' => 'OogV1NE98yxer6atJPOgXBxnVgAuME94UoZ1TlgTGUw0KYqvKNwKKQ+gqzJ3ZL9t -XJuHAYQi2Uk0iblIA3TFuDALU/wA3th2PMoobHtzR4FFzDUvb88FdgKxBAOhh9n0 -1PwiLBYT1FuDJn+fQLmbXWbPVlfFOOsyPFxysl1nXztxSJ7FsPgIE/MGvqKnk4L3 -5iG3o/UAbqmmKNQpn7gJw4BYdf3mkJcBOgdRrcy3MXqLh9dIAXkK5HcKOD3A+Uvy -amApr7+j7zp0QlnhrObLBWramdSqmS2Udt/TdN1XhMF/9Nzq+qod6aJ8qCz9aqEb -PUPFcPmm6YQgra/1OoMTpg==', - '14.0.0beta2' => 'yCyJb7vjDb9LVUKM+GpVDCjJaAo93T4T9Zb2kHxEhE4sUC5ZRGzNVRdefyH9ecKO -j0FDD+FCzSFZsW/csmb7noIS4O9GQf9WJTG+Xta2G5DWHL+1fQQFmcAjv0sTn4xL -QNtgTBqdqREa5c3Bw+16n3yc5AD781gjD2/7XDizLEgJeasgwsm73WToBy8RAQU+ -os1aH86jxbWMz5aCaARN9fNNsz1rjdf7Ra8CZ/GWDmvN9x/a54GitfHwweADmCQB -m+zg19Ktimw4SVrk4zlmLzmkQm8a7fqRUkUaZHCu3QQzwqND8T7gDvuJVtt/abzH -yNXW1wn3/cEeT6a2tkUNXw==', - '14.0.1' => 'GMLD/dgAkP8AtldfrBib1Jz9WAehw3wqnCRfReCckOt5XfGY8DjtGzDuyt285862 -8wOPvmEIZsrGSooGiAgNv4H3kXO21EzzBwOyov26dyh+OtTxfxpN6yLEKpcRSWPj -GweHorjisB2gqf6P/nD9yo69QCEIZKm8O2wx09K+QC8jwJ+UxdSm6p7b/d14lPwW -n6hwHIcpwKicNJiLGWhHpslC64nIqp+DAbOeFtl+mVGpigyNec5+JekMVCayAGAs -RS5Otchsk2GtWqPWtQEWSbkPFxuIJY9ij1RY+ocABIfQ8b55pbwkRNpjAawq5+3G -UhPQ296yv/FbIxF+rWpL+g==', - '14.0.3' => 'cWbv8qrFK4lKaRAtHLvM3AjLcwd4S1lIWYzE3hbAN30MuW60weRqYZf412jUe/7g -EEaas6MNqgd5omqwsnTwn4KwtfUkKSB5JbwGHZY95Wv/mf5EyZfw0x04xo5A6W5l -Zv7kK0HOGGOzT1nqyJJHvin9jU3eBzpWe9Es2hwhQYFI9C+V/5Fvbm37dqN821gQ -aTT4zv8XwVkAoH6BRrNGjoUqQHVBcONVEcYPEahBI9SjuTVX807e9HETrsziKtHu -k5E2t0FCNl/qUvxEDtsvQk5+XD1fW6v5ievqfLoZhv/XqKdCfAqgyC83NijYB0/8 -ajEplLd/VwvoezLExRngLQ==', '15.0.0RC1' => 'AQK4hJcQ1TZAPOpMfVy4ukOp6ny1DyzBY5ui7P9WhgBMHLeP4ed9Apmc07gcCOJF Ya/+Bfc/ESNtVVeZQ3r9ubSz0NTTBgXDO7N7ymSCgA5wq4wqgjHW+bKZfDHoxt+1 WbRmf4trGwDdCA/kQ59LInfLR8KFfEiiOH2p2NijgXuWm49tdr7N1062diP4Dzwd diff --git a/tests/features/stable14.feature b/tests/features/stable14.feature deleted file mode 100644 index 7a4ebc8f..00000000 --- a/tests/features/stable14.feature +++ /dev/null @@ -1,32 +0,0 @@ -Feature: CLI updater - stable14 base - - Scenario: Update is available - 14.0.0 beta 1 to 14.0.0 beta 2 - Given the current installed version is 14.0.0beta1 - And there is an update to prerelease version "14.0.0beta2" available - And the version number is decreased in the config.php to enforce upgrade - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 14.0 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available - 14.0.0 to 14.0.1 - Given the current installed version is 14.0.0 - And there is an update to version 14.0.1 available - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 14.0.1 - And maintenance mode should be off - And upgrade is not required - - Scenario: Update is available - 14.0.1 to master daily - Given the current installed version is 14.0.1 - And PHP is at least in version 7.0 - And the current channel is "beta" - And there is an update to prerelease version of 15.0.0RC1 available - When the CLI updater is run successfully - And the output should contain "Update successful" - Then the installed version should be 15.0 - And maintenance mode should be off - And upgrade is not required - diff --git a/tests/features/stable19.feature b/tests/features/stable19.feature new file mode 100644 index 00000000..ab4099ba --- /dev/null +++ b/tests/features/stable19.feature @@ -0,0 +1,32 @@ +Feature: CLI updater - stable19 base + + Scenario: Update is available - 19.0.0 beta 3 to 19.0.0 beta 4 + Given the current installed version is 19.0.0beta3 + And there is an update to prerelease version "19.0.0beta4" available + And the version number is decreased in the config.php to enforce upgrade + When the CLI updater is run successfully + And the output should contain "Update successful" + Then the installed version should be 19.0 + And maintenance mode should be off + And upgrade is not required + + Scenario: Update is available - 19.0.0 to 19.0.1 + Given the current installed version is 19.0.0 + And there is an update to version 19.0.1 available + When the CLI updater is run successfully + And the output should contain "Update successful" + Then the installed version should be 19.0.1 + And maintenance mode should be off + And upgrade is not required + + Scenario: Update is available - 19.0.1 to 20.0.0 + Given the current installed version is 19.0.1 + And PHP is at least in version 7.2 + And the current channel is "beta" + And there is an update to version 20.0.0 available + When the CLI updater is run successfully + And the output should contain "Update successful" + Then the installed version should be 20.0.0 + And maintenance mode should be off + And upgrade is not required +