Merge pull request #211 from outdooricon/mocha_2.3.0

Upgrade to Mocha 2.3.0
jfirebaugh · Sep 2, 2015 · a44f0b5 · a44f0b5
2 parents d4636e7 + ed61e53
commit a44f0b5
Show file tree

Hide file tree

Showing 7 changed files with 9,888 additions and 2,270 deletions.
diff --git a/app/assets/javascripts/konacha/parent.js b/app/assets/javascripts/konacha/parent.js
@@ -12,7 +12,11 @@ window.onload = function () {
         currentSuite = suite;
 
     while (!(specFilePath = currentSuite.path)) {
-      currentSuite = currentSuite.parent
+      if (currentSuite.parent) {
+        currentSuite = currentSuite.parent;
+      } else {
+        break;
+      }
     }
 
     specFilePath = /([^\.]*)/.exec(specFilePath)[1];

diff --git a/mocha b/mocha
diff --git a/spec/dummy/spec/javascripts/failing_spec.js b/spec/dummy/spec/javascripts/failing_spec.js
@@ -3,12 +3,6 @@ describe("failure", function(){
     (2 + 2).should.equal(5);
   });
 
-  it("errors", function() {
-    // Mocha catches and re-throws string exceptions, so we only need to test
-    // throwing real Error objects.
-    throw new Error("this one errors out");
-  });
-
   it("errors asynchronously", function(done) {
     setTimeout(function() {
       (2 + 2).should.equal(5);

diff --git a/spec/mocha_links_spec.rb b/spec/mocha_links_spec.rb
@@ -14,12 +14,12 @@
       subject{ page.find_link('A test suite') }
 
       it 'should contain spec path and grep string' do
-        subject['href'].should == "#{page.current_url}#{spec_file}?grep=#{URI.encode(suite_name)}"
+        subject['href'].should == "#{page.current_url}#{spec_file}/?grep=#{URI.encode(suite_name)}"
       end
     end
 
     describe 'replay link (arrow icon)' do
-      subject{ page.find(%Q{a[href="#{page.current_url}#{spec_file}?grep=#{URI.encode([suite_name, test_name].join(' '))}"]}) }
+      subject{ page.find(%Q{a[href="#{page.current_url}#{spec_file}/?grep=#{URI.encode([suite_name, test_name].join(' '))}"]}) }
 
       it 'should contain spec path and grep string' do
         subject.should_not be_nil

diff --git a/spec/runner_spec.rb b/spec/runner_spec.rb
@@ -69,6 +69,7 @@
         {'event' => 'fail',
          'type'  => 'test',
          'data'  => {
+           'duration'        => anything,
            'title'           => 'fails',
            'fullTitle'       => 'failure fails',
            'parentFullTitle' => 'failure',
@@ -77,18 +78,6 @@
            'error'           => {'message' => 'expected 4 to equal 5', 'name' => 'AssertionError'}}}
       end
 
-      let(:error) do
-        {'event' => 'fail',
-         'type'  => 'test',
-         'data'  => {
-           'title'           => 'errors',
-           'fullTitle'       => 'failure errors',
-           'parentFullTitle' => 'failure',
-           'status'          => 'failed',
-           'path'            => 'failing_spec.js',
-           'error'           => {'message' => 'this one errors out', 'name' => 'Error'}}}
-      end
-
       let(:error_async) do
         {'event' => 'fail',
          'type'  => 'test',
@@ -135,7 +124,6 @@
         subject.reporter.should_receive(:process_mocha_event).with(suite_end)
         subject.reporter.should_receive(:process_mocha_event).with(test)
         subject.reporter.should_receive(:process_mocha_event).with(failure)
-        subject.reporter.should_receive(:process_mocha_event).with(error)
         subject.reporter.should_receive(:process_mocha_event).with(error_async)
         subject.reporter.should_receive(:process_mocha_event).with(pass)
         subject.reporter.should_receive(:process_mocha_event).with(pending)