konacha 1.0.0 → 1.1.0

data/History.md

@@ -1,5 +1,9 @@
 # master
 
+# 1.1.0
+
+* Provided the ability to set mocha options via JS
+
 # 1.0.0
 
 * Do not time out after 300 seconds

data/README.md

@@ -108,6 +108,23 @@ Capybara driver used for the `run` task (try `:webkit`, after installing
 
 The values above are the defaults.
 
+### Mocha Configuration
+
+You can customize the Mocha options passed into `mocha.setup(..)` by creating a file
+named `konacha_config.js` or `konacha_config.js.coffee` in `spec/javascripts` and
+setting properties of `Konacha.mochaOptions`:
+
+    // ignore the following globals during leak detection
+    Konacha.mochaOptions.globals = ['YUI'];
+
+    // or, ignore all leaks
+    Konacha.mochaOptions.ignoreLeaks = true;
+
+    // set slow test timeout in ms
+    Konacha.mochaOptions.timeout = 5;
+
+The `ui` and `reporter` Mocha options are set by Konacha and must not be modified.
+
 ## Test Interface and Assertions
 
 Konacha includes a vendored copy of mocha.js and the [chai](http://chaijs.com/)
@@ -124,24 +141,24 @@ for some jQuery-specific assertions.
 
 One problem often faced when writing unit tests for client side code is that changes
 to the page are not reverted for the next example, so that successive examples become
-dependent on each other. Konacha adds a special div to your page with an id of `test`.
+dependent on each other. Konacha adds a special div to your page with an id of `konacha`.
 This div is automatically emptied before each example. You should avoid appending markup
-to the page body and instead append it to this test div:
+to the page body and instead append it to the `#konacha` div:
 
     describe "transactions", ->
       it "should add stuff in one test...", ->
-        $('#test').append('<h1 id="added">New Stuff</h1>')
-        $('#test h1#added').length.should.equal(1)
+        $('#konacha').append('<h1 id="added">New Stuff</h1>')
+        $('#konacha h1#added').length.should.equal(1)
 
       it "... should have been removed before the next starts", ->
-        $('#test h1#added').length.should.equal(0)
+        $('#konacha h1#added').length.should.equal(0)
 
 ## Templates / Fixtures
 
 Konacha has no template (a.k.a. HTML fixture) support of its own. Instead, we suggest you use
 Sprocket's built in support for JavaScript template (`.jst`) files. Add a `spec/javascripts/templates`
 directory, place template files there (using any JS template language supported by Sprockets),
-require them in your spec or spec_helper, and render them into the `#test` div.
+require them in your spec or spec_helper, and render them into the `#konacha` div.
 
 For example, in `spec/javascripts/templates/hello.jst.ejs`:
 
@@ -157,8 +174,8 @@ And your spec:
 
     describe("templating", function(){
       it("is built in to Sprockets", function(){
-        $('#test').html(JST['templates/hello']());
-        $('#test h1').text().should.equal('Hello Konacha!');
+        $('#konacha').html(JST['templates/hello']());
+        $('#konacha h1').text().should.equal('Hello Konacha!');
       });
     });
 

data/app/views/konacha/specs/specs.html.erb

@@ -6,8 +6,9 @@
     <%= stylesheet_link_tag "mocha",   :debug => false %>
     <%= stylesheet_link_tag "konacha", :debug => false %>
     <%= javascript_include_tag "mocha", "chai", "konacha/#{Konacha.mode}", :debug => false %>
+    <%= javascript_include_tag("konacha_config", :debug => false) if Rails.application.assets.find_asset('konacha_config') %>
     <script>
-      mocha.setup({ui: "bdd", reporter: Konacha.Reporter});
+      mocha.setup(Konacha.mochaOptions);
 
       beforeEach(function () {
         var e = document.getElementById('konacha'),

data/konacha.gemspec

@@ -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       = "1.0.0"
+  gem.version       = "1.1.0"
 
   gem.add_dependency "rails", "~> 3.1"
   gem.add_dependency "capybara"

data/lib/assets/javascripts/konacha/runner.js

@@ -1,34 +1,38 @@
 window.Konacha = {
   dots:"",
 
-  Reporter:function (runner) {
-    window.mocha.reporters.Base.call(this, runner);
+  mochaOptions: {
+    ui: 'bdd',
 
-    runner.on('start', function () {
-      Konacha.results = [];
-    });
+    reporter: function (runner) {
+      window.mocha.reporters.Base.call(this, runner);
 
-    runner.on('pass', function (test) {
-      Konacha.dots += ".";
-      Konacha.results.push({
-        name:test.title,
-        passed:true
+      runner.on('start', function () {
+        Konacha.results = [];
       });
-    });
 
-    runner.on('fail', function (test) {
-      Konacha.dots += "F";
-      Konacha.results.push({
-        name:test.title,
-        passed:false,
-        message:test.err.message,
-        trace:test.err.stack
+      runner.on('pass', function (test) {
+        Konacha.dots += ".";
+        Konacha.results.push({
+          name:test.title,
+          passed:true
+        });
       });
-    });
 
-    runner.on('end', function () {
-      Konacha.done = true;
-    });
+      runner.on('fail', function (test) {
+        Konacha.dots += "F";
+        Konacha.results.push({
+          name:test.title,
+          passed:false,
+          message:test.err.message,
+          trace:test.err.stack
+        });
+      });
+
+      runner.on('end', function () {
+        Konacha.done = true;
+      });
+    }
   },
 
   getResults:function () {

data/lib/assets/javascripts/konacha/server.js

@@ -1,3 +1,6 @@
 window.Konacha = {
-  Reporter: mocha.reporters.HTML
+  mochaOptions: {
+    ui: 'bdd',
+    reporter: mocha.reporters.HTML
+  }
 };

data/spec/dummy/spec/javascripts/konacha_config.js

@@ -0,0 +1,2 @@
+// ignore the following globals during leak detection
+Konacha.mochaOptions.globals = ['YUI'];

data/spec/dummy/spec/javascripts/konacha_config_spec.js

@@ -0,0 +1,9 @@
+//= require spec_helper
+
+describe("Konacha.mochaOptions", function(){
+  it("overrides the default globals ignore", function(){
+    var options = Konacha.mochaOptions;
+    options.globals.should.not.be.undefined;
+    options.globals.should.eql(['YUI']);
+  });
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70269063583640 !ruby/object:Gem::Requirement
+  requirement: &70238910364860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70269063583640
+  version_requirements: *70238910364860
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70269063583240 !ruby/object:Gem::Requirement
+  requirement: &70238910364460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70269063583240
+  version_requirements: *70238910364460
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70269063582780 !ruby/object:Gem::Requirement
+  requirement: &70238910364000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269063582780
+  version_requirements: *70238910364000
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70269063582360 !ruby/object:Gem::Requirement
+  requirement: &70238910363580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269063582360
+  version_requirements: *70238910363580
 - !ruby/object:Gem::Dependency
   name: capybara-firebug
-  requirement: &70269063581860 !ruby/object:Gem::Requirement
+  requirement: &70238910363080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70269063581860
+  version_requirements: *70238910363080
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70269063581440 !ruby/object:Gem::Requirement
+  requirement: &70238910362660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269063581440
+  version_requirements: *70238910362660
 - !ruby/object:Gem::Dependency
   name: ejs
-  requirement: &70269063580980 !ruby/object:Gem::Requirement
+  requirement: &70238910362200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269063580980
+  version_requirements: *70238910362200
 - !ruby/object:Gem::Dependency
   name: vendorer
-  requirement: &70269063580560 !ruby/object:Gem::Requirement
+  requirement: &70238910361780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70269063580560
+  version_requirements: *70238910361780
 description: ! 'Konacha is a Rails engine that allows you to test your JavaScript
   with the
 
@@ -151,6 +151,8 @@ files:
 - spec/dummy/spec/javascripts/array_sum_js_spec.js
 - spec/dummy/spec/javascripts/assert_spec.js.coffee
 - spec/dummy/spec/javascripts/failing_spec.js
+- spec/dummy/spec/javascripts/konacha_config.js
+- spec/dummy/spec/javascripts/konacha_config_spec.js
 - spec/dummy/spec/javascripts/spec_helper.js
 - spec/dummy/spec/javascripts/spec_helper_spec.js
 - spec/dummy/spec/javascripts/subdirectory/subdirectory_spec.js
@@ -206,6 +208,8 @@ test_files:
 - spec/dummy/spec/javascripts/array_sum_js_spec.js
 - spec/dummy/spec/javascripts/assert_spec.js.coffee
 - spec/dummy/spec/javascripts/failing_spec.js
+- spec/dummy/spec/javascripts/konacha_config.js
+- spec/dummy/spec/javascripts/konacha_config_spec.js
 - spec/dummy/spec/javascripts/spec_helper.js
 - spec/dummy/spec/javascripts/spec_helper_spec.js
 - spec/dummy/spec/javascripts/subdirectory/subdirectory_spec.js