<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195993] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195993">195993</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2016-02-01 16:55:34 -0800 (Mon, 01 Feb 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add code to parse the git branches out of the Trac RSS feed https://bugs.webkit.org/show_bug.cgi?id=153624

Reviewed by Daniel Bates.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:
(Trac.prototype.commitsOnBranch): Update filter to check for Git branches.
(Trac.prototype._convertCommitInfoElementToObject): Parse Git branches from the Trac RSS feed. Also changed &quot;branchName&quot; to
&quot;branches&quot; and updated the code to work with an array instead of a string.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js:
(MockTrac): Refactored example commits out into a constant, MockTrac.EXAMPLE_TRAC_COMMITS.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-git-trac-rss.xml: Added. Test
fixture that contains XML with a Git branch.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added unit test to test parsing Git
branches from Trac RSS feed. Also updated code to work with the new MockTrac.EXAMPLE_TRAC_COMMITS constant.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsTracjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptstestsMockTracjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestsjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestfixturegittracrssxml">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-git-trac-rss.xml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsTracjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js (195992 => 195993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js        2016-02-02 00:46:33 UTC (rev 195992)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js        2016-02-02 00:55:34 UTC (rev 195993)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> 
</span><span class="cx">     commitsOnBranch: function(branchName, filter)
</span><span class="cx">     {
</span><del>-        return this.recordedCommits.filter(function(commit) {
-            return (!commit.containsBranchLocation || commit.branchName === branchName) &amp;&amp; filter(commit);
</del><ins>+        return this.recordedCommits.filter(function(commit, index, array) {
+            return (!commit.containsBranchLocation || commit.branches.includes(branchName)) &amp;&amp; filter(commit, index, array);
</ins><span class="cx">         });
</span><span class="cx">     },
</span><span class="cx"> 
</span><span class="lines">@@ -142,7 +142,8 @@
</span><span class="cx">             author: author,
</span><span class="cx">             date: date,
</span><span class="cx">             description: parsedDescription.innerHTML,
</span><del>-            containsBranchLocation: location !== &quot;&quot;
</del><ins>+            containsBranchLocation: location !== &quot;&quot;,
+            branches: []
</ins><span class="cx">         };
</span><span class="cx"> 
</span><span class="cx">         if (result.containsBranchLocation) {
</span><span class="lines">@@ -151,11 +152,11 @@
</span><span class="cx">             if (location.startsWith(&quot;tags/&quot;))
</span><span class="cx">                 result.tag = location.substr(5, location.indexOf(&quot;/&quot;, 5) - 5);
</span><span class="cx">             else if (location.startsWith(&quot;branches/&quot;))
</span><del>-                result.branchName = location.substr(9, location.indexOf(&quot;/&quot;, 9) - 9);
</del><ins>+                result.branches.push(location.substr(9, location.indexOf(&quot;/&quot;, 9) - 9));
</ins><span class="cx">             else if (location.startsWith(&quot;releases/&quot;))
</span><span class="cx">                 result.release = location.substr(9, location.indexOf(&quot;/&quot;, 9) - 9);
</span><span class="cx">             else if (location.startsWith(&quot;trunk/&quot;))
</span><del>-                result.branchName = &quot;trunk&quot;;
</del><ins>+                result.branches.push(&quot;trunk&quot;);
</ins><span class="cx">             else if (location.startsWith(&quot;submissions/&quot;))
</span><span class="cx">                 ; // These changes are never relevant to the dashboard.
</span><span class="cx">             else {
</span><span class="lines">@@ -165,6 +166,12 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        var gitBranches = doc.evaluate(&quot;./branches&quot;, commitElement, null, XPathResult.STRING_TYPE).stringValue;
+        if (gitBranches) {
+            result.containsBranchLocation = true;
+            result.branches = result.branches.concat(gitBranches.split(&quot;, &quot;));
+        }
+
</ins><span class="cx">         return result;
</span><span class="cx">     },
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptstestsMockTracjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js (195992 => 195993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js        2016-02-02 00:46:33 UTC (rev 195992)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js        2016-02-02 00:55:34 UTC (rev 195993)
</span><span class="lines">@@ -26,58 +26,6 @@
</span><span class="cx"> MockTrac = function()
</span><span class="cx"> {
</span><span class="cx">     Trac.call(this, &quot;https://trac.webkit.org/&quot;);
</span><del>-    this.recordedCommits = [
-        {
-            &quot;revisionNumber&quot;: 33018,
-            &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33018&quot;,
-            &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
-            &quot;author&quot;: &quot;john@webkit.org&quot;,
-            &quot;date&quot;: new Date(&quot;2015-11-15T17:05:44.000Z&quot;),
-            &quot;description&quot;: &quot;description&quot;,
-            &quot;containsBranchLocation&quot;: true,
-            &quot;branchName&quot;: &quot;trunk&quot;
-        },
-        {
-            &quot;revisionNumber&quot;: 33019,
-            &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33019&quot;,
-            &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
-            &quot;author&quot;: &quot;paul@webkit.org&quot;,
-            &quot;date&quot;: new Date(&quot;2015-11-16T01:18:23.000Z&quot;),
-            &quot;description&quot;: &quot;description&quot;,
-            &quot;containsBranchLocation&quot;: true,
-            &quot;branchName&quot;: &quot;someOtherBranch&quot;
-        },
-        {
-            &quot;revisionNumber&quot;: 33020,
-            &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33020&quot;,
-            &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
-            &quot;author&quot;: &quot;george@webkit.org&quot;,
-            &quot;date&quot;: new Date(&quot;2015-11-16T01:19:27.000Z&quot;),
-            &quot;description&quot;: &quot;description&quot;,
-            &quot;containsBranchLocation&quot;: true,
-            &quot;branchName&quot;: &quot;trunk&quot;
-        },
-        {
-            &quot;revisionNumber&quot;: 33021,
-            &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33021&quot;,
-            &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
-            &quot;author&quot;: &quot;ringo@webkit.org&quot;,
-            &quot;date&quot;: new Date(&quot;2015-11-16T01:20:58.000Z&quot;),
-            &quot;description&quot;: &quot;description&quot;,
-            &quot;containsBranchLocation&quot;: true,
-            &quot;branchName&quot;: &quot;someOtherBranch&quot;
-        },
-        {
-            &quot;revisionNumber&quot;: 33022,
-            &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33022&quot;,
-            &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
-            &quot;author&quot;: &quot;bob@webkit.org&quot;,
-            &quot;date&quot;: new Date(&quot;2015-11-16T01:22:01.000Z&quot;),
-            &quot;description&quot;: &quot;description&quot;,
-            &quot;containsBranchLocation&quot;: true,
-            &quot;branchName&quot;: &quot;trunk&quot;
-        }
-    ];
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> BaseObject.addConstructorFunctions(MockTrac);
</span><span class="lines">@@ -100,3 +48,56 @@
</span><span class="cx">     {
</span><span class="cx">     },
</span><span class="cx"> };
</span><ins>+
+MockTrac.EXAMPLE_TRAC_COMMITS = [
+    {
+        &quot;revisionNumber&quot;: 33018,
+        &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33018&quot;,
+        &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
+        &quot;author&quot;: &quot;john@webkit.org&quot;,
+        &quot;date&quot;: new Date(&quot;2015-11-15T17:05:44.000Z&quot;),
+        &quot;description&quot;: &quot;description&quot;,
+        &quot;containsBranchLocation&quot;: true,
+        &quot;branches&quot;: [&quot;trunk&quot;]
+    },
+    {
+        &quot;revisionNumber&quot;: 33019,
+        &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33019&quot;,
+        &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
+        &quot;author&quot;: &quot;paul@webkit.org&quot;,
+        &quot;date&quot;: new Date(&quot;2015-11-16T01:18:23.000Z&quot;),
+        &quot;description&quot;: &quot;description&quot;,
+        &quot;containsBranchLocation&quot;: true,
+        &quot;branches&quot;: [&quot;someOtherBranch&quot;]
+    },
+    {
+        &quot;revisionNumber&quot;: 33020,
+        &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33020&quot;,
+        &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
+        &quot;author&quot;: &quot;george@webkit.org&quot;,
+        &quot;date&quot;: new Date(&quot;2015-11-16T01:19:27.000Z&quot;),
+        &quot;description&quot;: &quot;description&quot;,
+        &quot;containsBranchLocation&quot;: true,
+        &quot;branches&quot;: [&quot;trunk&quot;]
+    },
+    {
+        &quot;revisionNumber&quot;: 33021,
+        &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33021&quot;,
+        &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
+        &quot;author&quot;: &quot;ringo@webkit.org&quot;,
+        &quot;date&quot;: new Date(&quot;2015-11-16T01:20:58.000Z&quot;),
+        &quot;description&quot;: &quot;description&quot;,
+        &quot;containsBranchLocation&quot;: true,
+        &quot;branches&quot;: [&quot;someOtherBranch&quot;]
+    },
+    {
+        &quot;revisionNumber&quot;: 33022,
+        &quot;link&quot;: &quot;https://trac.webkit.org/changeset/33022&quot;,
+        &quot;title&quot;: { innerHTML: &quot;commit message&quot; },
+        &quot;author&quot;: &quot;bob@webkit.org&quot;,
+        &quot;date&quot;: new Date(&quot;2015-11-16T01:22:01.000Z&quot;),
+        &quot;description&quot;: &quot;description&quot;,
+        &quot;containsBranchLocation&quot;: true,
+        &quot;branches&quot;: [&quot;trunk&quot;]
+    }
+];
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestfixturegittracrssxml"></a>
<div class="addfile"><h4>Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-git-trac-rss.xml (0 => 195993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-git-trac-rss.xml                                (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-git-trac-rss.xml        2016-02-02 00:55:34 UTC (rev 195993)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+&lt;?xml version=&quot;1.0&quot;?&gt;
+&lt;!--
+Copyright (C) 2016 Apple, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+--&gt;
+
+&lt;rss xmlns:dc=&quot;http://purl.org/dc/elements/1.1/&quot; version=&quot;2.0&quot;&gt;
+  &lt;channel&gt;
+    &lt;title&gt;WebKit&lt;/title&gt;
+    &lt;link&gt;https://trac.webkit.org/timeline&lt;/link&gt;
+    &lt;description&gt;Trac Timeline&lt;/description&gt;
+    &lt;language&gt;en-US&lt;/language&gt;
+    &lt;generator&gt;Trac 0.12.3&lt;/generator&gt;
+    &lt;image&gt;
+      &lt;title&gt;WebKit&lt;/title&gt;
+      &lt;url&gt;https://trac.webkit.org/chrome/site/favicon.png&lt;/url&gt;
+      &lt;link&gt;https://trac.webkit.org/timeline&lt;/link&gt;
+    &lt;/image&gt;
+    &lt;item&gt;
+      &lt;title&gt;Changeset [33025]: Ita prorsus inquam Ad corpus diceres pertinere, sed ea, quae dixi&lt;/title&gt;
+      &lt;branches&gt;master, someOtherBranch&lt;/branches&gt;
+
+        &lt;author&gt;george@webkit.org&lt;/author&gt;
+
+      &lt;pubDate&gt;Tue, 26 Jan 2016 22:48:15 GMT&lt;/pubDate&gt;
+      &lt;link&gt;https://trac.webkit.org/changeset/33025&lt;/link&gt;
+      &lt;guid isPermaLink=&quot;false&quot;&gt;https://trac.webkit.org/changeset/33025/1453848495332569&lt;/guid&gt;
+      &lt;description&gt;Description&lt;/description&gt;
+      &lt;category&gt;changeset&lt;/category&gt;
+    &lt;/item&gt;
+    &lt;item&gt;
+      &lt;title&gt;Changeset [33024]: An eum discere ea mavis, quae cum plane perdidiceriti nihil sciat&lt;/title&gt;
+      &lt;branches&gt;master&lt;/branches&gt;
+
+        &lt;author&gt;paul@webkit.org&lt;/author&gt;
+
+      &lt;pubDate&gt;Tue, 26 Jan 2016 22:22:25 GMT&lt;/pubDate&gt;
+      &lt;link&gt;https://trac.webkit.org/changeset/33024&lt;/link&gt;
+      &lt;guid isPermaLink=&quot;false&quot;&gt;https://trac.webkit.org/changeset/33024/1453846945244007&lt;/guid&gt;
+      &lt;description&gt;Description&lt;/description&gt;
+      &lt;category&gt;changeset&lt;/category&gt;
+    &lt;/item&gt;
+    &lt;item&gt;
+      &lt;title&gt;Changeset [33023]: Lorem ipsum dolor sit amet, consectetur adipiscing elit.&lt;/title&gt;
+
+        &lt;author&gt;john@webkit.org&lt;/author&gt;
+
+      &lt;pubDate&gt;Tue, 26 Jan 2016 22:22:14 GMT&lt;/pubDate&gt;
+      &lt;link&gt;https://trac.webkit.org/changeset/33023&lt;/link&gt;
+      &lt;guid isPermaLink=&quot;false&quot;&gt;https://trac.webkit.org/changeset/33023/1453846934034550&lt;/guid&gt;
+      &lt;description&gt;Description&lt;/description&gt;
+      &lt;category&gt;changeset&lt;/category&gt;
+    &lt;/item&gt;
+   &lt;/channel&gt;
+&lt;/rss&gt;
</ins></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsteststestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js (195992 => 195993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js        2016-02-02 00:46:33 UTC (rev 195992)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js        2016-02-02 00:55:34 UTC (rev 195993)
</span><span class="lines">@@ -31,11 +31,11 @@
</span><span class="cx"> 
</span><span class="cx"> test(&quot;_loaded&quot;, function()
</span><span class="cx"> {
</span><ins>+    this.trac.recordedCommits = MockTrac.EXAMPLE_TRAC_COMMITS;
</ins><span class="cx">     var client = new XMLHttpRequest();
</span><span class="cx">     client.open('GET', 'test-fixture-trac-rss.xml', false);
</span><del>-    client.onreadystatechange = function () {
-        if (client.readyState === client.DONE)
-            this.trac._loaded(client.responseXML);
</del><ins>+    client.onload = function () {
+        this.trac._loaded(client.responseXML);
</ins><span class="cx">     }.bind(this);
</span><span class="cx">     client.send();
</span><span class="cx">     var commits = this.trac.recordedCommits;
</span><span class="lines">@@ -47,6 +47,24 @@
</span><span class="cx">     }
</span><span class="cx"> });
</span><span class="cx"> 
</span><ins>+test(&quot;parse gitBranches&quot;, function()
+{
+    var client = new XMLHttpRequest();
+    client.open(&quot;GET&quot;, &quot;test-fixture-git-trac-rss.xml&quot;, false);
+    client.onload = function () {
+        this.trac._loaded(client.responseXML);
+    }.bind(this);
+    client.send();
+    var commits = this.trac.recordedCommits;
+    strictEqual(commits.length, 3, &quot;should have 3 commits&quot;);
+    strictEqual(commits[0].branches.length, 0, &quot;should have no branches&quot;);
+    strictEqual(commits[1].branches.length, 1, &quot;should have one branch&quot;);
+    strictEqual(commits[1].branches.includes(&quot;master&quot;), true, &quot;should contain branch master&quot;);
+    strictEqual(commits[2].branches.length, 2, &quot;should have two branches&quot;);
+    strictEqual(commits[2].branches.includes(&quot;master&quot;), true, &quot;should contain branch master&quot;);
+    strictEqual(commits[2].branches.includes(&quot;someOtherBranch&quot;), true, &quot;should contain branch someOtherBranch&quot;);
+});
+
</ins><span class="cx"> test(&quot;_parseRevisionFromURL&quot;, function()
</span><span class="cx"> {
</span><span class="cx">     strictEqual(this.trac._parseRevisionFromURL(&quot;https://trac.webkit.org/changeset/190497&quot;), &quot;190497&quot;, &quot;Subversion&quot;);
</span><span class="lines">@@ -57,6 +75,7 @@
</span><span class="cx"> module(&quot;BuildBotQueueView&quot;, {
</span><span class="cx">     setup: function() {
</span><span class="cx">         this.trac = new MockTrac();
</span><ins>+        this.trac.recordedCommits = MockTrac.EXAMPLE_TRAC_COMMITS;
</ins><span class="cx">         this.queue = new MockBuildbotQueue();
</span><span class="cx">         this.trunkBranch = {
</span><span class="cx">             name: &quot;trunk&quot;,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195992 => 195993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-02-02 00:46:33 UTC (rev 195992)
+++ trunk/Tools/ChangeLog        2016-02-02 00:55:34 UTC (rev 195993)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-01  Jason Marcell  &lt;jmarcell@apple.com&gt;
+
+        Add code to parse the git branches out of the Trac RSS feed
+        https://bugs.webkit.org/show_bug.cgi?id=153624
+
+        Reviewed by Daniel Bates.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Trac.js:
+        (Trac.prototype.commitsOnBranch): Update filter to check for Git branches.
+        (Trac.prototype._convertCommitInfoElementToObject): Parse Git branches from the Trac RSS feed. Also changed &quot;branchName&quot; to
+        &quot;branches&quot; and updated the code to work with an array instead of a string.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/MockTrac.js:
+        (MockTrac): Refactored example commits out into a constant, MockTrac.EXAMPLE_TRAC_COMMITS.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/test-fixture-git-trac-rss.xml: Added. Test
+        fixture that contains XML with a Git branch.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests/tests.js: Added unit test to test parsing Git
+        branches from Trac RSS feed. Also updated code to work with the new MockTrac.EXAMPLE_TRAC_COMMITS constant.
+
</ins><span class="cx"> 2016-02-01  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add command line flag to DRT to output the number of tests completed in server mode.
</span></span></pre>
</div>
</div>

</body>
</html>