dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Stash WatchedItem changes so that the jobs run from the queue"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
watcheditem
/
WatchedItemQueryServiceUnitTest.php
diff --git
a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
index
17694b0
..
16f2367
100644
(file)
--- a/
tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
+++ b/
tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
@@
-280,7
+280,7
@@
class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
],
[
'watchlist' => [
],
[
'watchlist' => [
- '
INNER
JOIN',
+ 'JOIN',
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
@@
-403,7
+403,7
@@
class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
],
[
'watchlist' => [
],
[
'watchlist' => [
- '
INNER
JOIN',
+ 'JOIN',
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
@@
-905,7
+905,7
@@
class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
$expectedJoinConds = array_merge(
[
'watchlist' => [
$expectedJoinConds = array_merge(
[
'watchlist' => [
- '
INNER
JOIN',
+ 'JOIN',
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
@@
-1138,7
+1138,7
@@
class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
$this->isType( 'string' ),
$this->isType( 'array' ),
array_merge( [
$this->isType( 'string' ),
$this->isType( 'array' ),
array_merge( [
- 'watchlist' => [ '
INNER
JOIN', [ 'wl_namespace=rc_namespace', 'wl_title=rc_title' ] ],
+ 'watchlist' => [ 'JOIN', [ 'wl_namespace=rc_namespace', 'wl_title=rc_title' ] ],
'page' => [ 'LEFT JOIN', 'rc_cur_id=page_id' ],
], $expectedExtraJoins )
)
'page' => [ 'LEFT JOIN', 'rc_cur_id=page_id' ],
], $expectedExtraJoins )
)
@@
-1176,7
+1176,7
@@
class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
[],
[
'watchlist' => [
[],
[
'watchlist' => [
- '
INNER
JOIN',
+ 'JOIN',
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
@@
-1299,7
+1299,7
@@
class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
[],
[
'watchlist' => [
[],
[
'watchlist' => [
- '
INNER
JOIN',
+ 'JOIN',
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
@@
-1345,7
+1345,7
@@
class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
[],
[
'watchlist' => [
[],
[
'watchlist' => [
- '
INNER
JOIN',
+ 'JOIN',
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'
[
'wl_namespace=rc_namespace',
'wl_title=rc_title'