konacha 2.0.0.beta1 → 2.0.0.beta2

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

@@ -1,6 +1,3 @@
-window.mocha = parent.mocha;
-window.Mocha = parent.Mocha;
-
 window.Konacha = {
   reset: function() {
     document.body = document.createElement('body');
@@ -8,19 +5,26 @@ window.Konacha = {
   }
 };
 
-var suite = Mocha.Suite.create(mocha.suite);
+window.Mocha = Object.create(parent.Mocha);
+window.mocha = Object.create(parent.mocha);
+
+// In order to isolate top-level before/beforeEach hooks,
+// the specs in each iframe are wrapped in an anonymous suite.
+mocha.suite = Mocha.Suite.create(mocha.suite);
 
+// Override mocha.ui so that the pre-require event is emitted
+// with the iframe's `window` reference, rather than the parent's.
 mocha.ui = function (name) {
   this._ui = Mocha.interfaces[name];
   if (!this._ui) throw new Error('invalid interface "' + name + '"');
-  this._ui = this._ui(suite);
-  suite.emit('pre-require', window, null, this);
+  this._ui = this._ui(this.suite);
+  this.suite.emit('pre-require', window, null, this);
   return this;
 };
 
 mocha.ui('bdd');
 
-suite.beforeAll(function () {
+mocha.suite.beforeAll(function () {
   var contexts = parent.document.getElementsByClassName("test-context");
   for (var i = 0; i < contexts.length; ++i) {
     if (contexts[i].contentWindow == window) {
@@ -31,7 +35,7 @@ suite.beforeAll(function () {
   }
 });
 
-suite.beforeEach(function () {
+mocha.suite.beforeEach(function () {
   Konacha.reset();
 });
 

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       = "2.0.0.beta1"
+  gem.version       = "2.0.0.beta2"
 
   gem.add_dependency "railties", "~> 3.1"
   gem.add_dependency "actionpack", "~> 3.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Unit-test your Rails JavaScript with the mocha test framework and chai assertion