Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
be32d74a
Commit
be32d74a
authored
Nov 29, 2016
by
attiyaishaque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TNL-6017 Receive Updates checkbox saved in discussion forums.
parent
b2cd0359
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
1 deletions
+50
-1
common/test/acceptance/pages/lms/discussion.py
+27
-0
common/test/acceptance/tests/discussion/test_discussion.py
+19
-0
lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js
+1
-1
lms/envs/bok_choy.py
+3
-0
No files found.
common/test/acceptance/pages/lms/discussion.py
View file @
be32d74a
...
@@ -688,6 +688,26 @@ class DiscussionTabHomePage(CoursePage, DiscussionPageMixin):
...
@@ -688,6 +688,26 @@ class DiscussionTabHomePage(CoursePage, DiscussionPageMixin):
"waiting for server to return result"
"waiting for server to return result"
)
.
fulfill
()
)
.
fulfill
()
def
is_element_visible
(
self
,
selector
):
"""
Returns true if the element matching the specified selector is visible.
"""
query
=
self
.
q
(
css
=
selector
)
return
query
.
present
and
query
.
visible
def
is_checkbox_selected
(
self
,
selector
):
"""
Returns true or false depending upon the matching checkbox is checked.
"""
return
self
.
q
(
css
=
selector
)
.
selected
def
refresh_and_wait_for_load
(
self
):
"""
Refresh the page and wait for all resources to load.
"""
self
.
browser
.
refresh
()
self
.
wait_for_page
()
def
get_search_alert_messages
(
self
):
def
get_search_alert_messages
(
self
):
return
self
.
q
(
css
=
self
.
ALERT_SELECTOR
+
" .message"
)
.
text
return
self
.
q
(
css
=
self
.
ALERT_SELECTOR
+
" .message"
)
.
text
...
@@ -720,6 +740,13 @@ class DiscussionTabHomePage(CoursePage, DiscussionPageMixin):
...
@@ -720,6 +740,13 @@ class DiscussionTabHomePage(CoursePage, DiscussionPageMixin):
"New post action succeeded"
"New post action succeeded"
)
.
fulfill
()
)
.
fulfill
()
def
click_element
(
self
,
selector
):
"""
Clicks the element specified by selector
"""
element
=
self
.
q
(
css
=
selector
)
return
element
.
click
()
@property
@property
def
new_post_button
(
self
):
def
new_post_button
(
self
):
"""
"""
...
...
common/test/acceptance/tests/discussion/test_discussion.py
View file @
be32d74a
...
@@ -206,6 +206,25 @@ class DiscussionHomePageTest(BaseDiscussionTestCase):
...
@@ -206,6 +206,25 @@ class DiscussionHomePageTest(BaseDiscussionTestCase):
self
.
page
.
click_new_post_button
()
self
.
page
.
click_new_post_button
()
self
.
assertIsNotNone
(
self
.
page
.
new_post_form
)
self
.
assertIsNotNone
(
self
.
page
.
new_post_form
)
def
test_receive_update_checkbox
(
self
):
"""
Scenario: I can save the receive update email notification checkbox
on Discussion home page.
Given that I am on the Discussion home page
When I click on the 'Receive update' checkbox
Then it should always shown selected.
"""
receive_updates_selector
=
'.email-setting'
receive_updates_checkbox
=
self
.
page
.
is_element_visible
(
receive_updates_selector
)
self
.
assertTrue
(
receive_updates_checkbox
)
self
.
assertFalse
(
self
.
page
.
is_checkbox_selected
(
receive_updates_selector
))
self
.
page
.
click_element
(
receive_updates_selector
)
self
.
assertTrue
(
self
.
page
.
is_checkbox_selected
(
receive_updates_selector
))
self
.
page
.
refresh_and_wait_for_load
()
self
.
assertTrue
(
self
.
page
.
is_checkbox_selected
(
receive_updates_selector
))
@attr
(
'a11y'
)
@attr
(
'a11y'
)
def
test_page_accessibility
(
self
):
def
test_page_accessibility
(
self
):
self
.
page
.
a11y_audit
.
config
.
set_rules
({
self
.
page
.
a11y_audit
.
config
.
set_rules
({
...
...
lms/djangoapps/discussion/static/discussion/js/views/discussion_board_view.js
View file @
be32d74a
...
@@ -171,7 +171,7 @@
...
@@ -171,7 +171,7 @@
HtmlUtils
.
append
(
this
.
$
(
'.forum-content'
).
empty
(),
HtmlUtils
.
template
(
discussionHomeTemplate
)({}));
HtmlUtils
.
append
(
this
.
$
(
'.forum-content'
).
empty
(),
HtmlUtils
.
template
(
discussionHomeTemplate
)({}));
this
.
$
(
'.forum-nav-thread-list a'
).
removeClass
(
'is-active'
).
find
(
'.sr'
)
this
.
$
(
'.forum-nav-thread-list a'
).
removeClass
(
'is-active'
).
find
(
'.sr'
)
.
remove
();
.
remove
();
this
.
$
(
'input.email-setting'
).
bind
(
'click'
,
this
.
updateEmailNotifications
);
this
.
$
(
'input.email-setting'
).
bind
(
'click'
,
this
.
discussionThreadListView
.
updateEmailNotifications
);
DiscussionUtil
.
safeAjax
({
DiscussionUtil
.
safeAjax
({
url
:
url
,
url
:
url
,
type
:
'GET'
,
type
:
'GET'
,
...
...
lms/envs/bok_choy.py
View file @
be32d74a
...
@@ -168,6 +168,9 @@ FEATURES['ENABLE_COURSEWARE_SEARCH'] = True
...
@@ -168,6 +168,9 @@ FEATURES['ENABLE_COURSEWARE_SEARCH'] = True
# Enable dashboard search for tests
# Enable dashboard search for tests
FEATURES
[
'ENABLE_DASHBOARD_SEARCH'
]
=
True
FEATURES
[
'ENABLE_DASHBOARD_SEARCH'
]
=
True
# discussion home panel, which includes a subscription on/off setting for discussion digest emails.
FEATURES
[
'ENABLE_DISCUSSION_HOME_PANEL'
]
=
True
# Enable support for OpenBadges accomplishments
# Enable support for OpenBadges accomplishments
FEATURES
[
'ENABLE_OPENBADGES'
]
=
True
FEATURES
[
'ENABLE_OPENBADGES'
]
=
True
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment