Merge "rdbms: avoid LoadBalancer::getConnection waste when using $groups"

[lhc/web/wiklou.git] / tests / phpunit / includes / libs / JavaScriptMinifierTest.php

diff --git a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
index 16048bf..d57d0dd 100644 (file)
--- a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
+++ b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
@@ -182,8 +182,8 @@ class JavaScriptMinifierTest extends PHPUnit\Framework\TestCase {
 
                        // Boolean minification (!0 / !1)
                        [ "var a = { b: true };", "var a={b:!0};" ],
-                       [ "var a = { true: 12 };", "var a={true:12};", false ],
-                       [ "a.true = 12;", "a.true=12;", false ],
+                       [ "var a = { true: 12 };", "var a={true:12};" ],
+                       [ "a.true = 12;", "a.true=12;" ],
                        [ "a.foo = true;", "a.foo=!0;" ],
                        [ "a.foo = false;", "a.foo=!1;" ],
                ];
@@ -317,7 +317,8 @@ JAVASCRIPT
                        [
                                // Regression test for T201606.
                                // Must not break between 'return' and Expression.
-                               // FIXME: Cause?
+                               // Was caused by bad state after a ternary in the expression value
+                               // for a key in an object literal.
                                <<<JAVASCRIPT
 call( {
        key: 1 ? 0 : function () {
@@ -340,7 +341,7 @@ JAVASCRIPT
                                        '(',
                                        ')',
                                        '{',
-                                       'return', 'this', // FIXME
+                                       'return this',
                                        ';',
                                        '}',
                                        '}',