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

Merge pull request #16430 from edx/release-mergeback-to-master

Browse Source 
Merge release back to master
This commit is contained in:
edx-pipeline-bot
2017-11-02 15:02:41 -04:00
committed by GitHub
parent 0162b3708b 22e05f622e
commit fd027db6ff
18 changed files with 290 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/test/acceptance/pages/common/logout.py
View File

@@ -14,4 +14,4 @@ class LogoutPage(PageObject):
url = BASE_URL + "/logout"
def is_browser_on_page(self):
return self.q(css='.btn-login').present
return self.q(css='.sign-in-btn').present

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

@@ -208,33 +208,33 @@ class DashboardPage(PageObject):
"""
Click username dropdown.
"""
self.q(css='.user-dropdown').first.click()
self.q(css='.toggle-user-dropdown').first.click()
@property
def username_dropdown_link_text(self):
"""
Return list username dropdown links.
"""
return self.q(css='.user-dropdown-menu a').text
return self.q(css='.dropdown-user-menu a').text
@property
def tabs_link_text(self):
"""
Return the text of all the tabs on the dashboard.
"""
return self.q(css='.tab-nav-item a').text
return self.q(css='.nav-tab a').text
def click_my_profile_link(self):
"""
Click on `Profile` link.
"""
self.q(css='.tab-nav-item a').nth(1).click()
self.q(css='.nav-tab a').nth(1).click()
def click_account_settings_link(self):
"""
Click on `Account` link.
"""
self.q(css='.user-dropdown-menu a').nth(1).click()
self.q(css='.dropdown-user-menu a').nth(1).click()
@property
def language_selector(self):

2
common/test/acceptance/pages/lms/instructor_dashboard.py
View File

@@ -25,7 +25,7 @@ class InstructorDashboardPage(CoursePage):
"""
Clicks the general Help button in the header.
"""
self.q(css='.doc-link').first.click()
self.q(css='.help-link').first.click()
def select_membership(self):
"""

23
common/test/acceptance/tests/lms/test_lms_problems.py
View File

@@ -616,17 +616,18 @@ class ProblemPartialCredit(ProblemsTest):
""")
return XBlockFixtureDesc('problem', 'PARTIAL CREDIT TEST PROBLEM', data=xml)
def test_partial_credit(self):
"""
Test that we can see the partial credit value and feedback.
"""
self.courseware_page.visit()
problem_page = ProblemPage(self.browser)
self.assertEqual(problem_page.problem_name, 'PARTIAL CREDIT TEST PROBLEM')
problem_page.fill_answer_numerical('-1')
problem_page.click_submit()
problem_page.wait_for_status_icon()
self.assertTrue(problem_page.simpleprob_is_partially_correct())
# TODO: Reinstate this, it broke when landing the unified header in LEARNER-
# def test_partial_credit(self):
# """
# Test that we can see the partial credit value and feedback.
# """
# self.courseware_page.visit()
# problem_page = ProblemPage(self.browser)
# self.assertEqual(problem_page.problem_name, 'PARTIAL CREDIT TEST PROBLEM')
# problem_page.fill_answer_numerical('-1')
# problem_page.click_submit()
# problem_page.wait_for_status_icon()
# self.assertTrue(problem_page.simpleprob_is_partially_correct())
@attr(shard=9)