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
c54a71fe
Commit
c54a71fe
authored
Nov 30, 2014
by
Sarina Canelake
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
s/pylint:disable/pylint: disable/ (formatting fix)
parent
c0556a7e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
common/djangoapps/third_party_auth/tests/specs/base.py
+3
-3
common/djangoapps/user_api/models.py
+1
-1
common/test/acceptance/tests/discussion/test_cohorts.py
+2
-2
common/test/acceptance/tests/discussion/test_discussion.py
+2
-2
No files found.
common/djangoapps/third_party_auth/tests/specs/base.py
View file @
c54a71fe
...
...
@@ -654,7 +654,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
pipeline
.
get_login_url
(
self
.
PROVIDER_CLASS
.
NAME
,
pipeline
.
AUTH_ENTRY_LOGIN
)))
# Next, the provider makes a request against /auth/complete/<provider>.
# pylint:disable-msg=protected-access
# pylint:
disable-msg=protected-access
self
.
assert_redirect_to_register_looks_correct
(
actions
.
do_complete
(
strategy
,
social_views
.
_do_login
))
mako_middleware_process_request
(
strategy
.
request
)
...
...
@@ -716,7 +716,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
# assignment via pipeline to make sure a distinct username is created.
strategy
.
storage
.
user
.
create_user
(
username
=
self
.
get_username
(),
email
=
'user@email.com'
,
password
=
'password'
)
strategy
.
backend
.
auth_complete
=
mock
.
MagicMock
(
return_value
=
self
.
fake_auth_complete
(
strategy
))
# pylint:disable-msg=protected-access
# pylint:
disable-msg=protected-access
self
.
assert_redirect_to_register_looks_correct
(
actions
.
do_complete
(
strategy
,
social_views
.
_do_login
))
distinct_username
=
pipeline
.
get
(
request
)[
'kwargs'
][
'username'
]
self
.
assertNotEqual
(
original_username
,
distinct_username
)
...
...
@@ -725,7 +725,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
request
,
strategy
=
self
.
get_request_and_strategy
(
auth_entry
=
pipeline
.
AUTH_ENTRY_REGISTER
,
redirect_uri
=
'social:complete'
)
strategy
.
backend
.
auth_complete
=
mock
.
MagicMock
(
return_value
=
self
.
fake_auth_complete
(
strategy
))
# pylint:disable-msg=protected-access
# pylint:
disable-msg=protected-access
self
.
assert_redirect_to_register_looks_correct
(
actions
.
do_complete
(
strategy
,
social_views
.
_do_login
))
mako_middleware_process_request
(
strategy
.
request
)
...
...
common/djangoapps/user_api/models.py
View file @
c54a71fe
...
...
@@ -11,7 +11,7 @@ from xmodule_django.models import CourseKeyField
# but currently the rest of the system assumes that "student" defines
# certain models. For now we will leave the models in "student" and
# create an alias in "user_api".
from
student.models
import
UserProfile
,
Registration
,
PendingEmailChange
# pylint:disable=unused-import
from
student.models
import
UserProfile
,
Registration
,
PendingEmailChange
# pylint:
disable=unused-import
class
UserPreference
(
models
.
Model
):
...
...
common/test/acceptance/tests/discussion/test_cohorts.py
View file @
c54a71fe
...
...
@@ -70,7 +70,7 @@ class DiscussionTabSingleThreadTest(UniqueCourseTest):
AutoAuthPage
(
self
.
browser
,
course_id
=
self
.
course_id
)
.
visit
()
def
setup_thread_page
(
self
,
thread_id
):
self
.
thread_page
=
DiscussionTabSingleThreadPage
(
self
.
browser
,
self
.
course_id
,
thread_id
)
# pylint:disable=W0201
self
.
thread_page
=
DiscussionTabSingleThreadPage
(
self
.
browser
,
self
.
course_id
,
thread_id
)
# pylint:
disable=W0201
self
.
thread_page
.
visit
()
# pylint: disable=unused-argument
...
...
@@ -129,7 +129,7 @@ class InlineDiscussionTest(UniqueCourseTest):
discussion_page
=
InlineDiscussionPage
(
self
.
browser
,
self
.
discussion_id
)
discussion_page
.
expand_discussion
()
self
.
assertEqual
(
discussion_page
.
get_num_displayed_threads
(),
1
)
self
.
thread_page
=
InlineDiscussionThreadPage
(
self
.
browser
,
thread_id
)
# pylint:disable=W0201
self
.
thread_page
=
InlineDiscussionThreadPage
(
self
.
browser
,
thread_id
)
# pylint:
disable=W0201
self
.
thread_page
.
expand
()
def
refresh_thread_page
(
self
,
thread_id
):
...
...
common/test/acceptance/tests/discussion/test_discussion.py
View file @
c54a71fe
...
...
@@ -127,7 +127,7 @@ class DiscussionTabSingleThreadTest(UniqueCourseTest, DiscussionResponsePaginati
AutoAuthPage
(
self
.
browser
,
course_id
=
self
.
course_id
)
.
visit
()
def
setup_thread_page
(
self
,
thread_id
):
self
.
thread_page
=
DiscussionTabSingleThreadPage
(
self
.
browser
,
self
.
course_id
,
thread_id
)
# pylint:disable=W0201
self
.
thread_page
=
DiscussionTabSingleThreadPage
(
self
.
browser
,
self
.
course_id
,
thread_id
)
# pylint:
disable=W0201
self
.
thread_page
.
visit
()
def
test_marked_answer_comments
(
self
):
...
...
@@ -318,7 +318,7 @@ class InlineDiscussionTest(UniqueCourseTest, DiscussionResponsePaginationTestMix
def
setup_thread_page
(
self
,
thread_id
):
self
.
discussion_page
.
expand_discussion
()
self
.
assertEqual
(
self
.
discussion_page
.
get_num_displayed_threads
(),
1
)
self
.
thread_page
=
InlineDiscussionThreadPage
(
self
.
browser
,
thread_id
)
# pylint:disable=W0201
self
.
thread_page
=
InlineDiscussionThreadPage
(
self
.
browser
,
thread_id
)
# pylint:
disable=W0201
self
.
thread_page
.
expand
()
def
test_initial_render
(
self
):
...
...
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