Fixing tests, again

common/test/acceptance/tests/lms/test_progress_page.py

@@ -10,7 +10,6 @@ import ddt
 
 from ..helpers import UniqueCourseTest, auto_auth, create_multiple_choice_problem
 from ...fixtures.course import CourseFixture, XBlockFixtureDesc
-from lettuce import world
 from nose.plugins.attrib import attr
 from ...pages.common.logout import LogoutPage
 from ...pages.lms.courseware import CoursewarePage

lms/djangoapps/courseware/features/lti.feature

@@ -49,7 +49,7 @@ Feature: LMS.LTI component
   And I submit answer to LTI 1 question
   And I click on the "Progress" tab
   Then I see text "Problem Scores: 5/10"
-  And I see graph with total progress "Overall grade: 5%"
+  And I see graph with total progress "5%"
   Then I click on the "Instructor" tab
   And I click the "Student Admin" button
   And I click on the "View Gradebook" link
@@ -77,7 +77,7 @@ Feature: LMS.LTI component
   And I submit answer to LTI 1 question
   And I click on the "Progress" tab
   Then I see text "Problem Scores: 5/10"
-  And I see graph with total progress "Overall grade: 5%"
+  And I see graph with total progress "5%"
 
   #9
   Scenario: Graded LTI component in LMS is correctly works with LTI2v0 PUT callback

lms/djangoapps/courseware/features/lti.py

@@ -338,7 +338,6 @@ def see_graph(_step, progress):
         progress=progress,
     )
     node = world.browser.find_by_xpath(xpath)
-
     assert node
 
 

lms/templates/courseware/progress_graph.js

@@ -144,17 +144,21 @@ $(function () {
   for (var n = 0; n < series_order_object.length; n++) {
       if (detail_tooltips[series_order_object[n].label].length > 1) {
           series_order_object[n].description = detail_tooltips[series_order_object[n].label][c];
-          for (var m = 0; m < droppedScores[0].length; m++) {
-              if (series_order_object[n].tick === droppedScores[0][m]) {
-                  series_order_object[n].description = series_order_object[n].description + ' ' + detail_tooltips["Dropped Scores"][0];
+          if (droppedScores[0]) {
+              for (var m = 0; m < droppedScores[0].length; m++) {
+                  if (series_order_object[n].tick === droppedScores[0][m]) {
+                      series_order_object[n].description = series_order_object[n].description + ' ' + detail_tooltips["Dropped Scores"][0];
+                  }
               }
+              c++;
           }
-          c++;
       } else {
           series_order_object[n].description = detail_tooltips[series_order_object[n].label][0];
-          for (var m = 0; m < droppedScores[0].length; m++) {
-              if (series_order_object[n].tick === droppedScores[0][m]) {
-                  series_order_object[n].description = series_order_object[n].description + ' ' + detail_tooltips["Dropped Scores"][0];
+          if (droppedScores[0]) {
+              for (var m = 0; m < droppedScores[0].length; m++) {
+                  if (series_order_object[n].tick === droppedScores[0][m]) {
+                      series_order_object[n].description = series_order_object[n].description + ' ' + detail_tooltips["Dropped Scores"][0];
+                  }
               }
           }
       }