teaspoon 0.8.0 → 0.9.0

data/spec/teaspoon/formatters/clean_formatter_spec.rb

@@ -8,7 +8,7 @@ describe Teaspoon::Formatters::CleanFormatter do
 
   before do
     @log = ""
-    STDOUT.stub(:print) { |s| @log << s }
+    allow(STDOUT).to receive(:print) { |s| @log << s }
   end
 
   describe "#result" do

data/spec/teaspoon/formatters/documentation_formatter_spec.rb

@@ -9,7 +9,7 @@ describe Teaspoon::Formatters::DocumentationFormatter do
 
   before do
     @log = ""
-    STDOUT.stub(:print) { |s| @log << s }
+    allow(STDOUT).to receive(:print) { |s| @log << s }
   end
 
   describe "#suite" do

data/spec/teaspoon/formatters/dot_formatter_spec.rb

@@ -8,7 +8,7 @@ describe Teaspoon::Formatters::DotFormatter do
 
   before do
     @log = ""
-    STDOUT.stub(:print) { |s| @log << s }
+    allow(STDOUT).to receive(:print) { |s| @log << s }
   end
 
   describe "#spec" do

data/spec/teaspoon/formatters/json_formatter_spec.rb

@@ -10,7 +10,7 @@ describe Teaspoon::Formatters::JsonFormatter do
     let(:result) { double(hash.merge(total: 42)) }
 
     it "logs the original json" do
-      subject.should_receive(:log_result).with(result)
+      expect(subject).to receive(:log_result).with(result)
       subject.runner(result)
     end
 
@@ -19,7 +19,7 @@ describe Teaspoon::Formatters::JsonFormatter do
   describe "#suite" do
 
     it "logs the original json" do
-      subject.should_receive(:log_result).with(result)
+      expect(subject).to receive(:log_result).with(result)
       subject.suite(result)
     end
 
@@ -30,7 +30,7 @@ describe Teaspoon::Formatters::JsonFormatter do
     let(:result) { double(hash.merge(passing?: true)) }
 
     it "logs the original json" do
-      subject.should_receive(:log_result).with(result)
+      expect(subject).to receive(:log_result).with(result)
       subject.spec(result)
     end
 
@@ -39,7 +39,7 @@ describe Teaspoon::Formatters::JsonFormatter do
   describe "#error" do
 
     it "logs the original json" do
-      subject.should_receive(:log_result).with(result)
+      expect(subject).to receive(:log_result).with(result)
       subject.error(result)
     end
 
@@ -48,7 +48,7 @@ describe Teaspoon::Formatters::JsonFormatter do
   describe "#exception" do
 
     it "logs the original json" do
-      subject.should_receive(:log_result).with(result)
+      expect(subject).to receive(:log_result).with(result)
       subject.exception(result)
     end
 
@@ -57,7 +57,7 @@ describe Teaspoon::Formatters::JsonFormatter do
   describe "#console" do
 
     it "logs the message as json" do
-      subject.should_receive(:log_line).with(%Q{{"type":"console","log":"_message_"}})
+      expect(subject).to receive(:log_line).with(%Q{{"type":"console","log":"_message_"}})
       subject.console("_message_")
     end
 
@@ -68,7 +68,7 @@ describe Teaspoon::Formatters::JsonFormatter do
     let(:result) { double(hash.merge(coverage: nil)) }
 
     it "logs the original json" do
-      subject.should_receive(:log_str).with("_original_json_")
+      expect(subject).to receive(:log_str).with("_original_json_")
       subject.result(result)
     end
 

data/spec/teaspoon/formatters/junit_formatter_spec.rb

@@ -4,11 +4,11 @@ describe Teaspoon::Formatters::JunitFormatter do
 
   let(:passing_spec) { double(passing?: true, suite: "_suite_name_", label: "_passing_label_") }
   let(:pending_spec) { double(passing?: false, pending?: true, suite: "_suite_name_", label: "_pending_label_") }
-  let(:failing_spec) { double(passing?: false, pending?: false, suite: "_suite_name_", label: "_failing&label_", message: "_failure_message_") }
+  let(:failing_spec) { double(passing?: false, pending?: false, suite: "_suite&name_", label: "_failing&label_", message: "_failure_message_") }
 
   before do
     @log = ""
-    STDOUT.stub(:print) { |s| @log << s }
+    allow(STDOUT).to receive(:print) { |s| @log << s }
   end
 
   describe "#runner" do
@@ -16,28 +16,28 @@ describe Teaspoon::Formatters::JunitFormatter do
     let(:result) { double(start: "_start_", total: 42) }
 
     before do
-      subject.instance_variable_set(:@suite_name, "not_default")
+      subject.instance_variable_set(:@suite_name, "not_default&")
     end
 
     it "starts the suite" do
       subject.runner(result)
-      expect(@log).to eq(%Q{<?xml version="1.0" encoding="UTF-8"?>\n<testsuites name="Teaspoon">\n<testsuite name="not_default" tests="42" time="_start_">\n})
+      expect(@log).to eq(%Q{<?xml version="1.0" encoding="UTF-8"?>\n<testsuites name="Teaspoon">\n<testsuite name="not_default&amp;" tests="42" time="_start_">\n})
     end
 
   end
 
   describe "#suite" do
 
-    let(:result) { double(label: "_label_") }
+    let(:result) { double(label: "_suite>label_") }
 
     it "calls #log_end_suite" do
-      subject.should_receive(:log_end_suite)
+      expect(subject).to receive(:log_end_suite)
       subject.suite(result)
     end
 
     it "logs the start of the testsuite" do
       subject.suite(result)
-      expect(@log).to eq(%Q{<testsuite name="_label_">\n})
+      expect(@log).to eq(%Q{<testsuite name="_suite&gt;label_">\n})
     end
 
   end
@@ -56,7 +56,7 @@ describe Teaspoon::Formatters::JunitFormatter do
 
     it "logs a failing testcase with the message on failing results" do
       subject.spec(failing_spec)
-      expect(@log).to include(%Q{<testcase classname="_suite_name_" name="_failing&amp;label_">\n})
+      expect(@log).to include(%Q{<testcase classname="_suite&amp;name_" name="_failing&amp;label_">\n})
       expect(@log).to include(%Q{  <failure type="AssertionFailed">\n<![CDATA[\n_failure_message_\n]]>\n</failure>\n})
       expect(@log).to include(%Q{</testcase>\n})
     end
@@ -74,7 +74,7 @@ describe Teaspoon::Formatters::JunitFormatter do
     let(:result) { double(coverage: nil) }
 
     it "closes the last suite" do
-      subject.should_receive(:log_end_suite)
+      expect(subject).to receive(:log_end_suite)
       subject.result(result)
     end
 
@@ -84,7 +84,7 @@ describe Teaspoon::Formatters::JunitFormatter do
 
     it "logs the coverage" do
       subject.coverage("_text_\n\n_text_summary_")
-      expect(@log).to eq(%Q{<testsuite name="Coverage summary" tests="0">\n<properties>\n<![CDATA[\n_text_\n_text_summary_\n]]>\n<properties>\n</testsuite>\n})
+      expect(@log).to eq(%Q{<testsuite name="Coverage summary" tests="0">\n<properties>\n<![CDATA[\n_text_\n_text_summary_\n]]>\n</properties>\n</testsuite>\n})
     end
 
   end

data/spec/teaspoon/formatters/pride_formatter_spec.rb

@@ -8,7 +8,7 @@ describe Teaspoon::Formatters::PrideFormatter do
 
   before do
     @log = ""
-    STDOUT.stub(:print) { |s| @log << s }
+    allow(STDOUT).to receive(:print) { |s| @log << s }
   end
 
   describe "#spec" do

data/spec/teaspoon/formatters/rspec_html_formatter_spec.rb

@@ -0,0 +1,107 @@
+require "spec_helper"
+
+describe Teaspoon::Formatters::RspecHtmlFormatter do
+
+  let(:suite) { double(label: "_suite&_", level: @level || 0)}
+  let(:passing_spec) { double(passing?: true, failing?: false, elapsed: nil, status: "passed", label: "_passing&_") }
+  let(:pending_spec) { double(passing?: false, pending?: true, failing?: false, elapsed: nil, status: "pending", label: "_pending&_", description: "_description&_") }
+  let(:failing_spec) { double(passing?: false, pending?: false, failing?: true, elapsed: nil, status: "failed", label: "_failing&_", description: "_description&_", message: "_message&_", link: "_link&_", trace: "_trace&_") }
+
+  before do
+    @log = ""
+    allow(STDOUT).to receive(:print) { |s| @log << s }
+  end
+
+  describe "#runner" do
+
+    let(:result) { double(start: "_start&_", total: 42) }
+
+    before do
+      subject.instance_variable_set(:@suite_name, "not_default&")
+    end
+
+    it "starts the HTML" do
+      subject.runner(result)
+      expect(@log).to eq(Teaspoon::Formatters::RspecHtmlFormatter::Templates::HEADER)
+    end
+
+  end
+
+  describe "#suite" do
+
+    it "logs a suite header" do
+      subject.suite(suite)
+      expect(@log).to eq(Teaspoon::Formatters::RspecHtmlFormatter::Templates::SUITE_START.gsub("<%= h @o.label %>", "_suite&amp;_"))
+      expect(subject.instance_variable_get(:@current_suite)).to eq(["_suite&_"])
+    end
+
+    it "finishes any ended suites" do
+      subject.instance_variable_get(:@current_suite) << "Suite 1" << "Suite 2" << "Suite 3" << "Suite 4"
+      @level = 2
+      subject.suite(suite)
+      expected_head = Teaspoon::Formatters::RspecHtmlFormatter::Templates::SUITE_END * 2
+      expected_tail = Teaspoon::Formatters::RspecHtmlFormatter::Templates::SUITE_START.gsub("<%= h @o.label %>", "_suite&amp;_")
+      expect(@log).to eq(expected_head + expected_tail)
+    end
+
+  end
+
+  describe "#spec" do
+
+    it "logs passing results" do
+      subject.spec(passing_spec)
+      expected_log = Teaspoon::Formatters::RspecHtmlFormatter::Templates::SPEC.gsub("<%= h @o.status %>", "passed")
+      expected_log.gsub!("<%= h @o.label %>", "_passing&amp;_")
+      expected_log.gsub!("<%= h \"\#{@o.elapsed}s\" if @o.elapsed %>", "")
+      expected_log.gsub!(/\<% if @o.failing\? %\>.*?\<% end %\>/m, "")
+      expect(@log).to eq(expected_log)
+    end
+
+    it "logs pending results" do
+      subject.spec(pending_spec)
+      expected_log = Teaspoon::Formatters::RspecHtmlFormatter::Templates::SPEC.gsub("<%= h @o.status %>", "pending")
+      expected_log.gsub!("<%= h @o.label %>", "_pending&amp;_")
+      expected_log.gsub!("<%= h \"\#{@o.elapsed}s\" if @o.elapsed %>", "")
+      expected_log.gsub!(/\<% if @o.failing\? %\>.*?\<% end %\>/m, "")
+      expect(@log).to eq(expected_log)
+    end
+
+    it "logs failing results" do
+      subject.spec(failing_spec)
+      expected_log = Teaspoon::Formatters::RspecHtmlFormatter::Templates::SPEC.gsub("<%= h @o.status %>", "failed")
+      expected_log.gsub!("<%= h @o.label %>", "_failing&amp;_")
+      expected_log.gsub!("<%= h \"\#{@o.elapsed}s\" if @o.elapsed %>", "")
+      expected_log.gsub!("<%= h @o.trace %>", "_trace&amp;_")
+      expected_log.gsub!("<% if @o.failing? %>", "")
+      expected_log.gsub!("<% end %>", "")
+      expect(@log).to eq(expected_log)
+    end
+
+  end
+
+  describe "#result" do
+
+    let(:result) { double(elapsed: 3.1337, coverage: nil) }
+
+    before do
+      subject.run_count = 666
+      subject.failures << failing_spec
+      subject.pendings << pending_spec
+    end
+
+    it "ends the HTML" do
+      subject.result(result)
+      expect(@log).to eq(Teaspoon::Formatters::RspecHtmlFormatter::Templates::FOOTER.gsub("<%= h @o.elapsed %>", "3.1337"))
+    end
+
+    it "finishes any remaining suites" do
+      subject.instance_variable_get(:@current_suite) << "Suite 1" << "Suite 2"
+      subject.result(result)
+      expected_head = Teaspoon::Formatters::RspecHtmlFormatter::Templates::SUITE_END * 2
+      expected_tail = Teaspoon::Formatters::RspecHtmlFormatter::Templates::FOOTER.gsub("<%= h @o.elapsed %>", "3.1337")
+      expect(@log).to eq(expected_head + expected_tail)
+    end
+
+  end
+
+end

data/spec/teaspoon/formatters/snowday_formatter_spec.rb

@@ -10,7 +10,7 @@ describe Teaspoon::Formatters::SnowdayFormatter do
 
   before do
     @log = ""
-    STDOUT.stub(:print) { |s| @log << s }
+    allow(STDOUT).to receive(:print) { |s| @log << s }
   end
 
   describe "#spec" do

data/spec/teaspoon/formatters/tap_formatter_spec.rb

@@ -8,7 +8,7 @@ describe Teaspoon::Formatters::TapFormatter do
 
   before do
     @log = ""
-    STDOUT.stub(:print) { |s| @log << s }
+    allow(STDOUT).to receive(:print) { |s| @log << s }
   end
 
   describe "#runner" do

data/spec/teaspoon/formatters/tap_y_formatter_spec.rb

@@ -8,7 +8,7 @@ describe Teaspoon::Formatters::TapYFormatter do
 
   before do
     @log = ""
-    STDOUT.stub(:print) { |s| @log << s }
+    allow(STDOUT).to receive(:print) { |s| @log << s }
   end
 
   describe "#runner" do

data/spec/teaspoon/formatters/teamcity_formatter_spec.rb

@@ -10,7 +10,7 @@ describe Teaspoon::Formatters::TeamcityFormatter do
 
   before do
     @log = ""
-    STDOUT.stub(:print) { |s| @log << s }
+    allow(STDOUT).to receive(:print) { |s| @log << s }
   end
 
   describe "#runner" do
@@ -18,7 +18,7 @@ describe Teaspoon::Formatters::TeamcityFormatter do
     let(:result) { double(total: 42, start: "_start_") }
 
     it "starts the suite" do
-      Time.should_receive(:now).and_return(double(to_json: "_json_time_"))
+      expect(Time).to receive(:now).and_return(double(to_json: "_json_time_"))
       subject.runner(result)
       expect(@log).to include("##teamcity[enteredTheMatrix timestamp='_json_time_']\n")
       expect(@log).to include("##teamcity[testCount count='42' timestamp='_start_']\n")
@@ -30,13 +30,13 @@ describe Teaspoon::Formatters::TeamcityFormatter do
 
     it "logs the suite" do
       subject.suite(suite)
-      expect(@log).to include(%Q{##teamcity[testSuiteStarted name='_suite_']})
+      expect(@log).to include(%{##teamcity[testSuiteStarted name='_suite_']})
     end
 
     it "closes the last suite if there was one" do
       subject.instance_variable_set(:@last_suite, suite)
       subject.suite(suite)
-      expect(@log).to include(%Q{##teamcity[testSuiteFinished name='_suite_']})
+      expect(@log).to include(%{##teamcity[testSuiteFinished name='_suite_']})
     end
 
   end
@@ -45,29 +45,29 @@ describe Teaspoon::Formatters::TeamcityFormatter do
 
     it "logs a passing testcase on passing results" do
       subject.spec(passing_spec)
-      expect(@log).to include(%Q{##teamcity[testStarted name='_passing_|[desc|]|rip|||'o|n_' captureStandardOutput='true']\n})
-      expect(@log).to include(%Q{##teamcity[testFinished name='_passing_|[desc|]|rip|||'o|n_']\n})
+      expect(@log).to include(%{##teamcity[testStarted name='_passing_|[desc|]|rip|||'o|n_' captureStandardOutput='true']\n})
+      expect(@log).to include(%{##teamcity[testFinished name='_passing_|[desc|]|rip|||'o|n_']\n})
     end
 
     it "logs a skipped testcase on pending results" do
       subject.spec(pending_spec)
-      expect(@log).to include(%Q{##teamcity[testIgnored name='_pending_|[desc|]_' captureStandardOutput='true']\n})
-      expect(@log).to include(%Q{##teamcity[testFinished name='_pending_|[desc|]_']\n})
+      expect(@log).to include(%{##teamcity[testIgnored name='_pending_|[desc|]_' captureStandardOutput='true']\n})
+      expect(@log).to include(%{##teamcity[testFinished name='_pending_|[desc|]_']\n})
     end
 
     it "logs a failing testcase with the message on failing results" do
       subject.spec(failing_spec)
-      expect(@log).to include(%Q{##teamcity[testStarted name='_failing_|[desc|]_' captureStandardOutput='true']\n})
-      expect(@log).to include(%Q{##teamcity[testFailed name='_failing_|[desc|]_' message='_failure_|[mess|]age_']\n})
-      expect(@log).to include(%Q{##teamcity[testFinished name='_failing_|[desc|]_']\n})
+      expect(@log).to include(%{##teamcity[testStarted name='_failing_|[desc|]_' captureStandardOutput='true']\n})
+      expect(@log).to include(%{##teamcity[testFailed name='_failing_|[desc|]_' message='_failure_|[mess|]age_']\n})
+      expect(@log).to include(%{##teamcity[testFinished name='_failing_|[desc|]_']\n})
     end
 
     it "captures stdout and puts it in the right place" do
       subject.instance_variable_set(:@stdout, "_stdout_\n")
       subject.spec(pending_spec)
-      expect(@log).to include(%Q{##teamcity[testIgnored name='_pending_|[desc|]_' captureStandardOutput='true']\n})
-      expect(@log).to include(%Q{_stdout_\n})
-      expect(@log).to include(%Q{##teamcity[testFinished name='_pending_|[desc|]_']\n})
+      expect(@log).to include(%{##teamcity[testIgnored name='_pending_|[desc|]_' captureStandardOutput='true']\n})
+      expect(@log).to include(%{_stdout_\n})
+      expect(@log).to include(%{##teamcity[testFinished name='_pending_|[desc|]_']\n})
     end
 
   end
@@ -78,7 +78,7 @@ describe Teaspoon::Formatters::TeamcityFormatter do
 
     it "logs the error" do
       subject.error(result)
-      expect(@log).to include(%Q{##teamcity[message text='_error_message_' errorDetails='myfile.js:420|nmyfile.js:666' status='ERROR']\n})
+      expect(@log).to include(%{##teamcity[message text='_error_message_' errorDetails='myfile.js:420|nmyfile.js:666' status='ERROR']\n})
     end
 
   end
@@ -88,7 +88,7 @@ describe Teaspoon::Formatters::TeamcityFormatter do
     it "closes any open suites" do
       subject.instance_variable_set(:@last_suite, double(label: "_last_suite_label_"))
       subject.result(result)
-      expect(@log).to include(%Q{##teamcity[testSuiteFinished name='_last_suite_label_']})
+      expect(@log).to include(%{##teamcity[testSuiteFinished name='_last_suite_label_']})
     end
 
     it "assigns @result" do
@@ -102,9 +102,9 @@ describe Teaspoon::Formatters::TeamcityFormatter do
 
     it "logs the coverage" do
       subject.coverage("_text_\n\n_text_summary_")
-      expect(@log).to include(%Q{##teamcity[testSuiteStarted name='Coverage summary']\n})
-      expect(@log).to include(%Q{_text_\n\n_text_summary_\n})
-      expect(@log).to include(%Q{##teamcity[testSuiteFinished name='Coverage summary']\n})
+      expect(@log).to include(%{##teamcity[testSuiteStarted name='Coverage summary']\n})
+      expect(@log).to include(%{_text_\n\n_text_summary_\n})
+      expect(@log).to include(%{##teamcity[testSuiteFinished name='Coverage summary']\n})
     end
 
   end
@@ -113,12 +113,12 @@ describe Teaspoon::Formatters::TeamcityFormatter do
 
     it "logs the threshold failures" do
       subject.threshold_failure("_was_not_met_\n_was_not_met_")
-      expect(@log).to include(%Q{##teamcity[testSuiteStarted name='Coverage thresholds']\n})
-      expect(@log).to include(%Q{##teamcity[testStarted name='Coverage thresholds' captureStandardOutput='true']\n})
-      expect(@log).to include(%Q{##teamcity[testFailed name='Coverage thresholds' message='were not met']\n})
-      expect(@log).to include(%Q{_was_not_met_\n_was_not_met_\n})
-      expect(@log).to include(%Q{##teamcity[testFinished name='Coverage thresholds']\n})
-      expect(@log).to include(%Q{##teamcity[testSuiteFinished name='Coverage thresholds']\n})
+      expect(@log).to include(%{##teamcity[testSuiteStarted name='Coverage thresholds']\n})
+      expect(@log).to include(%{##teamcity[testStarted name='Coverage thresholds' captureStandardOutput='true']\n})
+      expect(@log).to include(%{##teamcity[testFailed name='Coverage thresholds' message='were not met']\n})
+      expect(@log).to include(%{_was_not_met_\n_was_not_met_\n})
+      expect(@log).to include(%{##teamcity[testFinished name='Coverage thresholds']\n})
+      expect(@log).to include(%{##teamcity[testSuiteFinished name='Coverage thresholds']\n})
     end
 
   end
@@ -139,8 +139,8 @@ describe Teaspoon::Formatters::TeamcityFormatter do
 
     it "ends the suite" do
       subject.complete(1)
-      expect(@log).to include(%Q{Finished in 3.1337 seconds\n})
-      expect(@log).to include(%Q{6 examples, 1 failure, 2 pending\n\n})
+      expect(@log).to include(%{Finished in 3.1337 seconds\n})
+      expect(@log).to include(%{6 examples, 1 failure, 2 pending\n\n})
     end
 
   end

data/spec/teaspoon/instrumentation_spec.rb

@@ -7,96 +7,102 @@ describe Teaspoon::Instrumentation do
 
   subject { Teaspoon::Instrumentation }
 
-  let(:asset) { double(source: source, pathname: 'path/to/instrument.js') }
+  let(:asset) { double(source: source, pathname: "path/to/instrument.js") }
   let(:source) { "function add(a, b) { return a + b } // ☃ " }
-  let(:response) { [200, {"Content-Type" => "application/javascript"}, asset] }
-  let(:env) { {"QUERY_STRING" => "instrument=true"} }
+  let(:response) { [200, { "Content-Type" => "application/javascript" }, asset] }
+  let(:env) { { "QUERY_STRING" => "instrument=true" } }
 
   describe ".add_to" do
 
     before do
-      Teaspoon::Instrumentation.stub(:executable).and_return("/path/to/istanbul")
+      allow(Teaspoon::Instrumentation).to receive(:executable).and_return("/path/to/istanbul")
     end
 
     before do
-      Teaspoon::Instrumentation.stub(:add?).and_return(true)
-      asset.should_receive(:clone).and_return(asset)
+      allow(Teaspoon::Instrumentation).to receive(:add?).and_return(true)
+      expect(asset).to receive(:clone).and_return(asset)
 
-      File.stub(:open)
-      subject.any_instance.stub(:instrument).and_return(source + " // instrumented")
+      allow(File).to receive(:open)
+      allow_any_instance_of(subject).to receive(:instrument).and_return(source + " // instrumented")
 
       path = nil
       Dir.mktmpdir { |p| path = p }
-      Dir.stub(:mktmpdir).and_yield(path)
+      allow(Dir).to receive(:mktmpdir).and_yield(path)
       @output = File.join(path, "instrument.js")
     end
 
     it "writes the file to a tmp path" do
-      file = double('file')
-      File.should_receive(:open).with(@output, "w").and_yield(file)
-      file.should_receive(:write).with("function add(a, b) { return a + b } // ☃ ")
+      file = double("file")
+      expect(File).to receive(:open).with(@output, "w").and_yield(file)
+      expect(file).to receive(:write).with("function add(a, b) { return a + b } // ☃ ")
       subject.add_to(response, env)
     end
 
     it "instruments the javascript file" do
-      subject.any_instance.should_receive(:instrument).with(@output).and_return("_instrumented_")
+      expect_any_instance_of(subject).to receive(:instrument).with(@output).and_return("_instrumented_")
       subject.add_to(response, env)
     end
 
     it "replaces the response array with the appropriate information" do
-      response = [666, {"Content-Type" => "application/javascript"}, asset]
-      expected = [666, {"Content-Type" => "application/javascript", "Content-Length" => "59"}, asset]
+      response = [666, { "Content-Type" => "application/javascript" }, asset]
+      expected = [666, { "Content-Type" => "application/javascript", "Content-Length" => "59" }, asset]
 
       expect(subject.add_to(response, env)).to eq(expected)
     end
 
+    it "raises an exception if istanbul fails" do
+      `(exit 1)`
+      allow(subject).to receive(:`)
+      allow_any_instance_of(subject).to receive(:instrument).and_call_original
+      expect { subject.add_to(response, env) }.to raise_error(
+        Teaspoon::DependencyFailure, "Could not generate instrumentation for instrument.js."
+      )
+    end
+
   end
 
   describe ".add?" do
 
     before do
-      Teaspoon::Instrumentation.stub(:executable).and_return("/path/to/istanbul")
+      allow(Teaspoon::Instrumentation).to receive(:executable).and_return("/path/to/istanbul")
     end
 
     it "returns true when everything is good" do
-      expect(subject.add?(response, {"QUERY_STRING" => "instrument=true"})).to be(true)
-      expect(subject.add?(response, {"QUERY_STRING" => "instrument=1"})).to be(true)
+      expect(subject.add?(response, "QUERY_STRING" => "instrument=true")).to be(true)
+      expect(subject.add?(response, "QUERY_STRING" => "instrument=1")).to be(true)
     end
 
     it "doesn't if the query param isn't set (or isn't something we care about)" do
       expect(subject.add?(response, {})).to_not be(true)
-      expect(subject.add?(response, {"QUERY_STRING" => "instrument=foo"})).to_not be(true)
+      expect(subject.add?(response, "QUERY_STRING" => "instrument=foo")).to_not be(true)
     end
 
     it "doesn't if response isn't 200" do
-      expect(subject.add?([404, {"Content-Type" => "application/javascript"}, asset], env)).to_not be(true)
+      expect(subject.add?([404, { "Content-Type" => "application/javascript" }, asset], env)).to_not be(true)
     end
 
     it "doesn't when the content type isn't application/javascript" do
-      expect(subject.add?([200, {"Content-Type" => "foo/bar"}, asset], env)).to_not be(true)
+      expect(subject.add?([200, { "Content-Type" => "foo/bar" }, asset], env)).to_not be(true)
     end
 
     it "doesn't if there's no executable" do
-      subject.should_receive(:executable).and_return(false)
+      expect(subject).to receive(:executable).and_return(false)
       expect(subject.add?(response, env)).to_not be(true)
     end
 
     it "doesn't if there's no asset" do
-      expect(subject.add?([404, {"Content-Type" => "application/javascript"}, []], env)).to_not be(true)
+      expect(subject.add?([404, { "Content-Type" => "application/javascript" }, []], env)).to_not be(true)
     end
 
   end
 
   describe "integration" do
 
-    let(:asset) { Rails.application.assets.find_asset('instrumented1.coffee') }
-
-    before do
-      pending("needs istanbul to be installed") unless Teaspoon::Instrumentation.executable
-    end
+    let(:asset) { Rails.application.assets.find_asset("instrumented1.coffee") }
 
     it "instruments a file" do
-      status, headers, asset = subject.add_to(response, {"QUERY_STRING" => "instrument=true"})
+      pending("needs istanbul to be installed") unless Teaspoon::Instrumentation.executable
+      status, headers, asset = subject.add_to(response, "QUERY_STRING" => "instrument=true")
       expect(status).to eq(200)
       expect(headers).to include("Content-Type" => "application/javascript")
       expect(asset.source).to match(/var __cov_.+ = \(Function\('return this'\)\)\(\);/)