From b609bbeeed39bb5f4cc4413795fa01e7ece50a0e Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Fri, 1 Feb 2013 15:36:05 -0500 Subject: [PATCH] Fix JS tests --- .../xmodule/js/spec/combinedopenended/display_spec.coffee | 2 ++ .../xmodule/xmodule/js/src/combinedopenended/display.coffee | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee index ade0c39ca0..6777d8c794 100644 --- a/common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee +++ b/common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee @@ -29,6 +29,7 @@ describe 'CombinedOpenEnded', -> beforeEach => # setup the spies @combined = new CombinedOpenEnded @element + spyOn(@combined, 'reload').andCallFake -> return 0 window.setTimeout = jasmine.createSpy().andCallFake (callback, timeout) -> return 5 it 'polls at the correct intervals', => @@ -44,6 +45,7 @@ describe 'CombinedOpenEnded', -> @combined.poll() expect(window.queuePollerID).toBeUndefined() expect(window.setTimeout).not.toHaveBeenCalled() + expect(@combined.reload).toHaveBeenCalled() describe 'rebind', -> beforeEach -> diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index 2aabd35771..52fd4c2547 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -329,7 +329,7 @@ class @CombinedOpenEnded $.postWithPrefix "#{@ajax_url}/check_for_score", (response) => if response.state == "done" or response.state=="post_assessment" delete window.queuePollerID - location.reload() + @reload else window.queuePollerID = window.setTimeout(@poll, 10000) @@ -353,3 +353,7 @@ class @CombinedOpenEnded new_text = '' new_text = "#{answer_val}" @answer_area.replaceWith(new_text) + + # wrap this so that it can be mocked + reload: -> + location.reload()