From 8ad976d9ed7c5fa0acf47422cf0a09f4496955ad Mon Sep 17 00:00:00 2001
From: Susanne Moog <look@susi.dev>
Date: Sat, 30 Nov 2019 20:09:52 +0100
Subject: [PATCH] [TASK] Update testing framework to 6.0
The testing framework has been reworked and slimmed down.
To make use of it, tests had to be adjusted.
composer require --dev typo3/testing-framework:"~6.0.0"
Resolves: #89815
Releases: master
Change-Id: Ib0a8d7436070ef17be96a5f4011f796dd15b09fd
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/62502
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
---
composer.json | 2 +-
composer.lock | 22 +++++++++----------
typo3/sysext/core/composer.json | 2 +-
.../Core/Rendering/RenderingContextTest.php | 6 ++---
.../Widget/AbstractWidgetViewHelperTest.php | 2 +-
.../ViewHelpers/Link/PageViewHelperTest.php | 2 +-
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/composer.json b/composer.json
index a1f04b5917c0..122c5f2257f5 100644
--- a/composer.json
+++ b/composer.json
@@ -79,7 +79,7 @@
"phpspec/prophecy": "^1.7.5",
"rector/rector": "^0.5.0",
"typo3/cms-styleguide": "~10.0.2",
- "typo3/testing-framework": "~5.0.16"
+ "typo3/testing-framework": "~6.0.0"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
diff --git a/composer.lock b/composer.lock
index 85988cbb31ba..2817fa1abdbd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "264be898d834ad68f4bdc3345451701c",
+ "content-hash": "ad3295bdf8c8700d9be0f2e05563697e",
"packages": [
{
"name": "cogpowered/finediff",
@@ -6161,8 +6161,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "Utility class for timing",
@@ -7012,8 +7012,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "role": "lead",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
"description": "Collection of value objects that represent the types of the PHP type system",
@@ -7934,21 +7934,21 @@
},
{
"name": "typo3/testing-framework",
- "version": "5.0.16",
+ "version": "6.0.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/testing-framework.git",
- "reference": "b13774ce13da2fc23b601bd00963db4c64636b3a"
+ "reference": "c74a87a2037fca3eaaebeaa886a874cc97fce997"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/b13774ce13da2fc23b601bd00963db4c64636b3a",
- "reference": "b13774ce13da2fc23b601bd00963db4c64636b3a",
+ "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/c74a87a2037fca3eaaebeaa886a874cc97fce997",
+ "reference": "c74a87a2037fca3eaaebeaa886a874cc97fce997",
"shasum": ""
},
"require": {
"mikey179/vfsstream": "~1.6.8",
- "phpunit/phpunit": "^8.2.3",
+ "phpunit/phpunit": "^8.3",
"typo3/cms-backend": "10.*.*@dev",
"typo3/cms-core": "10.*.*@dev",
"typo3/cms-extbase": "10.*.*@dev",
@@ -7990,7 +7990,7 @@
"tests",
"typo3"
],
- "time": "2019-11-21T15:21:42+00:00"
+ "time": "2019-12-02T16:43:08+00:00"
}
],
"aliases": [],
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 9824e1e59797..d554cec6df18 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -57,7 +57,7 @@
"friendsofphp/php-cs-fixer": "^2.16.1",
"phpspec/prophecy": "^1.7.5",
"typo3/cms-styleguide": "~10.0.2",
- "typo3/testing-framework": "~5.0.16"
+ "typo3/testing-framework": "~6.0.0"
},
"suggest": {
"ext-fileinfo": "Used for proper file type detection in the file abstraction layer",
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
index 3b457ecc444a..6db1b86f3177 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
@@ -37,7 +37,7 @@ class RenderingContextTest extends UnitTestCase
{
parent::setUp();
$this->renderingContext = $this->getMockBuilder(RenderingContext::class)
- ->addMethods(['dummy'])
+ ->setMethods(['dummy'])
->disableOriginalConstructor()
->getMock();
}
@@ -48,7 +48,7 @@ class RenderingContextTest extends UnitTestCase
public function setControllerContextWithSubpackageKeySetsExpectedControllerContext()
{
$renderingContext = $this->getMockBuilder(RenderingContext::class)
- ->onlyMethods(['setControllerAction', 'setControllerName'])
+ ->setMethods(['setControllerAction', 'setControllerName'])
->disableOriginalConstructor()
->getMock();
$request = $this->getMockBuilder(Request::class)
@@ -106,7 +106,7 @@ class RenderingContextTest extends UnitTestCase
public function setControllerActionProcessesInputCorrectly($input, $expected)
{
$subject = $this->getMockBuilder(RenderingContext::class)
- ->addMethods(['dummy'])
+ ->setMethods(['dummy'])
->disableOriginalConstructor()
->getMock();
$request = $this->getMockBuilder(Request::class)->setMethods(['setControllerActionName'])->getMock();
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
index 4e69f282f480..4be10972801a 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
@@ -95,7 +95,7 @@ class AbstractWidgetViewHelperTest extends UnitTestCase
$this->controllerContext = $this->createMock(ControllerContext::class);
$this->controllerContext->expects(self::any())->method('getRequest')->willReturn($this->request);
$this->renderingContext = $this->getMockBuilder(RenderingContext::class)
- ->onlyMethods(['getControllerContext'])
+ ->setMethods(['getControllerContext'])
->disableOriginalConstructor()
->getMock();
$this->renderingContext->expects(self::any())->method('getControllerContext')->willReturn($this->controllerContext);
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
index d790903c1d25..ba539900ebae 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
@@ -62,7 +62,7 @@ class PageViewHelperTest extends ViewHelperBaseTestcase
$this->controllerContext->expects(self::any())->method('getRequest')->willReturn($this->request->reveal());
$this->arguments = [];
$this->renderingContext = $this->getMockBuilder(RenderingContext::class)
- ->onlyMethods(['getControllerContext'])
+ ->setMethods(['getControllerContext'])
->disableOriginalConstructor()
->getMock();
$this->renderingContext->expects(self::any())->method('getControllerContext')->willReturn($this->controllerContext);
--
GitLab