<NME> shims-test.js
<BEF> import { mocha, describe, context, it, before, after, beforeEach, afterEach } from 'mocha';
import { expect } from 'chai';

import Ember from 'ember';

describe('mocha-shim', function() {

  describe('beforeEach and afterEach', function() {
    beforeEach(function() {
      this.beforeEachRunLoop = Ember.run.currentRunLoop;
    });

    afterEach(function() {
      expect(Ember.run.currentRunLoop).to.be.null;
    });

    it('do not use the runloop', function() {
      expect(this.beforeEachRunLoop).to.be.null;
    });
  });

  describe('before and after', function() {
    before(function() {
      this.beforeRunLoop = Ember.run.currentRunLoop;
    });

    after(function() {
      expect(Ember.run.currentRunLoop).to.be.null;
    });

    it('do not use the runloop', function() {
      expect(this.beforeRunLoop).to.be.null;
    });
  });

  it('should export global variables defined by mocha', function() {
    expect(mocha).to.equal(window.mocha);
    expect(describe).to.equal(window.describe);
    expect(context).to.equal(window.context);
    expect(it).to.equal(window.it);
    expect(before).to.equal(window.before);
    expect(after).to.equal(window.after);
    expect(beforeEach).to.equal(window.beforeEach);
    expect(afterEach).to.equal(window.afterEach);
  });
});

<MSG> Revert "Merge pull request #164 from akatov/remove-wrap-in-runloop"

This temporarily reverts commit 202e524a65642a9223863225617ec573ff29db15, reversing
changes made to 054ff529001ac39cfd2c65e10d397f3fd3e6a838.

# Conflicts:
#	tests/unit/shims-test.js

<DFF> @@ -11,11 +11,11 @@ describe('mocha-shim', function() {
     });
 
     afterEach(function() {
-      expect(Ember.run.currentRunLoop).to.be.null;
+      expect(Ember.run.currentRunLoop).to.be.ok;
     });
 
-    it('do not use the runloop', function() {
-      expect(this.beforeEachRunLoop).to.be.null;
+    it('does use the runloop', function() {
+      expect(this.beforeEachRunLoop).to.be.ok;
     });
   });
 
@@ -40,7 +40,7 @@ describe('mocha-shim', function() {
     expect(it).to.equal(window.it);
     expect(before).to.equal(window.before);
     expect(after).to.equal(window.after);
-    expect(beforeEach).to.equal(window.beforeEach);
-    expect(afterEach).to.equal(window.afterEach);
+    expect(beforeEach.withoutEmberRun).to.equal(window.beforeEach);
+    expect(afterEach.withoutEmberRun).to.equal(window.afterEach);
   });
 });

Revert "Merge pull request #164 from akatov/remove-wrap-in-runloop"