Commit 9e5ea1c3 by Xavier Antoviaque

Remove 'Not completed' status indicator when not completed yet

parent 080187fa
<script type="text/template" id="xblock-progress-template"> <script type="text/template" id="xblock-progress-template">
<% if (completed === "True") {{ %> <% if (completed === "True") {{ %>
<img src="{completed}" alt="Completed"> <img src="{completed}" alt="Completed">
<% }} else {{ %>
(Not completed)
<% }} %> <% }} %>
</script> </script>
...@@ -54,14 +54,14 @@ class AnswerBlockTest(MentoringBaseTest): ...@@ -54,14 +54,14 @@ class AnswerBlockTest(MentoringBaseTest):
answer1 = mentoring.find_element_by_css_selector('textarea') answer1 = mentoring.find_element_by_css_selector('textarea')
self.assertEqual(answer1.text, '') self.assertEqual(answer1.text, '')
progress = mentoring.find_element_by_css_selector('.progress > .indicator') progress = mentoring.find_element_by_css_selector('.progress > .indicator')
self.assertEqual(progress.text, '(Not completed)') self.assertEqual(progress.text, '')
self.assertFalse(progress.find_elements_by_xpath('./*')) self.assertFalse(progress.find_elements_by_xpath('./*'))
# Submit without answer # Submit without answer
submit = mentoring.find_element_by_css_selector('input.submit') submit = mentoring.find_element_by_css_selector('input.submit')
submit.click() submit.click()
self.assertEqual(answer1.get_attribute('value'), '') self.assertEqual(answer1.get_attribute('value'), '')
self.assertEqual(progress.text, '(Not completed)') self.assertEqual(progress.text, '')
self.assertFalse(progress.find_elements_by_xpath('./*')) self.assertFalse(progress.find_elements_by_xpath('./*'))
# Submit an answer # Submit an answer
...@@ -88,7 +88,7 @@ class AnswerBlockTest(MentoringBaseTest): ...@@ -88,7 +88,7 @@ class AnswerBlockTest(MentoringBaseTest):
answer = mentoring.find_element_by_css_selector('blockquote.answer.read_only') answer = mentoring.find_element_by_css_selector('blockquote.answer.read_only')
self.assertEqual(answer.text, '') self.assertEqual(answer.text, '')
progress = mentoring.find_element_by_css_selector('.progress > .indicator') progress = mentoring.find_element_by_css_selector('.progress > .indicator')
self.assertEqual(progress.text, '(Not completed)') self.assertEqual(progress.text, '')
# Submit should allow to complete # Submit should allow to complete
submit = mentoring.find_element_by_css_selector('input.submit') submit = mentoring.find_element_by_css_selector('input.submit')
......
...@@ -45,7 +45,7 @@ class MCQBlockTest(MentoringBaseTest): ...@@ -45,7 +45,7 @@ class MCQBlockTest(MentoringBaseTest):
self.assertEqual(messages.text, '') self.assertEqual(messages.text, '')
self.assertFalse(messages.find_elements_by_xpath('./*')) self.assertFalse(messages.find_elements_by_xpath('./*'))
self.assertEqual(progress.text, '(Not completed)') self.assertEqual(progress.text, '')
self.assertFalse(progress.find_elements_by_xpath('./*')) self.assertFalse(progress.find_elements_by_xpath('./*'))
mcq1_legend = mcq1.find_element_by_css_selector('legend') mcq1_legend = mcq1.find_element_by_css_selector('legend')
...@@ -99,7 +99,7 @@ class MCQBlockTest(MentoringBaseTest): ...@@ -99,7 +99,7 @@ class MCQBlockTest(MentoringBaseTest):
self.assertEqual(len(tips), 2) self.assertEqual(len(tips), 2)
self.assertEqual(tips[0].text, 'To the question "Do you like this MCQ?", you have not provided an answer.') self.assertEqual(tips[0].text, 'To the question "Do you like this MCQ?", you have not provided an answer.')
self.assertEqual(tips[1].text, 'To the question "How much do you rate this MCQ?", you have not provided an answer.') self.assertEqual(tips[1].text, 'To the question "How much do you rate this MCQ?", you have not provided an answer.')
self.assertEqual(progress.text, '(Not completed)') self.assertEqual(progress.text, '')
self.assertFalse(progress.find_elements_by_xpath('./*')) self.assertFalse(progress.find_elements_by_xpath('./*'))
# Select only one option # Select only one option
...@@ -111,7 +111,7 @@ class MCQBlockTest(MentoringBaseTest): ...@@ -111,7 +111,7 @@ class MCQBlockTest(MentoringBaseTest):
self.assertEqual(len(tips), 2) self.assertEqual(len(tips), 2)
self.assertEqual(tips[0].text, 'To the question "Do you like this MCQ?", you answered "Maybe not".\nAh, damn.') self.assertEqual(tips[0].text, 'To the question "Do you like this MCQ?", you answered "Maybe not".\nAh, damn.')
self.assertEqual(tips[1].text, 'To the question "How much do you rate this MCQ?", you have not provided an answer.') self.assertEqual(tips[1].text, 'To the question "How much do you rate this MCQ?", you have not provided an answer.')
self.assertEqual(progress.text, '(Not completed)') self.assertEqual(progress.text, '')
self.assertFalse(progress.find_elements_by_xpath('./*')) self.assertFalse(progress.find_elements_by_xpath('./*'))
# One with only display tip, one with reject tip - should not complete # One with only display tip, one with reject tip - should not complete
...@@ -124,7 +124,7 @@ class MCQBlockTest(MentoringBaseTest): ...@@ -124,7 +124,7 @@ class MCQBlockTest(MentoringBaseTest):
self.assertEqual(len(tips), 2) self.assertEqual(len(tips), 2)
self.assertEqual(tips[0].text, 'To the question "Do you like this MCQ?", you answered "Yes".\nGreat!') self.assertEqual(tips[0].text, 'To the question "Do you like this MCQ?", you answered "Yes".\nGreat!')
self.assertEqual(tips[1].text, 'To the question "How much do you rate this MCQ?", you answered "3".\nWill do better next time...') self.assertEqual(tips[1].text, 'To the question "How much do you rate this MCQ?", you answered "3".\nWill do better next time...')
self.assertEqual(progress.text, '(Not completed)') self.assertEqual(progress.text, '')
self.assertFalse(progress.find_elements_by_xpath('./*')) self.assertFalse(progress.find_elements_by_xpath('./*'))
# Only display tips, to allow to complete # Only display tips, to allow to complete
......
...@@ -63,7 +63,7 @@ class MentoringProgressionTest(MentoringBaseTest): ...@@ -63,7 +63,7 @@ class MentoringProgressionTest(MentoringBaseTest):
self.assertFalse(mentoring.find_elements_by_css_selector('.warning')) self.assertFalse(mentoring.find_elements_by_css_selector('.warning'))
progress = mentoring.find_element_by_css_selector('.progress > .indicator') progress = mentoring.find_element_by_css_selector('.progress > .indicator')
self.assertEqual(progress.text, '(Not completed)') self.assertEqual(progress.text, '')
self.assertFalse(progress.find_elements_by_xpath('./*')) self.assertFalse(progress.find_elements_by_xpath('./*'))
mentoring = self.go_to_page('Progression 2') mentoring = self.go_to_page('Progression 2')
...@@ -82,7 +82,7 @@ class MentoringProgressionTest(MentoringBaseTest): ...@@ -82,7 +82,7 @@ class MentoringProgressionTest(MentoringBaseTest):
submit.click() submit.click()
progress = mentoring.find_element_by_css_selector('.progress > .indicator') progress = mentoring.find_element_by_css_selector('.progress > .indicator')
self.assertEqual(progress.text, '(Not completed)') self.assertEqual(progress.text, '')
self.assertFalse(progress.find_elements_by_xpath('./*')) self.assertFalse(progress.find_elements_by_xpath('./*'))
mentoring = self.go_to_page('Progression 2') mentoring = self.go_to_page('Progression 2')
......
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