Commit 31cd7afc by M. Rehan

Merge pull request #11811 from edx/mrehan/tnl-4219-progress-detail-not-shown

render progress status while problem content rendering
parents 415c0ea6 167efea6
describe 'Problem', -> describe 'Problem', ->
problem_content_default = readFixtures('problem_content.html')
beforeEach -> beforeEach ->
# Stub MathJax # Stub MathJax
window.MathJax = window.MathJax =
...@@ -20,7 +22,7 @@ describe 'Problem', -> ...@@ -20,7 +22,7 @@ describe 'Problem', ->
spyOn Logger, 'log' spyOn Logger, 'log'
spyOn($.fn, 'load').andCallFake (url, callback) -> spyOn($.fn, 'load').andCallFake (url, callback) ->
$(@).html readFixtures('problem_content.html') $(@).html problem_content_default
callback() callback()
describe 'constructor', -> describe 'constructor', ->
...@@ -96,6 +98,13 @@ describe 'Problem', -> ...@@ -96,6 +98,13 @@ describe 'Problem', ->
@problem.renderProgressState() @problem.renderProgressState()
expect(@problem.$('.problem-progress').html()).toEqual "(1 point possible)" expect(@problem.$('.problem-progress').html()).toEqual "(1 point possible)"
it 'displays the number of points possible when rendering happens with the content', ->
@problem.el.data('progress_status', 'none')
@problem.el.data('progress_detail', '0/2')
expect(@problem.$('.problem-progress').html()).toEqual ""
@problem.render(problem_content_default)
expect(@problem.$('.problem-progress').html()).toEqual "(2 points possible)"
describe 'with any other valid status', -> describe 'with any other valid status', ->
it 'reports the current score', -> it 'reports the current score', ->
@problem.el.data('progress_status', 'foo') @problem.el.data('progress_status', 'foo')
...@@ -103,6 +112,13 @@ describe 'Problem', -> ...@@ -103,6 +112,13 @@ describe 'Problem', ->
@problem.renderProgressState() @problem.renderProgressState()
expect(@problem.$('.problem-progress').html()).toEqual "(1/1 point)" expect(@problem.$('.problem-progress').html()).toEqual "(1/1 point)"
it 'shows current score when rendering happens with the content', ->
@problem.el.data('progress_status', 'test status')
@problem.el.data('progress_detail', '2/2')
expect(@problem.$('.problem-progress').html()).toEqual ""
@problem.render(problem_content_default)
expect(@problem.$('.problem-progress').html()).toEqual "(2/2 points)"
describe 'render', -> describe 'render', ->
beforeEach -> beforeEach ->
@problem = new Problem($('.xblock-student_view')) @problem = new Problem($('.xblock-student_view'))
......
...@@ -159,6 +159,7 @@ class @Problem ...@@ -159,6 +159,7 @@ class @Problem
@setupInputTypes() @setupInputTypes()
@bind() @bind()
@queueing() @queueing()
@renderProgressState()
@el.attr('aria-busy', 'false') @el.attr('aria-busy', 'false')
else else
$.postWithPrefix "#{@url}/problem_get", (response) => $.postWithPrefix "#{@url}/problem_get", (response) =>
......
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