Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'release'

Browse Source 
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
This commit is contained in:
Andy Armstrong
2014-09-25 16:25:45 -04:00
parent 2fbf67b257 e22bd1b667
commit 0ed3a95d3a
334 changed files with 11274 additions and 6815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/test/acceptance/pages/lms/dashboard.py
View File

@@ -20,13 +20,13 @@ class DashboardPage(PageObject):
return self.q(css='section.my-courses').present
@property
def courses_text(self):
def current_courses_text(self):
"""
This is the title label for the section of the student dashboard that
shows all the courses that the student is enrolled in.
The string displayed is defined in lms/templates/dashboard.html.
"""
text_items = self.q(css='section#my-courses span.my-courses-title-label').text
text_items = self.q(css='section#my-courses').text
if len(text_items) > 0:
return text_items[0]
else:

12
common/test/acceptance/tests/test_lms.py
View File

@@ -78,10 +78,10 @@ class LanguageTest(WebAppTest):
self.dashboard_page = DashboardPage(self.browser)
self.test_new_lang = 'eo'
# This string is unicode for "ÇØÜRSÉS", which should appear in our Dummy Esperanto page
# This string is unicode for "ÇÜRRÉNT ÇØÜRSÉS", which should appear in our Dummy Esperanto page
# We store the string this way because Selenium seems to try and read in strings from
# the HTML in this format. Ideally we could just store the raw ÇÜRRÉNT ÇØÜRSÉS string here
self.courses_text = u'\xc7\xd6\xdcRS\xc9S'
self.current_courses_text = u'\xc7\xdcRR\xc9NT \xc7\xd6\xdcRS\xc9S'
self.username = "test"
self.password = "testpass"
@@ -93,10 +93,10 @@ class LanguageTest(WebAppTest):
# Change language to Dummy Esperanto
self.dashboard_page.change_language(self.test_new_lang)
changed_text = self.dashboard_page.courses_text
changed_text = self.dashboard_page.current_courses_text
# We should see the dummy-language text on the page
self.assertIn(self.courses_text, changed_text)
self.assertIn(self.current_courses_text, changed_text)
def test_language_persists(self):
auto_auth_page = AutoAuthPage(self.browser, username=self.username, password=self.password, email=self.email)
@@ -114,10 +114,10 @@ class LanguageTest(WebAppTest):
self.dashboard_page.visit()
changed_text = self.dashboard_page.courses_text
changed_text = self.dashboard_page.current_courses_text
# We should see the dummy-language text on the page
self.assertIn(self.courses_text, changed_text)
self.assertIn(self.current_courses_text, changed_text)
class HighLevelTabTest(UniqueCourseTest):