<NME> mocha-module-test.js
<BEF> ADDFILE
<MSG> Merge branch 'cowboyd-ensure-context-in-setup-blocks'

<DFF> @@ -0,0 +1,27 @@
+import { createModule } from 'ember-mocha/mocha-module';
+import { TestModule } from 'ember-test-helpers';
+
+describe('MochaModule', function() {
+  createModule(TestModule, 'component:x-foo', 'context', function() {
+    var thisInBefore, thisInBeforeEach;
+
+    before(function() {
+      thisInBefore = this;
+    });
+    beforeEach(function() {
+      thisInBeforeEach = this;
+    });
+    it("is preserved inside all assertions and hooks", function() {
+      expect(this).to.be.defined;
+      expect(this).to.equal(thisInBefore);
+      expect(this).to.equal(thisInBeforeEach);
+    });
+    afterEach(function() {
+      expect(this).to.equal(thisInBeforeEach);
+    });
+    after(function() {
+      expect(this).to.equal(thisInBefore);
+      expect(this).to.equal(thisInBeforeEach);
+    });
+  });
+});

Merge branch 'cowboyd-ensure-context-in-setup-blocks'