jenkins-bot [Wed, 18 Apr 2018 00:53:12 +0000 (00:53 +0000)]
Merge "Drop deprecated EnableAPI and EnableWriteAPI settings"
jenkins-bot [Wed, 18 Apr 2018 00:45:42 +0000 (00:45 +0000)]
Merge "Update OOUI to v0.26.4"
James D. Forrester [Mon, 20 Nov 2017 23:50:22 +0000 (15:50 -0800)]
Drop deprecated EnableAPI and EnableWriteAPI settings
The siteinfo API response's 'writeapi' value is now hard-set to true,
as are the ResourceLoader variables wgEnableAPI and wgEnableWriteAPI,
to be deprecated later.
Bug: T115414
Change-Id: I54ff9428b247ba203d67aba079149393f323d5a9
jenkins-bot [Wed, 18 Apr 2018 00:25:42 +0000 (00:25 +0000)]
Merge "CREDITS bump"
Chad Horohoe [Tue, 3 Apr 2018 20:21:44 +0000 (13:21 -0700)]
CREDITS bump
Bug: T191090
Change-Id: I8f751e09b1f1429d1c3d98782ff75bb09adc566c
James D. Forrester [Wed, 18 Apr 2018 00:05:33 +0000 (17:05 -0700)]
Update OOUI to v0.26.4
Release notes:
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.26.4
Depends-On: I41080edad6079b0ab792f65965f0c49753070d35
Change-Id: I41080edad6079b0ab792f65965f0c49753070d36
jenkins-bot [Tue, 17 Apr 2018 23:12:44 +0000 (23:12 +0000)]
Merge "Migrate PurgeJobUtils callback to AutoCommitUpdate"
Timo Tijhof [Tue, 17 Apr 2018 22:17:39 +0000 (23:17 +0100)]
WebStart: Remove deprecated $wgRequestTime
This variable is not read anywhere in Wikimedia Git.
Follows-up
06ba5ca383e2.
Bug: T189966
Change-Id: Ib86ebc44b12fee3a986838c5a302540b97066e5a
jenkins-bot [Tue, 17 Apr 2018 21:54:32 +0000 (21:54 +0000)]
Merge "WebStart: Remove redundant unset() for $IP"
jenkins-bot [Tue, 17 Apr 2018 21:48:29 +0000 (21:48 +0000)]
Merge "RELEASE-NOTES: Add note for StartProfiler deprecation"
Timo Tijhof [Tue, 17 Apr 2018 21:33:41 +0000 (22:33 +0100)]
WebStart: Remove redundant unset() for $IP
This seems redundant given it is unconditionally being set
two statements later. Probably a left-over from r36353 (
c6b902f180),
which did an unset() because there was another variable called
$preIP, and the original would no longer be needed.
However, we currently only use one variable ($IP) and there's no
need to unset() it before setting.
Bug: T189966
Change-Id: I17d516709beabeb80bd72b37f70ac9b666a501d4
jenkins-bot [Tue, 17 Apr 2018 21:36:45 +0000 (21:36 +0000)]
Merge "Special:Statistics: Be consistent in having ' (list of members)' after each row"
jenkins-bot [Tue, 17 Apr 2018 21:33:25 +0000 (21:33 +0000)]
Merge "resourceloader: Disable a flaky MessageBlobStoreTest case"
Timo Tijhof [Tue, 17 Apr 2018 21:29:36 +0000 (22:29 +0100)]
RELEASE-NOTES: Add note for StartProfiler deprecation
Follows-up
5209adff6c which just missed the 1.31 boat.
Change-Id: Ia7501e07ccd6498c24ff02f407be1c39414ab97e
jenkins-bot [Tue, 17 Apr 2018 21:28:04 +0000 (21:28 +0000)]
Merge "Prepare for REL1_31 cut, labelling master as 1.32-alpha"
James D. Forrester [Mon, 26 Feb 2018 22:06:01 +0000 (14:06 -0800)]
Special:Statistics: Be consistent in having ' (list of members)' after each row
Change-Id: I7736c5fb6032f1b7e8a60b49d422435a8c8e4962
Timo Tijhof [Tue, 17 Apr 2018 21:19:36 +0000 (22:19 +0100)]
resourceloader: Disable a flaky MessageBlobStoreTest case
Sometimes fails on the mediawiki-phpunit-php70-jessie job.
Bug: T176097
Change-Id: Id8c142954d597e1efaa326795f419d48b7af8bdf
James D. Forrester [Tue, 17 Apr 2018 18:24:01 +0000 (11:24 -0700)]
Prepare for REL1_31 cut, labelling master as 1.32-alpha
Change-Id: Id0aaad5a06cb90c4b2b81fa233a0a622aaf91a1e
jenkins-bot [Tue, 17 Apr 2018 20:22:23 +0000 (20:22 +0000)]
Merge "Setup: Deprecate StartProfiler, move default to DefaultSettings"
Translation updater bot [Tue, 17 Apr 2018 20:01:19 +0000 (22:01 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Ief0643ed5d9b0480f61cd380103e425e986eaa23
jenkins-bot [Tue, 17 Apr 2018 19:30:47 +0000 (19:30 +0000)]
Merge "Do not start explicit transaction rounds for RecentChangesUpdateJob"
jenkins-bot [Tue, 17 Apr 2018 18:35:10 +0000 (18:35 +0000)]
Merge "rdbms: remove "m" prefix from LoadBalancer comments"
jenkins-bot [Tue, 17 Apr 2018 18:34:19 +0000 (18:34 +0000)]
Merge "mediawiki.loader: Clean up unit tests"
jenkins-bot [Tue, 17 Apr 2018 15:55:08 +0000 (15:55 +0000)]
Merge "mw.widgets.UsersMultiselectWidget: Compat with mw.special.preferences.confirmClose"
jenkins-bot [Tue, 17 Apr 2018 15:50:38 +0000 (15:50 +0000)]
Merge "mw.special.preferences.confirmClose: Handle textareas"
jenkins-bot [Tue, 17 Apr 2018 15:44:56 +0000 (15:44 +0000)]
Merge "RCFilters: Prevent trigger element movement"
jenkins-bot [Tue, 17 Apr 2018 15:18:39 +0000 (15:18 +0000)]
Merge "Handle extension dependencies in the installer"
jenkins-bot [Tue, 17 Apr 2018 14:55:19 +0000 (14:55 +0000)]
Merge "resourceloader: Remove getHashMtime() and getDefinitionMtime() methods"
Bartosz Dziewoński [Tue, 17 Apr 2018 13:05:05 +0000 (15:05 +0200)]
mw.widgets.UsersMultiselectWidget: Compat with mw.special.preferences.confirmClose
Replace `<input type="hidden">` with a `<textarea>` hidden using
`display: none`, because the former does not have separate 'value'
and 'defaultValue' properties, and the Special:Preferences script to
enable/disable the "Save" button depends on them to work correctly.
We use a similar approach in OOUI (RadioSelectInputWidget).
Also correct a code comment (we need to trigger a 'change' event for
any kind of input, not just `<input type="hidden">`).
Bug: T192147
Change-Id: I2351bc752f9cf25a607f4b197c132062d52ecb1e
Bartosz Dziewoński [Tue, 17 Apr 2018 13:11:59 +0000 (15:11 +0200)]
mw.special.preferences.confirmClose: Handle textareas
Bug: T192147
Change-Id: Ie02c5d8cab7db091054f7d66633c6ec34354ee19
Aaron Schulz [Mon, 16 Apr 2018 20:38:01 +0000 (13:38 -0700)]
Do not start explicit transaction rounds for RecentChangesUpdateJob
The replaces the hacky use of onTransactionIdle(), which no longer runs
immediately in explicit transaction rounds since
d4c31cf841.
Also clarified TransactionRoundDefiningUpdate comment about rounds.
Change-Id: Ie17eacdcaea4e47019cc94e1c7beed9d7fec5cf2
Aaron Schulz [Tue, 17 Apr 2018 04:20:58 +0000 (21:20 -0700)]
rdbms: remove "m" prefix from LoadBalancer comments
Change-Id: Ie239157eb6ee8b7991c45ef5c5c06a1caaba52c9
Volker E [Tue, 17 Apr 2018 04:20:39 +0000 (21:20 -0700)]
RCFilters: Prevent trigger element movement
Change-Id: Ic04229ade53a42a47ccbd909640b848cf9979eb1
Fomafix [Fri, 16 Feb 2018 10:36:59 +0000 (11:36 +0100)]
Use module.exports for mediawiki.libs.jpegmeta
Deprecate mw.libs.jpegmeta. Use
mw.loader.require( 'mediawiki.libs.jpegmeta' )
instead.
Change-Id: I8a7fb7377248a2ce1cf9c6d3c888ca9835cadaad
Timo Tijhof [Tue, 17 Apr 2018 00:42:00 +0000 (01:42 +0100)]
resourceloader: Remove getHashMtime() and getDefinitionMtime() methods
Deprecated since 1.26, no callers or implementors in Wikimedia Git.
Change-Id: Ie44b4be47db7a4799fe39d66294c41238c62f51f
Timo Tijhof [Tue, 17 Apr 2018 00:40:48 +0000 (01:40 +0100)]
resourceloader: Add @covers for covered deprecated methods
These are deprecated for extensions to implement, but still
supported and already triggered by the test cases. Previously
not mentioned because they were ignored by PHPUnit, but not anymore.
Change-Id: I594788e322bfd83be1e7847d3272d57c549f3e8b
Aaron Schulz [Tue, 17 Apr 2018 00:11:42 +0000 (17:11 -0700)]
Migrate PurgeJobUtils callback to AutoCommitUpdate
Since it calls LBFactory::commitAndWaitForReplication, blocking for
an unknown amount of time, it is a bit "heavyweight" to be the sort
of quick update that uses onTransactionIdle().
Change-Id: Ic3476de5b61a7cd5f31ba487b186f9605a3b2774
jenkins-bot [Mon, 16 Apr 2018 22:58:47 +0000 (22:58 +0000)]
Merge "resourceloader: Clean up CSSMinTest"
Timo Tijhof [Mon, 16 Apr 2018 22:05:46 +0000 (23:05 +0100)]
resourceloader: Clean up CSSMinTest
* Consistently name data providers as "provide.." and make them
static.
* Document why wgServer is being mocked.
* Use TestingAccessWrapper instead of ad-hoc sub class for
accessing protected methods.
Change-Id: Ife2d98091200bbc8fb16b7ac6eafd3f2c22c1463
Aaron Schulz [Thu, 5 Apr 2018 02:44:21 +0000 (19:44 -0700)]
rdbms: add $flags argument to ILoadBalancer::getAnyOpenConnection
Make LoadMonitor use this flag for getting a connection.
Change-Id: I32ea9aadc0223c86db5979d6579d781a6af0ff53
Translation updater bot [Mon, 16 Apr 2018 19:55:08 +0000 (21:55 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Id2377abe03165cfbdf22d0417471efa18af02cde
Max Semenik [Sat, 6 Jan 2018 12:41:37 +0000 (15:41 +0300)]
Restrict shell commands by default
Before it's too late, let's boil the oceans
and just do it. This patch assumes that old code
calling wfShellExec() doesn't know about restrictions
so it doesn't restrict anything. New code, however,
needs to specify its restrictions or deal with defaults.
Change-Id: I58963901087202d4a405bcdb6bd12758bb6b0ff7
jenkins-bot [Mon, 16 Apr 2018 16:57:14 +0000 (16:57 +0000)]
Merge "Deprecate wfShellWikiCmd()"
jenkins-bot [Mon, 16 Apr 2018 16:55:43 +0000 (16:55 +0000)]
Merge "Title: Simplify use of MWNamespace::getCanonicalName()"
Max Semenik [Fri, 19 Jan 2018 01:44:03 +0000 (17:44 -0800)]
Deprecate wfShellWikiCmd()
Bug: T184339
Change-Id: Ic86a451e0e9d609e06865a4969560d151efa844c
Kunal Mehta [Mon, 16 Apr 2018 07:06:56 +0000 (00:06 -0700)]
Update wikimedia/utfnormal to 2.0.0
Bug: T188480
Depends-On: I6dc14850ba4dfb0ba237b68337b6a86768739b5b
Change-Id: I5f1fc27d5bb588c15cabb7f1c909c104f6325e96
jenkins-bot [Mon, 16 Apr 2018 03:06:05 +0000 (03:06 +0000)]
Merge "Remove gadget special-case from preferences cleanup"
jenkins-bot [Mon, 16 Apr 2018 01:01:21 +0000 (01:01 +0000)]
Merge "rdbms: make LoadBalancer::doWait() cast $timeout to an integer"
Translation updater bot [Sun, 15 Apr 2018 20:08:59 +0000 (22:08 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I8ef3d6d1aaef6a49e92ace4fa3581c17fec2f894
jenkins-bot [Sun, 15 Apr 2018 18:48:10 +0000 (18:48 +0000)]
Merge "tests: Support passing null to setExpectedException() in compat layer"
jenkins-bot [Sun, 15 Apr 2018 18:41:32 +0000 (18:41 +0000)]
Merge "Add release notes for
036f5b47efc99"
jenkins-bot [Sun, 15 Apr 2018 18:38:47 +0000 (18:38 +0000)]
Merge "Add release notes for
8de958444f1d36"
jenkins-bot [Sun, 15 Apr 2018 08:44:34 +0000 (08:44 +0000)]
Merge "phan: Provide stub for wikidiff2_inline_diff()"
Kunal Mehta [Sat, 14 Apr 2018 23:10:24 +0000 (16:10 -0700)]
tests: Support passing null to setExpectedException() in compat layer
PHPUnit 4's setExpectedException() accepted null for the exception class
name to indicate that no exception would be thrown. PHPUnit 6's
expectException() is stricter and only allows strings.
Change-Id: I8c8783faec808a8f111af2ee533f5c61feccf099
Kunal Mehta [Sat, 14 Apr 2018 23:00:28 +0000 (16:00 -0700)]
Add release notes for
036f5b47efc99
Change-Id: Ia25937b3308ed1caeae9e4a5510648c7f6e19586
Kunal Mehta [Sat, 14 Apr 2018 22:40:30 +0000 (15:40 -0700)]
Add release notes for
8de958444f1d36
Change-Id: I5adc2758ca5e61a291139fc4b4a08d686601f285
Translation updater bot [Sat, 14 Apr 2018 19:55:19 +0000 (21:55 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I1d1d9da19da9f5a9b282d957232c3adea9219e4d
Kunal Mehta [Sat, 14 Apr 2018 10:54:12 +0000 (03:54 -0700)]
phan: Provide stub for wikidiff2_inline_diff()
Needed by MobileFrontend
Change-Id: I5c6dfae873b5292f26652631943d42de08df49b3
Aaron Schulz [Thu, 29 Mar 2018 02:42:31 +0000 (19:42 -0700)]
rdbms: make LoadBalancer::doWait() cast $timeout to an integer
Make sure that fractional values are not sent to masterPosWait()
Change-Id: I0a66471d4bf7005774b5741702c7f9c65bbfd5d0
jenkins-bot [Sat, 14 Apr 2018 02:39:33 +0000 (02:39 +0000)]
Merge "Use constants for rc_patrolled values instead of numbers"
jenkins-bot [Sat, 14 Apr 2018 02:27:05 +0000 (02:27 +0000)]
Merge "Add an "editor" extension type"
Krinkle [Sat, 14 Apr 2018 00:11:56 +0000 (00:11 +0000)]
Merge "selenium: Remove Jenkins configuration file"
Krinkle [Sat, 14 Apr 2018 00:11:51 +0000 (00:11 +0000)]
Merge "Selenium: move logic for running tests from package.json to selenium.sh"
jenkins-bot [Fri, 13 Apr 2018 23:20:08 +0000 (23:20 +0000)]
Merge "Remove unused $titleObj"
jenkins-bot [Fri, 13 Apr 2018 22:45:57 +0000 (22:45 +0000)]
Merge "LoadBalancerTest: Clean up transaction handling for sqlite"
jenkins-bot [Fri, 13 Apr 2018 22:42:03 +0000 (22:42 +0000)]
Merge "Fix testGetMap_twoValues() failures for sqlite"
Kunal Mehta [Fri, 13 Apr 2018 22:35:07 +0000 (15:35 -0700)]
Add an "editor" extension type
For extensions that provide an editor or enhance the editing experience.
Extensions like CodeEditor, WikiEditor, or VisualEditor could use this type.
Change-Id: Id5714caa492f10b97ea272c2ec181cded60fc47f
Kunal Mehta [Sun, 8 Apr 2018 23:26:01 +0000 (16:26 -0700)]
Handle extension dependencies in the installer
As there will likely be extensions bundled with the 1.31 release that
depend upon other extensions, we should have the installer prevent users
from enabling extensions that depend on other, not-enabled extensions.
We can build a dependency map from extension.json's "requires"
component. On the client-side, we'll first disable all checkboxes that
require other extensions, and evaluate each checkbox click, updating the
disabled checkboxes as possible.
This required some refactoring of how ExtensionRegistry reports issues
with dependency resolution so we could get a list of what was missing.
While we're at it, sort the extensions under headings by type.
This does not support skins that have dependencies yet (T186092).
Bug: T31134
Bug: T55985
Change-Id: I5f0e3b1b540b5ef6f9b8e3fc2bbaad1c65b4b680
Amir Sarabadani [Fri, 13 Apr 2018 21:36:34 +0000 (23:36 +0200)]
Use constants for rc_patrolled values instead of numbers
These are recently introduced, better to use them
Change-Id: Id904ff09081cb5a1fe2f1c24c5d415da18fd2294
jenkins-bot [Fri, 13 Apr 2018 21:27:38 +0000 (21:27 +0000)]
Merge "Remove the feature switch for disabling autopatrol logging"
jenkins-bot [Fri, 13 Apr 2018 21:17:20 +0000 (21:17 +0000)]
Merge "Remove old hacks in StringUtils::isUtf8()"
Aaron Schulz [Fri, 13 Apr 2018 21:16:39 +0000 (14:16 -0700)]
Fix testGetMap_twoValues() failures for sqlite
Change-Id: I3f42208d8e42ba923d4b08bb7efe15f871165899
Željko Filipin [Sat, 7 Apr 2018 13:56:56 +0000 (15:56 +0200)]
selenium: Remove Jenkins configuration file
Both Mocha and Cucumber tests should run. Since WebdriverIO supports only
running one test framework, the only way to do it is to have a generic
configuration file and two framework-specific files (Mocha, Cucumber). Having
Jenkins configuration file complicates things, and there is no need for
it.
Bug: T179190
Change-Id: I710066f7b5479dcad27aa57cd61007c1c2d88931
Amir Sarabadani [Thu, 12 Apr 2018 19:03:44 +0000 (21:03 +0200)]
Remove the feature switch for disabling autopatrol logging
Per the RFC, it will now become the default and only behaviour
to not log autpatrol actions. The information is already
recorded via the rc_patrolled field.
Bug: T184485
Change-Id: I98ae895a2b4cde4bb945f1df23be4a070b0bf9c4
jenkins-bot [Fri, 13 Apr 2018 20:10:36 +0000 (20:10 +0000)]
Merge "OOUI: Apex: Point pending.gif texture to a directory that exists"
Max Semenik [Fri, 13 Apr 2018 20:02:50 +0000 (13:02 -0700)]
Remove old hacks in StringUtils::isUtf8()
We don't support any of the affected PHP or HHVM versions.
Change-Id: I22a9252e621b519147168fab3197662c30131e71
Kunal Mehta [Fri, 13 Apr 2018 19:54:46 +0000 (12:54 -0700)]
OOUI: Apex: Point pending.gif texture to a directory that exists
This is a manual cherry-pick of I6ad0ce9d62245255e.
Bug: T192173
Change-Id: I74374c49407dcb789ef8a9219158a9a773c09d81
Translation updater bot [Fri, 13 Apr 2018 19:53:54 +0000 (21:53 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I0576df03594cb55e93ba4414c9deb0749063e904
jenkins-bot [Fri, 13 Apr 2018 17:59:57 +0000 (17:59 +0000)]
Merge "Allow PHPUnit 6 optionally in require-dev"
Brad Jorsch [Fri, 13 Apr 2018 17:32:48 +0000 (13:32 -0400)]
LoadBalancerTest: Clean up transaction handling for sqlite
We need to make sure a DBO_TRX transaction was started before doing the
CREATE TABLE, because CREATE TABLE itself won't start one and sqlite
breaks if schema changes are done on one handle while another is open.
Also, incidentally, have the handles in these LoadBalancerTests log to
the standard channel. And clean up the auto-rollback of DBO_TRX
transactions to use ->rollback() instead of ->doRollback() plus
incorrect manual setting of trxStatus.
Bug: T191863
Change-Id: Ib422ef89e7eba21281e6ea98def9f98ae762b9fe
jenkins-bot [Fri, 13 Apr 2018 16:36:02 +0000 (16:36 +0000)]
Merge "Reset table sequences and skip some test assertions for sqlite"
jenkins-bot [Fri, 13 Apr 2018 16:30:37 +0000 (16:30 +0000)]
Merge "rdbms: make $i in LoadBalancer::getConnection override $groups"
Željko Filipin [Sat, 7 Apr 2018 14:35:26 +0000 (16:35 +0200)]
Selenium: move logic for running tests from package.json to selenium.sh
Just running `npm run selenium` in CI does not work. If WebdriverIO fails, the
job still passes since the last command to run is `killall chromedriver`.
Reusing the script from CI that starts and stops Chromedriver should fix the
problem.
Bug: T179190
Change-Id: If29227263d23a3e4f26e2329dfa13c49f976cf8e
jenkins-bot [Fri, 13 Apr 2018 13:10:43 +0000 (13:10 +0000)]
Merge "Display PHP version in old version error messages"
jenkins-bot [Fri, 13 Apr 2018 12:30:30 +0000 (12:30 +0000)]
Merge "CSSMin::serializeStringValue: Update implementation to new specification"
Reedy [Fri, 13 Apr 2018 11:32:55 +0000 (11:32 +0000)]
Display PHP version in old version error messages
Change-Id: I3a6135871de0fdc94fa3fe622c6534746035a209
Marius Hoch [Fri, 13 Apr 2018 10:45:32 +0000 (12:45 +0200)]
Make ImageGallery more flexible for use in Wikibase
Also add missing declaration/ documentation of
ImageGalleryBase::mCaptionLength.
Bug: T46727
Change-Id: I314061b224ff2921eb5532be53e0c9cdc4f52c01
Aaron Schulz [Fri, 13 Apr 2018 08:39:22 +0000 (01:39 -0700)]
Reset table sequences and skip some test assertions for sqlite
Various revision storage tests assume the sequences are reset
and fail otherwise.
Also disable some failing tests that are not applicable to sqlite
as well as postgres.
Change-Id: Ibdb034121a44e16bb35059a92baafb1867951ea8
Reedy [Fri, 13 Apr 2018 08:56:43 +0000 (08:56 +0000)]
Remove unused $titleObj
Change-Id: I77d302deb35d8269d15ae4b1e614090000e84683
Fomafix [Wed, 11 Apr 2018 04:23:50 +0000 (06:23 +0200)]
CSSMin::serializeStringValue: Update implementation to new specification
The current version of https://www.w3.org/TR/cssom/ is
https://www.w3.org/TR/2016/WD-cssom-1-
20160317/
The new specification for CSS string serialization
https://www.w3.org/TR/2016/WD-cssom-1-
20160317/#serialize-a-string
has some changes compared to the old specification
https://www.w3.org/TR/2013/WD-cssom-
20131205/#serialize-a-string
* U+0000 get replaced by the REPLACEMENT CHARACTER (U+FFFD) instead of
throwing an exception.
* U+0080 to U+009F are not escaped.
The old implementation has a bug because it selects the byte range
[\x7f-\x9f] and not unicode codepoint range [\u007f-\u009f]. This
breaks the encoding because CSS is in UTF-8 not in ISO 8859-x.
Also add tests to cover CSSMin::serializeStringValue.
Bug: T192048
Change-Id: I894824c216b95dbba461308488fba33121ffea54
Reedy [Sun, 3 Dec 2017 14:49:31 +0000 (14:49 +0000)]
Allow PHPUnit 6 optionally in require-dev
MediaWiki uses a back-compat layer to preserve most of the PHPUnit 4
runtime, so existing tests will continue to run fine with minimal
modification. Once PHP < 7.0 support is dropped, we can drop PHPUnit 4
support, and adapt tests to use PHPUnit 6 features directly.
Bug: T177132
Depends-On: I884b240307e3fcad253aa64eeae9944ed4eb7d50
Change-Id: I497712c7693d137be197a69873baa58383ce9646
jenkins-bot [Fri, 13 Apr 2018 03:36:32 +0000 (03:36 +0000)]
Merge "Add HamcrestPHPUnitIntegration trait"
jenkins-bot [Fri, 13 Apr 2018 03:36:24 +0000 (03:36 +0000)]
Merge "Default installations to using RemexHtml for tidying"
Kunal Mehta [Fri, 13 Apr 2018 02:52:05 +0000 (19:52 -0700)]
Add HamcrestPHPUnitIntegration trait
Hamcrest has its own assertThat() function, which is used in PHPUnit
tests. However, in PHPUnit 6, tests that don't have any assertions are
marked as risky.
To work around that, add a HamcrestPHPUnitIntegration trait that
provides a $this->assertThatHamcrest() - it wraps around Hamcrest's
assertThat(), and increments PHPUnit's assertion counter, so using it
ensures that the test is not risky.
Change-Id: Ia4a4ec226f64ebe90d1091ffd27420a356ca76ff
jenkins-bot [Fri, 13 Apr 2018 01:43:36 +0000 (01:43 +0000)]
Merge "Selenium: pass -no-sandbox to Chrome under Docker"
Timo Tijhof [Fri, 13 Apr 2018 00:49:43 +0000 (01:49 +0100)]
mediawiki.loader: Clean up unit tests
* Avoid parenthesis in module name to make it easier to remember
and type. Use "mediawiki.loader", which matches the naming for
other mediawiki.js tests (e.g, 'mediawiki.html').
* Simplify teardown: Remove redundant check before deletion.
The delete operator already performs this check and varies it
returns value based on it (which we aren't using here).
* Remove 'Basic', which did the same as 'using() Promise'.
* Add test for 'using(, callback)' parameter.
* Simplify "did the script run" assertions by checking once
afterwards, instead of checking both during the test and afterwards.
The one during the test isn't a strict assertion, given it could
be skipped. To preserve the detection of whether it ran twice,
use a counter.
* Remove various redundant 'fail' assertions from Promise fail
handlers in tests that were already returning said Promise,
given QUnit already checks if the Promise is rejected.
* Simplify a few assert captions.
* Make assertion for 'messages load first' its own test,
instead of happening in an unrelated test about @import CSS.
Change-Id: Icbb4ea7f16bb1f702fd92eb8007b7179d4763151
James D. Forrester [Thu, 12 Apr 2018 20:58:31 +0000 (13:58 -0700)]
MediaWikiServicesTest::testDisableStorageBackend: Make PHPUnit6 happy
Ugly, but it works.
Bug: T191678
Change-Id: I0436034370dd66191990aa195ee3bdf5cd638e76
Kunal Mehta [Thu, 12 Apr 2018 20:18:39 +0000 (13:18 -0700)]
Make WatchedItemStoreUnitTest compatible with PHPUnit 6
A few tests were mocking the wrong object due to a typo, so have those
mock the correct object, and update the tests to reflect reality.
Change-Id: Ifd1e4ae8a98124b9055ec4023382305f743f9b43
jenkins-bot [Thu, 12 Apr 2018 20:56:54 +0000 (20:56 +0000)]
Merge "Replace rc_patrolled values with contants, part I"
Aaron Schulz [Thu, 12 Apr 2018 20:15:34 +0000 (13:15 -0700)]
rdbms: make $i in LoadBalancer::getConnection override $groups
Previously, passing a specific server index (even the master index)
would result in a connection to some server in $groups or the generic
read group being selected.
Change-Id: Ifb497f5f4bb61f16b310d4d30fb8315e3bcdce8e