Updated Chutzpah to latest version and turned off debug flag.

- Before we needed to turn on the debug flag so that team city would pick us up. Now Chutzpah natively supports teamcity and outputs the correct information. - This should also make finding what tests are failing easier. SignalR#1551
YakhontovYaroslav · Jul 17, 2013 · eaed4b5 · eaed4b5
1 parent 8b237d7
commit eaed4b5
Show file tree

Hide file tree

Showing 22 changed files with 7,747 additions and 2,903 deletions.
diff --git a/build/Build.proj b/build/Build.proj
@@ -253,7 +253,7 @@
     <StartIISTask HostLocation="$(JSTestsPath)" Condition=" '$(OS)' == 'Windows_NT'" />
 
     <!-- Debugging is required in order to pump data from phantomjs to TeamCity -->
-    <Exec Command="&quot;$(ChutzpahExePath)&quot; &quot;$(JSTester)&quot; /silent /debug /timeoutMilliseconds 30000" Condition=" '$(OS)' == 'Windows_NT'" />
+    <Exec Command="&quot;$(ChutzpahExePath)&quot; &quot;$(JSTester)&quot; /silent /timeoutMilliseconds 30000" Condition=" '$(OS)' == 'Windows_NT'" />
 
     <xunit Assembly="$(ProjectArtifactsDir)\Microsoft.AspNet.SignalR.Tests\Microsoft.AspNet.SignalR.Tests.dll"
            Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Tests.XunitResults.xml"

diff --git a/build/_Chutzpah.coverage.html b/build/_Chutzpah.coverage.html
@@ -0,0 +1,139 @@
+
+<html>
+<head>
+    <title>Chutzpah Code Coverage Results</title>
+    <script type='text/javascript'>
+
+function chutzpah_toggleSource(id) {
+        var element = document.getElementById(id);
+        if(element.style.display === 'block') {
+            element.style.display = 'none';
+        } else {
+            element.style.display = 'block';
+        }
+    }
+
+    </script>
+    <style>
+
+#chutzpah-main
+{
+  background:#EEE;
+  clear:both;
+  color:#333;
+  font-family:'Helvetica Neue Light', HelveticaNeue-Light, 'Helvetica Neue', Calibri, Helvetica, Arial, sans-serif;
+  font-size:17px;
+  margin:2px;
+}
+
+#chutzpah-main a
+{
+  color:#333;
+  text-decoration:none;
+}
+
+#chutzpah-main a:hover
+{
+  text-decoration:underline;
+}
+
+.chutzpah
+{
+  border-bottom:1px solid #FFF;
+  clear:both;
+  margin:0;
+  padding:5px;
+}
+
+.chutzpah-error
+{
+  color:red;
+}
+
+.chutzpah-success
+{
+  color:#5E7D00;
+}
+
+.chutzpah-file
+{
+  width:auto;
+}
+
+.chutzpah-cl
+{
+  float:left;
+}
+
+.chutzpah div.rs
+{
+  float:right;
+  margin-left:50px;
+  width:150px;
+}
+
+.chutzpah-nb
+{
+  padding-right:10px;
+}
+
+#chutzpah-main a.chutzpah-logo
+{
+  color:#3245FF;
+  cursor:pointer;
+  font-weight:700;
+  text-decoration:none;
+}
+
+.chutzpah-source
+{
+  background-color:#FFF;
+  border:1px solid #CBCBCB;
+  color:#363636;
+  margin:25px 20px;
+  overflow-x:scroll;
+  width:80%;
+}
+
+.chutzpah-source div
+{
+  white-space:nowrap;
+}
+
+.chutzpah-source span
+{
+  background-color:#EAEAEA;
+  color:#949494;
+  display:inline-block;
+  padding:0 10px;
+  text-align:center;
+}
+
+.chutzpah-source .miss
+{
+  background-color:#e6c3c7;
+}
+
+    </style>
+</head>
+<body>
+<div id='chutzpah-main'>
+	<div class='chutzpah chutzpah-title'>
+		<div class='chutzpah-cl chutzpah-file'>
+			<a href='http://chutzpah.codeplex.com/' target='_blank' class='chutzpah-logo'>Chutzpah</a> code coverage via <a href='http://blanketjs.org' target='_blank' class='chutzpah-logo'>blanket.js</a> results
+		</div>
+		<div class='chutzpah-cl rs'>
+			Coverage (%)
+		</div>
+		<div class='chutzpah-cl rs'>
+			Covered/Total Smts.
+		</div>
+		<div style='clear:both;'>
+		</div>
+	</div>
+
+
+</div>
+</body>
+</html>
+
diff --git a/build/_Chutzpah.coverage.json b/build/_Chutzpah.coverage.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Build/teamCityIntegration.js b/tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Build/teamCityIntegration.js
diff --git a/.../Microsoft.AspNet.SignalR.Client.JS.Tests/Microsoft.AspNet.SignalR.Client.JS.Tests.csproj b/.../Microsoft.AspNet.SignalR.Client.JS.Tests/Microsoft.AspNet.SignalR.Client.JS.Tests.csproj
@@ -82,7 +82,6 @@
   <ItemGroup>
     <None Include="Build\build.ps1" />
     <Content Include="Build\disableCrossDomain.js" />
-    <Content Include="Build\teamCityIntegration.js" />
     <Content Include="default.html" />
     <Content Include="NetworkMock\jquery.network.mock.ajax.js" />
     <Content Include="NetworkMock\jquery.network.mock.core.js" />

diff --git a/tests/Microsoft.AspNet.SignalR.Client.JS.Tests/default.html b/tests/Microsoft.AspNet.SignalR.Client.JS.Tests/default.html
@@ -52,7 +52,6 @@
         </script>
         <script src="Scripts/qunit.js"></script>
         <script src="Scripts/qunit.extensions.js"></script>        
-        <script src="Build/teamCityIntegration.js"></script>
         <script src="http://testswarm.cloudapp.net/js/inject.js"></script>        
         <script src="Scripts/jquery.signalR.js"></script>                
         <!-- ##SIGNALRHUBS## --><script type='text/javascript' src='signalr/js'></script><!-- ##SIGNALRHUBS## -->

diff --git a/tools/chutzpah/AntiXssLibrary.dll b/tools/chutzpah/AntiXssLibrary.dll
diff --git a/tools/chutzpah/JSRunners/chutzpahRunner.js b/tools/chutzpah/JSRunners/chutzpahRunner.js
@@ -64,6 +64,7 @@ chutzpah.runner = function (onInitialized, onPageLoaded, isFrameworkLoaded, onFr
             case 'TestDone':
             case 'Log':
             case 'Error':
+            case 'CoverageObject':
                 console.log(wrap(eventObj.type) + json);
                 break;
 
@@ -136,7 +137,7 @@ chutzpah.runner = function (onInitialized, onPageLoaded, isFrameworkLoaded, onFr
                 window.chutzpah = { testMode: 'execution' };
             });
         }
-        
+
         page.evaluate(onInitialized);
     };