RubyGems - konacha - Versions diffs - 2.7.0 → 3.0.0 - Mend

konacha 2.7.0 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

data/.travis.yml +0 -4
data/Gemfile +0 -3
data/Gemfile-rails4 +0 -3
data/History.md +8 -0
data/README.md +3 -35
data/app/assets/javascripts/konacha/iframe.js +7 -0
data/konacha.gemspec +3 -2
data/lib/konacha.rb +1 -1
data/lib/konacha/engine.rb +11 -0
data/lib/konacha/runner.rb +1 -12
data/spec/dummy/spec/javascripts/failing_spec.js +9 -0
data/spec/engine_spec.rb +31 -0
data/spec/runner_spec.rb +20 -17
data/spec/spec_helper.rb +7 -0
data/vendor/assets/javascripts/mocha.js +103 -68
data/vendor/assets/stylesheets/mocha.css +16 -12
metadata +22 -10

data/.travis.yml CHANGED

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
 gemfile:
@@ -10,8 +9,5 @@ before_script:
   - sh -e /etc/init.d/xvfb start
   - export DISPLAY=:99.0
 matrix:
-  exclude:
-    - gemfile: Gemfile-rails4
-      rvm: 1.8.7
   allow_failures:
     - { gemfile: Gemfile-rails4 }

data/Gemfile CHANGED

@@ -1,5 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-# https://github.com/jonleighton/poltergeist/issues/320
-gem 'faye-websocket', '~> 0.4.4'

data/Gemfile-rails4 CHANGED

@@ -5,6 +5,3 @@ gem "railties",        github: "rails/rails"
 gem "activemodel",     github: "rails/rails"
 gem "journey",         github: "rails/journey"
 gem "sprockets-rails", github: "rails/sprockets-rails"
-# https://github.com/jonleighton/poltergeist/issues/320
-gem 'faye-websocket', '~> 0.4.4'

data/History.md CHANGED

@@ -1,5 +1,13 @@
 # master
+# 3.0.0
+* Update mocha (1.10.0)
+* Fix reporting of errors in asynchronous tests (#136)
+* Add a Konacha.config option to set formatters (#137)
+* Test against latest version of Poltergeist
+* Ruby 1.8.7 is no longer supported
 # 2.7.0
 * Fix semantics of pending event for RSpec reporters (#131, #132)

data/README.md CHANGED

@@ -255,42 +255,10 @@ describe("templating", function() {
 });
 ```
-## Upgrading from Konacha 1.x
+## Upgrading from Konacha 2.x
-### Iframe
-As of Konacha 2.0, each test file is run inside an isolated iframe. For
-compatibility with Konacha 1.x, the iframe's `<body>` element will have
-`id="konacha"` set on it.
-Previously, all test files would run in the same environment. Thus, if only
-one test file pulled in an external library, all tests would be able to use
-it. Now test files are run in isolation. If you encounter an undefined
-JavaScript module in your test, you may be missing an explicit `//= require`
-call somewhere.
-### Options
-In Konacha 1.x you would set `Konacha.mochaOptions` in `konacha_config.js`:
-```javascript
-// Old syntax
-Konacha.mochaOptions.ignoreLeaks = true;
-```
-The `konacha_config.js` file is no longer used by Konacha 2.0. Instead, call
-Mocha's own methods in [`spec_helper.js`](#spec-helper):
-```javascript
-// New syntax
-mocha.ignoreLeaks();
-```
-### Global `mocha`
-Konacha 2.0 ships with an upgraded Mocha. Some objects that were previously
-available on the global `mocha` object might now be located on `Mocha`. If you
-get an error message to this effect, adjust your code accordingly.
+The only backward-incompatible change in Konacha 3.0 is that Ruby 1.8.7 is
+no longer supported. Please upgrade to 1.9.3 or 2.0.
 ## Contributing

data/app/assets/javascripts/konacha/iframe.js CHANGED

@@ -5,6 +5,13 @@ window.Konacha = {
   }
 };
+// Push errors to parent iframe.
+window.onerror = function() {
+  if (parent.onerror) {
+    return parent.onerror.apply(parent, arguments);
+  }
+};
 window.Mocha = Object.create(parent.Mocha);
 window.mocha = Object.create(parent.mocha);

data/konacha.gemspec CHANGED

@@ -17,7 +17,7 @@ the asset pipeline and engines.}
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "konacha"
   gem.require_paths = ["lib"]
-  gem.version       = "2.7.0"
+  gem.version       = "3.0.0"
   gem.license       = "MIT"
   gem.add_dependency "railties", ">= 3.1", "< 5"
@@ -32,5 +32,6 @@ the asset pipeline and engines.}
   gem.add_development_dependency "coffee-script"
   gem.add_development_dependency "ejs"
   gem.add_development_dependency "tzinfo"
-  gem.add_development_dependency "poltergeist", "~> 1.0.2"
+  gem.add_development_dependency "selenium-webdriver"
+  gem.add_development_dependency "poltergeist", "~> 1.3.0"
 end

data/lib/konacha.rb CHANGED

@@ -29,7 +29,7 @@ module Konacha
       yield config
     end
-    delegate :port, :spec_dir, :spec_matcher, :application, :driver, :runner_port, :to => :config
+    delegate :port, :spec_dir, :spec_matcher, :application, :driver, :runner_port, :formatters, :to => :config
     def spec_root
       File.join(Rails.root, config.spec_dir)

data/lib/konacha/engine.rb CHANGED

@@ -20,6 +20,16 @@ module Konacha
       end
     end
+    def self.formatters
+      if ENV['FORMAT']
+        ENV['FORMAT'].split(',').map do |string|
+          eval(string).new(STDOUT)
+        end
+      else
+        [Konacha::Formatter.new(STDOUT)]
+      end
+    end
     initializer "konacha.environment" do |app|
       options = app.config.konacha
@@ -31,6 +41,7 @@ module Konacha
       options.stylesheets  ||= %w(application)
       options.verbose      ||= false
       options.runner_port  ||= nil
+      options.formatters   ||= self.class.formatters
       app.config.assets.paths << app.root.join(options.spec_dir).to_s
     end

data/lib/konacha/runner.rb CHANGED

@@ -11,7 +11,7 @@ module Konacha
     def initialize(session = nil)
       @session = session
-      @reporter = Konacha::Reporter.new(*formatters)
+      @reporter = Konacha::Reporter.new(*Konacha.formatters)
     end
     def run(path = '/')
@@ -40,16 +40,5 @@ module Konacha
     def session
       @session ||= Capybara::Session.new(Konacha.driver, Konacha.application)
     end
-    private
-    def formatters
-      if ENV['FORMAT']
-        ENV['FORMAT'].split(',').map do |string|
-          eval(string).new(STDOUT)
-        end
-      else
-        [Konacha::Formatter.new(STDOUT)]
-      end
-    end
   end
 end

data/spec/dummy/spec/javascripts/failing_spec.js CHANGED

@@ -8,4 +8,13 @@ describe("failure", function(){
     // throwing real Error objects.
     throw new Error("this one errors out");
   });
+  it("errors asynchronously", function(done) {
+    setTimeout(function() {
+      (2 + 2).should.equal(5);
+    }, 0);
+    setTimeout(function() {
+      done();
+    }, 10);
+  });
 });

data/spec/engine_spec.rb ADDED

@@ -0,0 +1,31 @@
+require 'spec_helper'
+describe Konacha::Engine do
+  describe ".formatters" do
+    it "defaults to a Konacha::Formatter pointing to STDOUT" do
+      Konacha::Formatter.should_receive(:new).with(STDOUT) { :formatter }
+      Konacha::Engine.formatters.should == [:formatter]
+    end
+    context "with a FORMAT environment variable" do
+      before do
+        class TestFormatter
+          def initialize(io)
+          end
+        end
+        ENV['FORMAT'] = 'Konacha::Formatter,TestFormatter'
+      end
+      after do
+        Object.send(:remove_const, :TestFormatter)
+        ENV.delete('FORMAT')
+      end
+      it "creates the specified formatters" do
+        Konacha::Formatter.should_receive(:new).with(STDOUT) { :formatter }
+        TestFormatter.should_receive(:new).with(STDOUT) { :test_formatter }
+        Konacha::Engine.formatters.should == [:formatter, :test_formatter]
+      end
+    end
+  end
+end

data/spec/runner_spec.rb CHANGED

@@ -3,25 +3,12 @@ require 'spec_helper'
 describe Konacha::Runner do
   before do
     Konacha.mode = :runner
-    STDOUT.stub(:puts)
   end
-  describe ".new" do
-    before do
-      class TestFormatter
-        def initialize(io)
-        end
-      end
-      ENV['FORMAT'] = 'Konacha::Formatter,TestFormatter'
-    end
-    after do
-      Object.send(:remove_const, :TestFormatter)
-      ENV.delete('FORMAT')
-    end
-    it "initializes a reporter with formatters named by the FORMAT environment variable" do
-      Konacha::Reporter.should_receive(:new).with(instance_of(Konacha::Formatter), instance_of(TestFormatter))
+  describe ".new" do
+    it 'creates a reporter with formatters returned by Konacha.formatters' do
+      Konacha.should_receive(:formatters) { :formatters }
+      Konacha::Reporter.should_receive(:new).with(:formatters)
       described_class.new
     end
@@ -43,6 +30,7 @@ describe Konacha::Runner do
     before do
       Konacha.configure do |config|
         config.driver = driver
+        config.formatters = [Konacha::Formatter.new(StringIO.new)]
       end
     end
@@ -101,6 +89,20 @@ describe Konacha::Runner do
            'error'           => {'message' => 'this one errors out', 'name' => 'Error'}}}
       end
+      let(:error_async) do
+        {'event' => 'fail',
+         'type'  => 'test',
+         'data'  => {
+           'title'           => 'errors asynchronously',
+           'fullTitle'       => 'failure errors asynchronously',
+           'parentFullTitle' => 'failure',
+           'status'          => 'failed',
+           'path'            => 'failing_spec.js',
+           # Accept anything for 'message' since async errors have URLs, which
+           # vary on every run, and line #, which may change in Chai releases.
+           'error'           => {'message' => anything(), 'name' => 'Error'}}}
+      end
       let(:pass) do
         {'event' => 'pass',
          'type'  => 'test',
@@ -134,6 +136,7 @@ describe Konacha::Runner do
         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)
         subject.reporter.should_receive(:process_mocha_event).with(end_event)

data/spec/spec_helper.rb CHANGED

@@ -21,6 +21,13 @@ Capybara.configure do |config|
   config.app              = Konacha.application
 end
+Capybara.register_driver :poltergeist do |app|
+  # Work around a bug in PhantomJS where `return true` from a
+  # window.onerror handler does not prevent an uncaught exception
+  # from being reported to Ruby.
+  Capybara::Poltergeist::Driver.new(app, :js_errors => false)
+end
 module Konacha
   module FeatureSpec
     def app

data/vendor/assets/javascripts/mocha.js CHANGED

@@ -1053,7 +1053,7 @@ var Suite = require('../suite')
 module.exports = function(suite){
   var suites = [suite];
-  suite.on('pre-require', function(context){
+  suite.on('pre-require', function(context, file, mocha){
     /**
      * Execute before running tests.
@@ -1095,6 +1095,16 @@ module.exports = function(suite){
       if (suites.length > 1) suites.shift();
       var suite = Suite.create(suites[0], title);
       suites.unshift(suite);
+      return suite;
+    };
+    /**
+     * Exclusive test-case.
+     */
+    context.suite.only = function(title, fn){
+      var suite = context.suite(title, fn);
+      mocha.grep(suite.fullTitle());
     };
     /**
@@ -1104,7 +1114,26 @@ module.exports = function(suite){
      */
     context.test = function(title, fn){
-      suites[0].addTest(new Test(title, fn));
+      var test = new Test(title, fn);
+      suites[0].addTest(test);
+      return test;
+    };
+    /**
+     * Exclusive test-case.
+     */
+    context.test.only = function(title, fn){
+      var test = context.test(title, fn);
+      mocha.grep(test.fullTitle());
+    };
+    /**
+     * Pending test case.
+     */
+    context.test.skip = function(title){
+      context.test(title);
     };
   });
 };
@@ -1815,10 +1844,7 @@ exports.list = function(failures){
     // actual / expected diff
     if ('string' == typeof actual && 'string' == typeof expected) {
-      var len = Math.max(actual.length, expected.length);
-      if (len < 20) msg = errorDiff(err, 'Chars', escape);
-      else msg = errorDiff(err, 'Words', escape);
+      msg = errorDiff(err, 'Words', escape);
       // linenos
       var lines = msg.split('\n');
@@ -4583,6 +4609,8 @@ Runner.prototype.run = function(fn){
 function filterLeaks(ok, globals) {
   return filter(globals, function(key){
+    // Firefox and Chrome exposes iframes as index inside the window object
+    if (/^d+/.test(key)) return false;
     var matched = filter(ok, function(ok){
       if (~ok.indexOf('*')) return 0 == key.indexOf(ok.split('*')[0]);
       // Opera and IE expose global variables for HTML element IDs (issue #243)
@@ -5224,6 +5252,17 @@ exports.highlightTags = function(name) {
 };
 }); // module: utils.js
+/**
+ * Save timer references to avoid Sinon interfering (see GH-237).
+ */
+var Date = window.Date;
+var setTimeout = window.setTimeout;
+var setInterval = window.setInterval;
+var clearTimeout = window.clearTimeout;
+var clearInterval = window.clearInterval;
 /**
  * Node shims.
  *
@@ -5233,7 +5272,7 @@ exports.highlightTags = function(name) {
  * the browser.
  */
-process = {};
+var process = {};
 process.exit = function(status){};
 process.stdout = {};
 global = window;
@@ -5260,79 +5299,75 @@ process.on = function(e, fn){
   }
 };
-// boot
-;(function(){
-  /**
-   * Expose mocha.
-   */
+/**
+ * Expose mocha.
+ */
-  var Mocha = window.Mocha = require('mocha'),
-      mocha = window.mocha = new Mocha({ reporter: 'html' });
+var Mocha = window.Mocha = require('mocha'),
+    mocha = window.mocha = new Mocha({ reporter: 'html' });
-  var immediateQueue = []
-    , immediateTimeout;
+var immediateQueue = []
+  , immediateTimeout;
-  function timeslice() {
-    var immediateStart = new Date().getTime();
-    while (immediateQueue.length && (new Date().getTime() - immediateStart) < 100) {
-      immediateQueue.shift()();
-    }
-    if (immediateQueue.length) {
-      immediateTimeout = setTimeout(timeslice, 0);
-    } else {
-      immediateTimeout = null;
-    }
+function timeslice() {
+  var immediateStart = new Date().getTime();
+  while (immediateQueue.length && (new Date().getTime() - immediateStart) < 100) {
+    immediateQueue.shift()();
+  }
+  if (immediateQueue.length) {
+    immediateTimeout = setTimeout(timeslice, 0);
+  } else {
+    immediateTimeout = null;
   }
+}
-  /**
-   * High-performance override of Runner.immediately.
-   */
+/**
+ * High-performance override of Runner.immediately.
+ */
-  Mocha.Runner.immediately = function(callback) {
-    immediateQueue.push(callback);
-    if (!immediateTimeout) {
-      immediateTimeout = setTimeout(timeslice, 0);
-    }
-  };
+Mocha.Runner.immediately = function(callback) {
+  immediateQueue.push(callback);
+  if (!immediateTimeout) {
+    immediateTimeout = setTimeout(timeslice, 0);
+  }
+};
-  /**
-   * Override ui to ensure that the ui functions are initialized.
-   * Normally this would happen in Mocha.prototype.loadFiles.
-   */
+/**
+ * Override ui to ensure that the ui functions are initialized.
+ * Normally this would happen in Mocha.prototype.loadFiles.
+ */
-  mocha.ui = function(ui){
-    Mocha.prototype.ui.call(this, ui);
-    this.suite.emit('pre-require', window, null, this);
-    return this;
-  };
+mocha.ui = function(ui){
+  Mocha.prototype.ui.call(this, ui);
+  this.suite.emit('pre-require', window, null, this);
+  return this;
+};
-  /**
-   * Setup mocha with the given setting options.
-   */
+/**
+ * Setup mocha with the given setting options.
+ */
-  mocha.setup = function(opts){
-    if ('string' == typeof opts) opts = { ui: opts };
-    for (var opt in opts) this[opt](opts[opt]);
-    return this;
-  };
+mocha.setup = function(opts){
+  if ('string' == typeof opts) opts = { ui: opts };
+  for (var opt in opts) this[opt](opts[opt]);
+  return this;
+};
-  /**
-   * Run mocha, returning the Runner.
-   */
+/**
+ * Run mocha, returning the Runner.
+ */
-  mocha.run = function(fn){
-    var options = mocha.options;
-    mocha.globals('location');
+mocha.run = function(fn){
+  var options = mocha.options;
+  mocha.globals('location');
-    var query = Mocha.utils.parseQuery(window.location.search || '');
-    if (query.grep) mocha.grep(query.grep);
-    if (query.invert) mocha.invert();
+  var query = Mocha.utils.parseQuery(window.location.search || '');
+  if (query.grep) mocha.grep(query.grep);
+  if (query.invert) mocha.invert();
-    return Mocha.prototype.run.call(mocha, function(){
-      Mocha.utils.highlightTags('code');
-      if (fn) fn();
-    });
-  };
-})();
+  return Mocha.prototype.run.call(mocha, function(){
+    Mocha.utils.highlightTags('code');
+    if (fn) fn();
+  });
+};
 })();

data/vendor/assets/stylesheets/mocha.css CHANGED

@@ -1,8 +1,12 @@
 @charset "utf-8";
 body {
+  margin:0;
+}
+#mocha {
   font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
-  padding: 60px 50px;
+  margin: 60px 50px;
 }
 #mocha ul, #mocha li {
@@ -38,7 +42,7 @@ body {
   font-size: .8em;
 }
-.hidden {
+#mocha .hidden {
   display: none;
 }
@@ -59,7 +63,7 @@ body {
 #mocha .test.pending:hover h2::after {
   content: '(pending)';
-  font-family: arial;
+  font-family: arial, sans-serif;
 }
 #mocha .test.pass.medium .duration {
@@ -185,7 +189,7 @@ body {
 #mocha-error {
   color: #c00;
-  font-size: 1.5  em;
+  font-size: 1.5em;
   font-weight: 100;
   letter-spacing: 1px;
 }
@@ -229,18 +233,18 @@ body {
   height: 40px;
 }
-code .comment { color: #ddd }
-code .init { color: #2F6FAD }
-code .string { color: #5890AD }
-code .keyword { color: #8A6343 }
-code .number { color: #2F6FAD }
+#mocha code .comment { color: #ddd }
+#mocha code .init { color: #2F6FAD }
+#mocha code .string { color: #5890AD }
+#mocha code .keyword { color: #8A6343 }
+#mocha code .number { color: #2F6FAD }
 @media screen and (max-device-width: 480px) {
-  body {
-    padding: 60px 0px;
+  #mocha  {
+    margin: 60px 0px;
   }
-  #stats {
+  #mocha #stats {
     position: absolute;
   }
 }

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 3.0.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -199,6 +199,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +222,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -214,7 +230,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.3.0
 description: ! 'Konacha is a Rails engine that allows you to test your JavaScript
   with the
@@ -297,6 +313,7 @@ files:
 - spec/dummy/spec/javascripts/templates/hello.jst.ejs
 - spec/dummy/spec/javascripts/templating_spec.js
 - spec/dummy/spec/javascripts/ui_spec.js
+- spec/engine_spec.rb
 - spec/error_handling_spec.rb
 - spec/formatter_spec.rb
 - spec/konacha_spec.rb
@@ -326,18 +343,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3177740356204652019
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3177740356204652019
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.23
@@ -377,6 +388,7 @@ test_files:
 - spec/dummy/spec/javascripts/templates/hello.jst.ejs
 - spec/dummy/spec/javascripts/templating_spec.js
 - spec/dummy/spec/javascripts/ui_spec.js
+- spec/engine_spec.rb
 - spec/error_handling_spec.rb
 - spec/formatter_spec.rb
 - spec/konacha_spec.rb