rspec-core 2.0.0.beta.22 → 2.6.0

data/spec/rspec/core/formatters/html_formatted-1.9.2.html

@@ -18,24 +18,78 @@
   </style>
   <script type="text/javascript">
     // <![CDATA[
+
+function addClass(element_id, classname) {
+  document.getElementById(element_id).className += (" " + classname);
+}
+
+function removeClass(element_id, classname) {
+  var elem = document.getElementById(element_id);
+  var classlist = elem.className.replace(classname,'');
+  elem.className = classlist;
+}
+
 function moveProgressBar(percentDone) {
   document.getElementById("rspec-header").style.width = percentDone +"%";
 }
+
 function makeRed(element_id) {
-  document.getElementById(element_id).style.background = '#C40D0D';
-  document.getElementById(element_id).style.color = '#FFFFFF';
+  removeClass(element_id, 'passed');
+  removeClass(element_id, 'not_implemented');
+  addClass(element_id,'failed');
 }
 
 function makeYellow(element_id) {
-  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
-  {
-    document.getElementById(element_id).style.background = '#FAF834';
-    document.getElementById(element_id).style.color = '#000000';
+  var elem = document.getElementById(element_id);
+  if (elem.className.indexOf("failed") == -1) {  // class doesn't includes failed
+    if (elem.className.indexOf("not_implemented") == -1) { // class doesn't include not_implemented
+      removeClass(element_id, 'passed');
+      addClass(element_id,'not_implemented');
+    }
+  }
+}
+
+function apply_filters() {
+  var passed_filter = document.getElementById('passed_checkbox').checked;
+  var failed_filter = document.getElementById('failed_checkbox').checked;
+  var pending_filter = document.getElementById('pending_checkbox').checked;
+
+  assign_display_style("example passed", passed_filter);
+  assign_display_style("example failed", failed_filter);
+  assign_display_style("example not_implemented", pending_filter);
+
+  assign_display_style_for_group("example_group passed", passed_filter);
+  assign_display_style_for_group("example_group not_implemented", pending_filter, pending_filter || passed_filter);
+  assign_display_style_for_group("example_group failed", failed_filter, failed_filter || pending_filter || passed_filter);
+}
+
+function get_display_style(display_flag) {
+  var style_mode = 'none';
+  if (display_flag == true) {
+    style_mode = 'block';
   }
-  else
-  {
-    document.getElementById(element_id).style.background = '#FAF834';
-    document.getElementById(element_id).style.color = '#000000';
+  return style_mode;
+}
+
+function assign_display_style(classname, display_flag) {
+  var style_mode = get_display_style(display_flag);
+  var elems = document.getElementsByClassName(classname)
+  for (var i=0; i<elems.length;i++) {
+    elems[i].style.display = style_mode;
+  }
+}
+
+function assign_display_style_for_group(classname, display_flag, subgroup_flag) {
+  var display_style_mode = get_display_style(display_flag);
+  var subgroup_style_mode = get_display_style(subgroup_flag);
+  var elems = document.getElementsByClassName(classname)
+  for (var i=0; i<elems.length;i++) {
+    var style_mode = display_style_mode;
+    if ((display_flag != subgroup_flag) && (elems[i].getElementsByTagName('dt')[0].innerHTML.indexOf(", ") != -1)) {
+      elems[i].style.display = subgroup_style_mode;
+    } else {
+      elems[i].style.display = display_style_mode;
+    }
   }
 }
 
@@ -54,13 +108,21 @@ function makeYellow(element_id) {
   position: absolute;
 }
 
+#label {
+  float:left;
+}
+
+#display-filters {
+  float:left;
+  padding: 28px 0 0 40%;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+}
+
 #summary {
-  margin: 0; padding: 5px 10px;
+  float:right;
+  padding: 5px 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   text-align: right;
-  top: 0px;
-  right: 0px;
-  float:right;
 }
 
 #summary p {
@@ -93,30 +155,58 @@ dd {
   padding: 3px 3px 3px 18px;
 }
 
-dd.spec.passed {
+
+dd.example.passed {
   border-left: 5px solid #65C400;
   border-bottom: 1px solid #65C400;
   background: #DBFFB4; color: #3D7700;
 }
 
-dd.spec.failed {
-  border-left: 5px solid #C20000;
-  border-bottom: 1px solid #C20000;
-  color: #C20000; background: #FFFBD3;
-}
-
-dd.spec.not_implemented {
+dd.example.not_implemented {
   border-left: 5px solid #FAF834;
   border-bottom: 1px solid #FAF834;
   background: #FCFB98; color: #131313;
 }
 
-dd.spec.pending_fixed {
+dd.example.pending_fixed {
   border-left: 5px solid #0000C2;
   border-bottom: 1px solid #0000C2;
   color: #0000C2; background: #D3FBFF;
 }
 
+dd.example.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+
+dt.not_implemented {
+  color: #000000; background: #FAF834;
+}
+
+dt.pending_fixed {
+  color: #FFFFFF; background: #C40D0D;
+}
+
+dt.failed {
+  color: #FFFFFF; background: #C40D0D;
+}
+
+
+#rspec-header.not_implemented {
+  color: #000000; background: #FAF834;
+}
+
+#rspec-header.pending_fixed {
+  color: #FFFFFF; background: #C40D0D;
+}
+
+#rspec-header.failed {
+  color: #FFFFFF; background: #C40D0D;
+}
+
+
 .backtrace {
   color: #000;
   font-size: 12px;
@@ -172,78 +262,101 @@ a {
     <h1>RSpec Code Examples</h1>
   </div>
 
+  <div id="display-filters">
+    <input id="passed_checkbox" name="passed_checkbox" type="checkbox" checked onchange="apply_filters()" value="1"> <label for="passed_checkbox">Passed</label>
+    <input id="failed_checkbox" name="failed_checkbox" type="checkbox" checked onchange="apply_filters()" value="2"> <label for="failed_checkbox">Failed</label>
+    <input id="pending_checkbox" name="pending_checkbox" type="checkbox" checked onchange="apply_filters()" value="3"> <label for="pending_checkbox">Pending</label>
+  </div>
+
   <div id="summary">
     <p id="totals">&nbsp;</p>
     <p id="duration">&nbsp;</p>
   </div>
 </div>
 
+
 <div class="results">
-<div class="example_group">
-  <dl>
-  <dt id="example_group_1">pending spec with no implementation</dt>
+<div id="div_group_1" class="example_group passed">
+  <dl style="margin-left: 0px;">
+  <dt id="example_group_1" class="passed">pending spec with no implementation</dt>
     <script type="text/javascript">makeYellow('rspec-header');</script>
+    <script type="text/javascript">makeYellow('div_group_1');</script>
     <script type="text/javascript">makeYellow('example_group_1');</script>
-    <script type="text/javascript">moveProgressBar('20.0');</script>
-    <dd class="spec not_implemented"><span class="not_implemented_spec_name">is pending (PENDING: Not Yet Implemented)</span></dd>
+    <script type="text/javascript">moveProgressBar('14.2');</script>
+    <dd class="example not_implemented"><span class="not_implemented_spec_name">is pending (PENDING: Not Yet Implemented)</span></dd>
   </dl>
 </div>
-<div class="example_group">
-  <dl>
-  <dt id="example_group_2">pending command with block format</dt>
+<div id="div_group_2" class="example_group passed">
+  <dl style="margin-left: 0px;">
+  <dt id="example_group_2" class="passed">pending command with block format</dt>
   </dl>
 </div>
-<div class="example_group">
-  <dl>
-  <dt id="example_group_3">with content that would fail</dt>
+<div id="div_group_3" class="example_group passed">
+  <dl style="margin-left: 15px;">
+  <dt id="example_group_3" class="passed">with content that would fail</dt>
     <script type="text/javascript">makeYellow('rspec-header');</script>
+    <script type="text/javascript">makeYellow('div_group_3');</script>
     <script type="text/javascript">makeYellow('example_group_3');</script>
-    <script type="text/javascript">moveProgressBar('40.0');</script>
-    <dd class="spec not_implemented"><span class="not_implemented_spec_name">is pending (PENDING: No reason given)</span></dd>
+    <script type="text/javascript">moveProgressBar('28.5');</script>
+    <dd class="example not_implemented"><span class="not_implemented_spec_name">is pending (PENDING: No reason given)</span></dd>
   </dl>
 </div>
-<div class="example_group">
-  <dl>
-  <dt id="example_group_4">with content that would pass</dt>
+<div id="div_group_4" class="example_group passed">
+  <dl style="margin-left: 15px;">
+  <dt id="example_group_4" class="passed">with content that would pass</dt>
     <script type="text/javascript">makeRed('rspec-header');</script>
+    <script type="text/javascript">makeRed('div_group_4');</script>
     <script type="text/javascript">makeRed('example_group_4');</script>
-    <script type="text/javascript">moveProgressBar('60.0');</script>
-    <dd class="spec pending_fixed">
+    <script type="text/javascript">moveProgressBar('42.8');</script>
+    <dd class="example pending_fixed">
       <span class="failed_spec_name">fails</span>
-      <div class="failure" id="failure_0">
+      <div class="failure" id="failure_1">
         <div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:19:in `block (3 levels) in <top (required)>'</pre></div>
-    <pre class="ruby"><code><span class="linenum">11</span>          <span class="keyword">rescue</span> <span class="constant">Exception</span> <span class="punct">=&gt;</span> <span class="ident">e</span>
-<span class="linenum">12</span>          <span class="keyword">end</span>
-<span class="offending"><span class="linenum">13</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
-<span class="linenum">14</span>        <span class="keyword">end</span>
-<span class="linenum">15</span>        <span class="ident">throw</span> <span class="symbol">:pending_declared_in_example</span><span class="punct">,</span> <span class="ident">message</span></code></pre>
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18:in `block (3 levels) in <top (required)>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:24:in `block (2 levels) in <module:Formatters>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `block (5 levels) in <module:Formatters>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `block (4 levels) in <module:Formatters>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `block (3 levels) in <module:Formatters>'</pre></div>
+    <pre class="ruby"><code><span class="linenum">29</span>            <span class="ident">teardown_mocks_for_rspec</span>
+<span class="linenum">30</span>          <span class="keyword">end</span>
+<span class="offending"><span class="linenum">31</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
+<span class="linenum">32</span>        <span class="keyword">end</span>
+<span class="linenum">33</span>        <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
       </div>
     </dd>
   </dl>
 </div>
-<div class="example_group">
-  <dl>
-  <dt id="example_group_5">passing spec</dt>
-    <script type="text/javascript">moveProgressBar('80.0');</script>
-    <dd class="spec passed"><span class="passed_spec_name">passes</span></dd>
+<div id="div_group_5" class="example_group passed">
+  <dl style="margin-left: 0px;">
+  <dt id="example_group_5" class="passed">passing spec</dt>
+    <script type="text/javascript">moveProgressBar('57.1');</script>
+    <dd class="example passed"><span class="passed_spec_name">passes</span></dd>
   </dl>
 </div>
-<div class="example_group">
-  <dl>
-  <dt id="example_group_6">failing spec</dt>
+<div id="div_group_6" class="example_group passed">
+  <dl style="margin-left: 0px;">
+  <dt id="example_group_6" class="passed">failing spec</dt>
+    <script type="text/javascript">makeRed('div_group_6');</script>
     <script type="text/javascript">makeRed('example_group_6');</script>
-    <script type="text/javascript">moveProgressBar('100.0');</script>
-    <dd class="spec failed">
+    <script type="text/javascript">moveProgressBar('71.4');</script>
+    <dd class="example failed">
       <span class="failed_spec_name">fails</span>
-      <div class="failure" id="failure_0">
+      <div class="failure" id="failure_2">
         <div class="message"><pre>
 expected 2
      got 1
 
 (compared using ==)
 </pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:34:in `block (2 levels) in <top (required)>'</pre></div>
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33:in `block (2 levels) in <top (required)>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:24:in `block (2 levels) in <module:Formatters>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `block (5 levels) in <module:Formatters>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `block (4 levels) in <module:Formatters>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `block (3 levels) in <module:Formatters>'</pre></div>
     <pre class="ruby"><code><span class="linenum">27</span>        <span class="keyword">end</span>
 <span class="linenum">28</span>
 <span class="offending"><span class="linenum">29</span>        <span class="keyword">raise</span><span class="punct">(</span><span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Expectations</span><span class="punct">::</span><span class="constant">ExpectationNotMetError</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">))</span></span>
@@ -252,8 +365,40 @@ expected 2
     </dd>
   </dl>
 </div>
+<div id="div_group_7" class="example_group passed">
+  <dl style="margin-left: 0px;">
+  <dt id="example_group_7" class="passed">a failing spec with odd backtraces</dt>
+    <script type="text/javascript">makeRed('div_group_7');</script>
+    <script type="text/javascript">makeRed('example_group_7');</script>
+    <script type="text/javascript">moveProgressBar('85.7');</script>
+    <dd class="example failed">
+      <span class="failed_spec_name">fails with a backtrace that has no file</span>
+      <div class="failure" id="failure_3">
+        <div class="message"><pre>foo</pre></div>
+        <div class="backtrace"><pre>(erb):1:in `<main>'
+./spec/rspec/core/resources/formatter_specs.rb:41:in `block (2 levels) in <top (required)>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:24:in `block (2 levels) in <module:Formatters>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `block (5 levels) in <module:Formatters>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `block (4 levels) in <module:Formatters>'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `block (3 levels) in <module:Formatters>'</pre></div>
+    <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for (erb)</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="example failed">
+      <span class="failed_spec_name">fails with a backtrace containing an erb file</span>
+      <div class="failure" id="failure_4">
+        <div class="message"><pre>Exception</pre></div>
+        <div class="backtrace"><pre>/foo.html.erb:1:in `<main>': foo (RuntimeError)</pre></div>
+    <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for /foo.html.erb</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
 <script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script>
-<script type="text/javascript">document.getElementById('totals').innerHTML = "5 examples, 2 failures, 2 pending";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "7 examples, 4 failures, 2 pending";</script>
 </div>
 </div>
 </body>

data/spec/rspec/core/formatters/html_formatter_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rspec/core/formatters/html_formatter'
 require 'nokogiri'
 
 module RSpec
@@ -39,22 +40,29 @@ module RSpec
 
         # Uncomment this group temporarily in order to overwrite the expected
         # with actual.  Use with care!!!
-        # describe "file generator" do
-          # it "generates a new comparison file" do
-            # Dir.chdir(root) do
-              # File.open(expected_file, 'w') {|io| io.write(generated_html)}
-            # end
-          # end
-        # end
+        describe "file generator", :if => ENV['GENERATE'] do
+          it "generates a new comparison file" do
+            Dir.chdir(root) do
+              File.open(expected_file, 'w') {|io| io.write(generated_html)}
+            end
+          end
+        end
+
+        def extract_backtrace_from(doc)
+          backtrace = doc.search("div.backtrace").
+            collect {|e| e.at("pre").inner_html}.
+            collect {|e| e.split("\n")}.flatten.
+            select  {|e| e =~ /formatter_specs\.rb/}
+        end
 
         it "produces HTML identical to the one we designed manually" do
           Dir.chdir(root) do
             actual_doc = Nokogiri::HTML(generated_html)
-            actual_backtraces = actual_doc.search("div.backtrace").collect {|e| e.at("pre").inner_html}
+            actual_backtraces = extract_backtrace_from(actual_doc)
             actual_doc.css("div.backtrace").remove
 
             expected_doc = Nokogiri::HTML(expected_html)
-            expected_backtraces = expected_doc.search("div.backtrace").collect {|e| e.at("pre").inner_html}
+            expected_backtraces = extract_backtrace_from(expected_doc)
             expected_doc.search("div.backtrace").remove
 
             actual_doc.inner_html.should == expected_doc.inner_html

data/spec/rspec/core/formatters/progress_formatter_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'stringio'
+require 'rspec/core/formatters/progress_formatter'
 
 describe RSpec::Core::Formatters::ProgressFormatter do