[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Switch TestingAccessWrapper to librarized version

2017-04-20 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349105 )

Change subject: Switch TestingAccessWrapper to librarized version
..


Switch TestingAccessWrapper to librarized version

Bug: T163434
Change-Id: I471a226de38d1dc7073dc4411466d43391d64497
Depends-On: I52cc257e593da3d6c3b01a909e554a950225aec8
---
M tests/phpunit/includes/TwoColConflictPageTest.php
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  WMDE-Fisch: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/includes/TwoColConflictPageTest.php 
b/tests/phpunit/includes/TwoColConflictPageTest.php
index 878c7b7..de27b0e 100644
--- a/tests/phpunit/includes/TwoColConflictPageTest.php
+++ b/tests/phpunit/includes/TwoColConflictPageTest.php
@@ -1,5 +1,7 @@
 

-- 
To view, visit https://gerrit.wikimedia.org/r/349105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I471a226de38d1dc7073dc4411466d43391d64497
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Switch TestingAccessWrapper to librarized version

2017-04-19 Thread Code Review
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/349105 )

Change subject: Switch TestingAccessWrapper to librarized version
..

Switch TestingAccessWrapper to librarized version

Change-Id: I471a226de38d1dc7073dc4411466d43391d64497
---
M composer.json
M tests/phpunit/includes/TwoColConflictPageTest.php
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/05/349105/1

diff --git a/composer.json b/composer.json
index 98d41d9..8149d52 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "wikimedia/testing-access-wrapper": "~1.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/tests/phpunit/includes/TwoColConflictPageTest.php 
b/tests/phpunit/includes/TwoColConflictPageTest.php
index 878c7b7..de27b0e 100644
--- a/tests/phpunit/includes/TwoColConflictPageTest.php
+++ b/tests/phpunit/includes/TwoColConflictPageTest.php
@@ -1,5 +1,7 @@
 

-- 
To view, visit https://gerrit.wikimedia.org/r/349105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I471a226de38d1dc7073dc4411466d43391d64497
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits