Merge pull request #5031 from timja/fix-js-tests

Fix JS tests failing on master

Jenkinsfile

@@ -58,7 +58,7 @@ for(j = 0; j < jdks.size(); j++) {
                 // Once we've built, archive the artifacts and the test results.
                 stage("${buildType} Publishing") {
                     if (runTests) {
-                        junit healthScaleFactor: 20.0, testResults: '*/target/surefire-reports/*.xml'
+                        junit healthScaleFactor: 20.0, testResults: '*/target/surefire-reports/*.xml,war/junit.xml'
                         archiveArtifacts allowEmptyArchive: true, artifacts: '**/target/surefire-reports/*.dumpstream'
                     }
                     if (buildType == 'Linux' && jdk == jdks[0]) {

core/src/test/java/hudson/FunctionsTest.java

@@ -510,6 +510,7 @@ public void printStackTrace(PrintWriter s) {
                 s.println("Some custom exception");
             }
         }, "Some custom exception\n", "Some custom exception\n");
+        /* TODO exact format changed in 11.0.9 (JDK-8226809 / JDK-8252444)
         // Circular references:
         Stack stack1 = new Stack("p.Exc1", "p.C.method1:17");
         Stack stack2 = new Stack("p.Exc2", "p.C.method2:27");
@@ -526,6 +527,7 @@ public void printStackTrace(PrintWriter s) {
             "\tat p.C.method2(C.java:27)\n" +
             "Caused: p.Exc1\n" +
             "\tat p.C.method1(C.java:17)\n");
+        */
     }
     private static void assertPrintThrowable(Throwable t, String traditional, String custom) {
         StringWriter sw = new StringWriter();

war/.gitignore

@@ -1,5 +1,6 @@
 work
 /rebel.xml
+junit.xml
 
 # Node
 node/

war/jest.config.json

@@ -3,6 +3,6 @@
       "\\.hbs$": "jest-handlebars",
       "\\.js$": "babel-jest"
   },
-  "reporters": ["jest-standard-reporter"],
+  "reporters": ["jest-standard-reporter", "jest-junit"],
   "roots": ["<rootDir>/src"]
 }

war/package.json

@@ -14,7 +14,7 @@
     "prod": "webpack --config webpack.config.js --mode=production",
     "build": "yarn prod",
     "start": "yarn dev --watch",
-    "test": "jest --config=jest.config.json",
+    "test": "jest --ci --config=jest.config.json --reporters=jest-standard-reporter --reporters=jest-junit",
     "lint:js": "eslint . --ext js",
     "lint:css": "stylelint src/main/less --syntax less",
     "lint": "yarn lint:js && yarn lint:css"
@@ -34,6 +34,7 @@
     "handlebars-loader": "^1.7.1",
     "jest": "^26.0.1",
     "jest-handlebars": "^1.0.1",
+    "jest-junit": "^12.0.0",
     "jest-standard-reporter": "^1.0.4",
     "less": "^3.10.3",
     "less-loader": "^5.0.0",

war/src/test/js/widgets/config/freestyle-config-tabbed.html

@@ -1,45 +1,45 @@
 <form name="config" action="configSubmit" method="post" class="jenkins-config">
-    <table width="100%" class="config-table tabbed">
-        <tbody>
-        <tr>
-            <td class="setting-name">Project name</td>
-            <td class="setting-main">
+    <div width="100%" class="config-table tabbed">
+        <div>
+        <div class="tr">
+            <div class="setting-name">Project name</div>
+            <div class="setting-main">
 
 
-                <input name="name" value="Free-2" class="setting-input   " type="text"></td>
-        </tr>
-        <tr nameref="rowSetStart24">
-            <td><input type="hidden" name="stapler-class-bag" value="true"></td>
-        </tr>
+                <input name="name" value="Free-2" class="setting-input   " type="text"></div>
+        </div>
+        <div class="tr" nameref="rowSetStart24">
+            <div><input type="hidden" name="stapler-class-bag" value="true"></div>
+        </div>
 
         <!-- Purposely indenting so as to highlight the implicit data "model" around row groupings -->
-        <tr style="display:none" class="row-set-start row-group-start" nameref="rowSetStart24"></tr>
-            <tr class="optional-block-start row-group-start " hashelp="true" ref="cb9" nameref="rowSetStart22">
-                <td colspan="3">
+        <div style="display:none" class="row-set-start row-group-start tr" nameref="rowSetStart24"></div>
+            <div class="optional-block-start row-group-start tr" hashelp="true" ref="cb9" nameref="rowSetStart22">
+                <div colspan="3">
                     <input name="specified" class="optional-block-control block-control  " type="checkbox">
                     <label class="attach-previous">Discard Old Builds</label>
-                </td>
-            </tr>
-                <tr class="help-area" nameref="rowSetStart22">
-                    <td></td>
-                    <td colspan="2">
+                </div>
+            </div>
+                <div class="help-area tr" nameref="rowSetStart22">
+                    <div></div>
+                    <div colspan="2">
                         <div class="help">Loading...</div>
-                    </td>
-                    <td></td>
-                </tr>
-                <tr class="rowvg-start" nameref="rowSetStart22" style="display: none;"></tr>
-                <tr nameref="rowSetStart22" style="display: none;"><td class="setting-name">Strategy</td><td class="setting-main"></td></tr>
-                <tr class="dropdownList-container" nameref="rowSetStart22" style="display: none;"><td colspan="2"></td></tr>
-        <tr class=" rowvg-end optional-block-end row-group-end" nameref="rowSetStart22"></tr>
-        <tr class="row-set-end row-group-end" nameref="rowSetStart24"></tr>
+                    </div>
+                    <div></div>
+                </div>
+                <div class="rowvg-start tr" nameref="rowSetStart22" style="display: none;"></div>
+                <div class="tr" nameref="rowSetStart22" style="display: none;"><div class="setting-name">Strategy</div><div class="setting-main"></div></div>
+                <div class="dropdownList-container" nameref="rowSetStart22" style="display: none;"><div colspan="2"></div></div>
+        <div class=" rowvg-end optional-block-end row-group-end tr" nameref="rowSetStart22"></div>
+        <div class="row-set-end row-group-end tr" nameref="rowSetStart24"></div>
 
-        <tr>
-            <td colspan="4">
+        <div class="tr">
+            <div colspan="4">
                 <div class="section-header"><a id="section0" class="section-anchor">#</a>Advanced Project Options</div>
-            </td>
-        </tr>
-        <tr>
-            <td>
+            </div>
+        </div>
+        <div class="tr">
+            <div>
                 <script src="/jenkins/adjuncts/5a08e6fd/lib/form/advanced/advanced.js" type="text/javascript"></script>
                 <div style="" class="advancedLink">
                     <span class="yui-button yui-push-button advanced-button advancedButton" id="yui-gen9">
@@ -48,98 +48,98 @@
                         </span>
                     </span>
                 </div>
-                <table class="advancedBody">
-                    <tbody>
-                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb13">
-                        <td colspan="3">
+                <div class="advancedBody">
+                    <div class="tbody">
+                    <div class="optional-block-start row-group-start tr" hashelp="true" ref="cb13">
+                        <div colspan="3">
                             <input class="optional-block-control block-control  "type="checkbox"checked="true">
                             <label class="attach-previous">Quiet period</label>
-                        </td>
-                    </tr>
-                    <tr class="rowvg-start"></tr>
-                    <tr>
-                        <td class="setting-name">Quiet period</td>
-                        <td class="setting-main"></td>
-                    </tr>
-                    <tr>
-                        <td colspan="2"></td>
-                        <td class="setting-description">Number of seconds</td>
-                    </tr>
-                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
-                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb14">
-                        <td colspan="3"><input class="optional-block-control block-control  "
-                                               type="checkbox" id="cb14"><label class="attach-previous">Retry Count</label></td>
-                    </tr>
-                    <tr class="rowvg-start" style="display: none;"></tr>
-                    <tr style="display: none;">
-                        <td class="setting-name">SCM checkout retry count</td>
-                        <td class="setting-main"><input min="0" step="1" value="0"
-                                                        class="setting-input  number" type="number"></td>
-                    </tr>
-                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
-                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb15">
-                        <td colspan="3">
+                        </div>
+                    </div>
+                    <div class="rowvg-start tr"></div>
+                    <div class="tr">
+                        <div class="setting-name">Quiet period</div>
+                        <div class="setting-main"></div>
+                    </div>
+                    <div class="tr">
+                        <div colspan="2"></div>
+                        <div class="setting-description">Number of seconds</div>
+                    </div>
+                    <div class="tr rowvg-end optional-block-end row-group-end"></div>
+                    <div class="tr optional-block-start row-group-start " hashelp="true" ref="cb14">
+                        <div colspan="3"><input class="optional-block-control block-control  "
+                                               type="checkbox" id="cb14"><label class="attach-previous">Retry Count</label></div>
+                    </div>
+                    <div class="tr rowvg-start" style="display: none;"></div>
+                    <div class="tr" style="display: none;">
+                        <div class="setting-name">SCM checkout retry count</div>
+                        <div class="setting-main"><input min="0" step="1" value="0"
+                                                        class="setting-input  number" type="number"></div>
+                    </div>
+                    <div class="tr rowvg-end optional-block-end row-group-end"></div>
+                    <div class="tr optional-block-start row-group-start " hashelp="true" ref="cb15">
+                        <div colspan="3">
                             <input class="optional-block-control block-control  " type="checkbox">
                             <label class="attach-previous">Block build when upstream project is building</label>
-                        </td>
-                    </tr>
-                    <tr class="rowvg-start" style="display: none;"></tr>
-                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
-                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb16">
-                        <td colspan="3"><input class="optional-block-control block-control  " type="checkbox">
+                        </div>
+                    </div>
+                    <div class="tr rowvg-start" style="display: none;"></div>
+                    <div class="tr rowvg-end optional-block-end row-group-end"></div>
+                    <div class="tr optional-block-start row-group-start " hashelp="true" ref="cb16">
+                        <div colspan="3"><input class="optional-block-control block-control  " type="checkbox">
                             <label class="attach-previous">Block build when downstream project is building</label>
-                        </td>
-                    </tr>
-                    <tr class="rowvg-start" style="display: none;"></tr>
-                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
-                    <tr class="optional-block-start row-group-start " hashelp="true" ref="cb17">
-                        <td colspan="3">
+                        </div>
+                    </div>
+                    <div class="tr rowvg-start" style="display: none;"></div>
+                    <div class="tr rowvg-end optional-block-end row-group-end"></div>
+                    <div class="tr optional-block-start row-group-start " hashelp="true" ref="cb17">
+                        <div colspan="3">
                             <input class="optional-block-control block-control  " type="checkbox">
                             <label class="attach-previous">Use custom workspace</label>
-                        </td>
-                    </tr>
-                    <tr class="rowvg-start" style="display: none;"></tr>
-                    <tr style="display: none;">
+                        </div>
+                    </div>
+                    <div class="rowvg-start" style="display: none;"></div>
+                    <div class="tr" style="display: none;">
                         <td class="setting-name">Directory</td>
                         <td class="setting-main"></td>
-                    </tr>
-                    <tr class=" rowvg-end optional-block-end row-group-end"></tr>
-                    <tr>
-                        <td class="setting-name">Display Name</td>
-                        <td class="setting-main"></td>
-                    </tr>
-                    <tr class="optional-block-start row-group-start row-set-start">
-                        <td colspan="3">
+                    </div>
+                    <div class="tr rowvg-end optional-block-end row-group-end"></div>
+                    <div class="tr">
+                        <div class="setting-name">Display Name</div>
+                        <div class="setting-main"></div>
+                    </div>
+                    <div class="tr optional-block-start row-group-start row-set-start">
+                        <div colspan="3">
                             <input class="optional-block-control block-control  " type="checkbox">
-                            <label class="attach-previous">Keep the build logs of dependencies</label></td>
-                    </tr>
-                    <tr class="rowvg-start" nameref="cb18" style="display: none;"></tr>
-                    <tr class="row-set-end rowvg-end optional-block-end row-group-end"></tr>
-                    </tbody>
-                </table>
-            </td>
-            <td></td>
-        </tr>
-        <tr style="display:none" class="row-set-end radio-block-end row-group-end"></tr>
-        <tr>
-            <td colspan="4">
+                            <label class="attach-previous">Keep the build logs of dependencies</label></div>
+                    </div>
+                    <div class="tr rowvg-start" nameref="cb18" style="display: none;"></div>
+                    <div class="tr row-set-end rowvg-end optional-block-end row-group-end"></div>
+                    </div>
+                </div>
+            </div>
+            <div></div>
+        </div>
+        <div style="display:none" class="tr row-set-end radio-block-end row-group-end"></div>
+        <div class="tr">
+            <div colspan="4">
                 <div class="section-header"><a id="section2" class="section-anchor">#</a>Build Triggers</div>
-            </td>
-        </tr>
-        <tr class="optional-block-start row-group-start row-set-start" hashelp="true" ref="cb19">
-            <td colspan="3">
+            </div>
+        </div>
+        <div class="tr optional-block-start row-group-start row-set-start" hashelp="true" ref="cb19">
+            <div colspan="3">
                 <input class="optional-block-control block-control  "type="checkbox">
                 <!-- We added the text "Trigger" here for testing the finder -->
                 <label class="attach-previous">Build (Trigger) after other projects are built</label>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="4">
+            </div>
+        </div>
+        <div class="tr">
+            <div colspan="4">
                 <div class="section-header"><a id="section3" class="section-anchor">#</a>Build</div>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="4">
+            </div>
+        </div>
+        <div class="tr">
+            <div colspan="4">
                 <div style="height: 74px;"></div>
                 <div id="bottom-sticker" style="position: fixed; bottom: 83px; left: 378px;">
                     <div class="bottom-sticker-edge"></div>
@@ -156,8 +156,8 @@
                                 type="button" tabindex="0" id="yui-gen11-button">Apply All
                         </button></span></span></div>
                 </div>
-            </td>
-        </tr>
-        </tbody>
-    </table>
-</form>
+            </div>
+        </div>
+        </div>
+    </div>
+</form>

war/yarn.lock

@@ -4721,6 +4721,16 @@ jest-jasmine2@^26.0.1:
     pretty-format "^26.0.1"
     throat "^5.0.0"
 
+jest-junit@^12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-12.0.0.tgz#3ebd4a6a84b50c4ab18323a8f7d9cceb9d845df6"
+  integrity sha512-+8K35LlboWiPuCnXSyiid7rFdxNlpCWWM20WEYe6IZH6psfUWKZmSpSRQ5tk0C0cBeDsvsnIzcef5mYhyJsbug==
+  dependencies:
+    mkdirp "^1.0.4"
+    strip-ansi "^5.2.0"
+    uuid "^3.3.3"
+    xml "^1.0.1"
+
 jest-leak-detector@^26.0.1:
   version "26.0.1"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.0.1.tgz#79b19ab3f41170e0a78eb8fa754a116d3447fb8c"
@@ -5743,6 +5753,11 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3:
   dependencies:
     minimist "^1.2.5"
 
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -8258,7 +8273,7 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
-uuid@^3.3.2:
+uuid@^3.3.2, uuid@^3.3.3:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
@@ -8590,6 +8605,11 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xml@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
+
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"