Commit b609bbee by Vik Paruchuri

Fix JS tests

parent c4b9288c
...@@ -29,6 +29,7 @@ describe 'CombinedOpenEnded', -> ...@@ -29,6 +29,7 @@ describe 'CombinedOpenEnded', ->
beforeEach => beforeEach =>
# setup the spies # setup the spies
@combined = new CombinedOpenEnded @element @combined = new CombinedOpenEnded @element
spyOn(@combined, 'reload').andCallFake -> return 0
window.setTimeout = jasmine.createSpy().andCallFake (callback, timeout) -> return 5 window.setTimeout = jasmine.createSpy().andCallFake (callback, timeout) -> return 5
it 'polls at the correct intervals', => it 'polls at the correct intervals', =>
...@@ -44,6 +45,7 @@ describe 'CombinedOpenEnded', -> ...@@ -44,6 +45,7 @@ describe 'CombinedOpenEnded', ->
@combined.poll() @combined.poll()
expect(window.queuePollerID).toBeUndefined() expect(window.queuePollerID).toBeUndefined()
expect(window.setTimeout).not.toHaveBeenCalled() expect(window.setTimeout).not.toHaveBeenCalled()
expect(@combined.reload).toHaveBeenCalled()
describe 'rebind', -> describe 'rebind', ->
beforeEach -> beforeEach ->
......
...@@ -329,7 +329,7 @@ class @CombinedOpenEnded ...@@ -329,7 +329,7 @@ class @CombinedOpenEnded
$.postWithPrefix "#{@ajax_url}/check_for_score", (response) => $.postWithPrefix "#{@ajax_url}/check_for_score", (response) =>
if response.state == "done" or response.state=="post_assessment" if response.state == "done" or response.state=="post_assessment"
delete window.queuePollerID delete window.queuePollerID
location.reload() @reload
else else
window.queuePollerID = window.setTimeout(@poll, 10000) window.queuePollerID = window.setTimeout(@poll, 10000)
...@@ -353,3 +353,7 @@ class @CombinedOpenEnded ...@@ -353,3 +353,7 @@ class @CombinedOpenEnded
new_text = '' new_text = ''
new_text = "<span class='#{answer_class}' id='#{answer_id}'>#{answer_val}</span>" new_text = "<span class='#{answer_class}' id='#{answer_id}'>#{answer_val}</span>"
@answer_area.replaceWith(new_text) @answer_area.replaceWith(new_text)
# wrap this so that it can be mocked
reload: ->
location.reload()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment