Merge pull request #1614 from velesin/integration_test_helper_improvement

enables passing additional setup / teardown code to integration test helper
This commit is contained in:
Robin Ward 2013-11-05 10:39:39 -08:00
commit bba5631923

View file

@ -1,12 +1,20 @@
function integration(name) { function integration(name, lifecycle) {
module("Integration: " + name, { module("Integration: " + name, {
setup: function() { setup: function() {
sinon.stub(Discourse.ScrollingDOMMethods, "bindOnScroll"); sinon.stub(Discourse.ScrollingDOMMethods, "bindOnScroll");
sinon.stub(Discourse.ScrollingDOMMethods, "unbindOnScroll"); sinon.stub(Discourse.ScrollingDOMMethods, "unbindOnScroll");
Ember.run(Discourse, Discourse.advanceReadiness); Ember.run(Discourse, Discourse.advanceReadiness);
if (lifecycle && lifecycle.setup) {
lifecycle.setup.call(this);
}
}, },
teardown: function() { teardown: function() {
if (lifecycle && lifecycle.teardown) {
lifecycle.teardown.call(this);
}
Discourse.reset(); Discourse.reset();
Discourse.ScrollingDOMMethods.bindOnScroll.restore(); Discourse.ScrollingDOMMethods.bindOnScroll.restore();
Discourse.ScrollingDOMMethods.unbindOnScroll.restore(); Discourse.ScrollingDOMMethods.unbindOnScroll.restore();