diff --git a/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html b/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html index c7170d3472..447b49b8fb 100644 --- a/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html +++ b/common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html @@ -1,4 +1,6 @@ -
+
+
+

Problem 1

@@ -53,4 +55,69 @@
-
+
+ + +
+ +
+ Edit / + QA +
+
Staff Debug Info
+ + + + + +
+
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 02aaa50103..c45b26ddcd 100644 --- a/common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee +++ b/common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee @@ -3,13 +3,27 @@ describe 'CombinedOpenEnded', -> spyOn Logger, 'log' # load up some fixtures loadFixtures 'combined-open-ended.html' - @element = $('.combined-open-ended') + @element = $('.course-content') describe 'constructor', -> beforeEach -> + spyOn(Collapsible, 'setCollapsibles') @combined = new CombinedOpenEnded @element + it 'set the element', -> expect(@combined.element).toEqual @element + it 'get the correct values from data fields', -> + expect(@combined.ajax_url).toEqual '/courses/MITx/6.002x/2012_Fall/modx/i4x://MITx/6.002x/combinedopenended/CombinedOE' + expect(@combined.state).toEqual 'assessing' + expect(@combined.task_count).toEqual 2 + expect(@combined.task_number).toEqual 2 + + it 'subelements are made collapsible', -> + expect(Collapsible.setCollapsibles).toHaveBeenCalled() + + it 'elements are rebound for assessing state', -> + expect(@combined.answer_area.attr("disabled")).toBe("disabled") + expect(@combined.submit_button.val()).toBe("Submit assessment") diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index 370ef8d136..dc5c2bc329 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -7,7 +7,6 @@ class @CombinedOpenEnded @wrapper=$(element).find('section.xmodule_CombinedOpenEndedModule') @el = $(element).find('section.combined-open-ended') @combined_open_ended=$(element).find('section.combined-open-ended') - @id = @el.data('id') @ajax_url = @el.data('ajax-url') @state = @el.data('state') @task_count = @el.data('task-count')