Commit df7f7e45 by dragonfi

Fix integration test errors on gsehub

parent 72514acc
......@@ -23,6 +23,8 @@
# Imports ###########################################################
import time
from workbench import scenarios
from workbench.test.selenium_test import SeleniumTest
......@@ -41,6 +43,7 @@ class MentoringBaseTest(SeleniumTest):
scenarios.SCENARIOS.clear()
scenarios_list = load_scenarios_from_path('../tests/xml')
for identifier, title, xml in scenarios_list:
scenarios.add_xml_scenario(identifier, title, xml)
self.addCleanup(scenarios.remove_scenario, identifier)
# Suzy opens the browser to visit the workbench
......@@ -57,6 +60,7 @@ class MentoringBaseTest(SeleniumTest):
"""
self.browser.get(self.live_server_url)
self.browser.find_element_by_link_text(page_name).click()
time.sleep(1)
mentoring = self.browser.find_element_by_css_selector(css_selector)
return mentoring
......@@ -47,7 +47,7 @@ class AnswerBlockTest(MentoringBaseTest):
self.assertEqual(header1.text, 'XBlock: Answer Edit 1')
# Check <html> child
p = mentoring.find_element_by_css_selector('div.xblock > p')
p = mentoring.find_element_by_css_selector('div.xblock p')
self.assertEqual(p.text, 'This should be displayed in the answer_edit scenario')
# Initial unsubmitted text
......
<vertical>
<vertical_demo>
<mentoring url_name="answer_blank_read_only" enforce_dependency="false">
<answer name="answer_blank" read_only="true" />
</mentoring>
</vertical>
</vertical_demo>
<vertical>
<vertical_demo>
<mentoring url_name="answer_edit_1" enforce_dependency="false">
<html>
<p>This should be displayed in the answer_edit scenario</p>
......@@ -6,4 +6,4 @@
<answer name="answer_1" />
</mentoring>
</vertical>
</vertical_demo>
<vertical>
<vertical_demo>
<mentoring url_name="answer_edit_2" enforce_dependency="false">
<answer name="answer_1" read_only="true" />
<answer name="answer_1" />
</mentoring>
</vertical>
</vertical_demo>
<vertical>
<vertical_demo>
<mentoring url_name="mcq_1" enforce_dependency="false">
<mcq name="mcq_1_1" type="choices">
<question>Do you like this MCQ?</question>
......@@ -25,4 +25,4 @@
<html><p>Congratulations!</p></html>
</message>
</mentoring>
</vertical>
</vertical_demo>
<vertical>
<vertical_demo>
<mentoring url_name="mentoring_first" followed_by="progression_2">
<answer name="progression_1_answer" />
</mentoring>
</vertical>
</vertical_demo>
<vertical>
<vertical_demo>
<mentoring url_name="progression_2" followed_by="progression_3">
<answer name="progression_2_answer" />
</mentoring>
</vertical>
</vertical_demo>
<vertical>
<vertical_demo>
<mentoring url_name="progression_3">
<answer name="progression_3_answer" />
</mentoring>
</vertical>
</vertical_demo>
<vertical>
<vertical_demo>
<mentoring url_name="table_1" enforce_dependency="false">
<answer name="table_1_answer_1" />
<answer name="table_1_answer_2" />
</mentoring>
</vertical>
</vertical_demo>
<vertical>
<vertical_demo>
<mentoring display_submit="false" enforce_dependency="false">
<mentoring-table type="table_test" url_name="table_2">
<column>
......@@ -12,4 +12,4 @@
</column>
</mentoring-table>
</mentoring>
</vertical>
</vertical_demo>
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