From 9634a20852221a0f3d2086c1c1eed758799239ae Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sun, 3 Dec 2017 15:58:22 +0100
Subject: [PATCH] [TASK] Raise testing-framework to 2.0.0
master branch of testing-framework is now tagged as 2.x.x for
core master / v9, while the 8 branch of testing-framework
is tagged as 1.2.x and used in v8 core.
The split is needed since master branch contains the svg tree
adaptions and 1.2 branch does not.
Change-Id: I27bb4e996e20cf00110cb0e6a160337656a2d7f0
Resolves: #83203
Related: #83204
Related: #82226
Related: #82426
Releases: master
Reviewed-on: https://review.typo3.org/54916
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 2 +-
composer.lock | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/composer.json b/composer.json
index b286d2be07ca..fe16ce0bf577 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
"symfony/polyfill-intl-icu": "^1.6"
},
"require-dev": {
- "typo3/testing-framework": "1.2.1",
+ "typo3/testing-framework": "2.0.0",
"codeception/codeception": "^2.3",
"enm1989/chromedriver": "~2.30",
"typo3/cms-styleguide": "~9.0.0",
diff --git a/composer.lock b/composer.lock
index 737a9b8d2a5a..8a8114e47f90 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "d2ae33bbbd5129800f6125887cfa734f",
+ "content-hash": "4989f04866b3424b2848d38b7e7ec149",
"packages": [
{
"name": "cogpowered/finediff",
@@ -4281,16 +4281,16 @@
},
{
"name": "typo3/testing-framework",
- "version": "1.2.1",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/testing-framework.git",
- "reference": "3d31fd19f2dc4b93525403ae3bbb4b560a424318"
+ "reference": "cc024cfd812e501430daba493c00d6cdcfb97c83"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/3d31fd19f2dc4b93525403ae3bbb4b560a424318",
- "reference": "3d31fd19f2dc4b93525403ae3bbb4b560a424318",
+ "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/cc024cfd812e501430daba493c00d6cdcfb97c83",
+ "reference": "cc024cfd812e501430daba493c00d6cdcfb97c83",
"shasum": ""
},
"require": {
@@ -4340,7 +4340,7 @@
"tests",
"typo3"
],
- "time": "2017-11-30T11:12:57+00:00"
+ "time": "2017-12-03T14:49:01+00:00"
},
{
"name": "webmozart/assert",
--
GitLab