Merge pull request #1759 from MITx/bug/christina/grading

Bug fix for grading type not showing on course outline (#258).

cms/djangoapps/contentstore/features/subsection.feature

@@ -17,6 +17,14 @@ Feature: Create Subsection
     And I click to edit the subsection name
     Then I see the complete subsection name with a quote in the editor
 
+    Scenario: Assign grading type to a subsection and verify it is still shown after refresh (bug #258)
+    Given I have opened a new course section in Studio
+    And I have added a new subsection
+    And I mark it as Homework
+    Then I see it marked as Homework
+    And I reload the page
+    Then I see it marked as Homework
+
     @skip-phantom
     Scenario: Delete a subsection
     Given I have opened a new course section in Studio

cms/djangoapps/contentstore/features/subsection.py

@@ -40,7 +40,7 @@ def i_click_to_edit_subsection_name(step):
 def i_see_complete_subsection_name_with_quote_in_editor(step):
     css = '.subsection-display-name-input'
     assert world.is_css_present(css)
-    assert_equal(world.browser.find_by_css(css).value, 'Subsection With "Quote"')
+    assert_equal(world.css_find(css).value, 'Subsection With "Quote"')
 
 
 @step('I have added a new subsection$')
@@ -48,6 +48,17 @@ def i_have_added_a_new_subsection(step):
     add_subsection()
 
 
+@step('I mark it as Homework$')
+def i_mark_it_as_homework(step):
+    world.css_click('a.menu-toggle')
+    world.browser.click_link_by_text('Homework')
+
+
+@step('I see it marked as Homework$')
+def i_see_it_marked__as_homework(step):
+    assert_equal(world.css_find(".status-label").value, 'Homework')
+
+
 ############ ASSERTIONS ###################
 
 

cms/templates/overview.html

@@ -200,7 +200,7 @@
                     </a>
                   </div>
 
-                  <div class="gradable-status" data-initial-status="${subsection.lms.format if section.lms.format is not None else 'Not Graded'}">
+                  <div class="gradable-status" data-initial-status="${subsection.lms.format if subsection.lms.format is not None else 'Not Graded'}">
                   </div>
 
                   <div class="item-actions">