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
0cac6ea2
Commit
0cac6ea2
authored
Oct 27, 2014
by
Will Daly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pylint violations
parent
7f54af3b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
common/djangoapps/student/tests/test_enrollment.py
+7
-7
common/djangoapps/third_party_auth/pipeline.py
+3
-3
No files found.
common/djangoapps/student/tests/test_enrollment.py
View file @
0cac6ea2
...
@@ -59,7 +59,7 @@ class EnrollmentTest(ModuleStoreTestCase):
...
@@ -59,7 +59,7 @@ class EnrollmentTest(ModuleStoreTestCase):
# Professional ed
# Professional ed
# Expect that we're sent to the "choose your track" page
# Expect that we're sent to the "choose your track" page
# (which will, in turn, redirect us to a page where we can verify/pay)
# (which will, in turn, redirect us to a page where we can verify/pay)
# We should NOT be auto-enrolled, because that would be giving
# We should NOT be auto-enrolled, because that would be giving
# away an expensive course for free :)
# away an expensive course for free :)
([
'professional'
],
'course_modes_choose'
,
None
),
([
'professional'
],
'course_modes_choose'
,
None
),
)
)
...
@@ -110,9 +110,9 @@ class EnrollmentTest(ModuleStoreTestCase):
...
@@ -110,9 +110,9 @@ class EnrollmentTest(ModuleStoreTestCase):
self
.
client
.
logout
()
self
.
client
.
logout
()
self
.
client
.
get
(
reverse
(
'register_user'
),
{
'course_id'
:
self
.
course
.
id
})
self
.
client
.
get
(
reverse
(
'register_user'
),
{
'course_id'
:
self
.
course
.
id
})
self
.
client
.
login
(
username
=
self
.
USERNAME
,
password
=
self
.
PASSWORD
)
self
.
client
.
login
(
username
=
self
.
USERNAME
,
password
=
self
.
PASSWORD
)
self
.
dummy_request
=
RequestFactory
()
.
request
()
dummy_request
=
RequestFactory
()
.
request
()
self
.
dummy_request
.
session
=
self
.
client
.
session
dummy_request
.
session
=
self
.
client
.
session
strategy
=
DjangoStrategy
(
RequestFactory
,
request
=
self
.
dummy_request
)
strategy
=
DjangoStrategy
(
RequestFactory
,
request
=
dummy_request
)
change_enrollment_third_party
(
is_register
=
True
,
strategy
=
strategy
,
user
=
self
.
user
)
change_enrollment_third_party
(
is_register
=
True
,
strategy
=
strategy
,
user
=
self
.
user
)
self
.
assertTrue
(
CourseEnrollment
.
is_enrolled
(
self
.
user
,
self
.
course
.
id
))
self
.
assertTrue
(
CourseEnrollment
.
is_enrolled
(
self
.
user
,
self
.
course
.
id
))
...
@@ -128,9 +128,9 @@ class EnrollmentTest(ModuleStoreTestCase):
...
@@ -128,9 +128,9 @@ class EnrollmentTest(ModuleStoreTestCase):
self
.
client
.
get
(
reverse
(
'register_user'
),
{
'course_id'
:
self
.
course
.
id
})
self
.
client
.
get
(
reverse
(
'register_user'
),
{
'course_id'
:
self
.
course
.
id
})
self
.
client
.
login
(
username
=
self
.
USERNAME
,
password
=
self
.
PASSWORD
)
self
.
client
.
login
(
username
=
self
.
USERNAME
,
password
=
self
.
PASSWORD
)
self
.
dummy_request
=
RequestFactory
()
.
request
()
dummy_request
=
RequestFactory
()
.
request
()
self
.
dummy_request
.
session
=
self
.
client
.
session
dummy_request
.
session
=
self
.
client
.
session
strategy
=
DjangoStrategy
(
RequestFactory
,
request
=
self
.
dummy_request
)
strategy
=
DjangoStrategy
(
RequestFactory
,
request
=
dummy_request
)
change_enrollment_third_party
(
is_register
=
True
,
strategy
=
strategy
,
user
=
self
.
user
)
change_enrollment_third_party
(
is_register
=
True
,
strategy
=
strategy
,
user
=
self
.
user
)
# Verify that the user has not been enrolled in the course
# Verify that the user has not been enrolled in the course
...
...
common/djangoapps/third_party_auth/pipeline.py
View file @
0cac6ea2
...
@@ -408,7 +408,7 @@ def login_analytics(*args, **kwargs):
...
@@ -408,7 +408,7 @@ def login_analytics(*args, **kwargs):
},
},
context
=
{
context
=
{
'Google Analytics'
:
{
'Google Analytics'
:
{
'clientId'
:
tracking_context
.
get
(
'client_id'
)
'clientId'
:
tracking_context
.
get
(
'client_id'
)
}
}
}
}
)
)
...
@@ -430,5 +430,5 @@ def change_enrollment(*args, **kwargs):
...
@@ -430,5 +430,5 @@ def change_enrollment(*args, **kwargs):
CourseEnrollment
.
enroll
(
kwargs
[
'user'
],
course_id
)
CourseEnrollment
.
enroll
(
kwargs
[
'user'
],
course_id
)
except
CourseEnrollmentException
:
except
CourseEnrollmentException
:
pass
pass
except
Exception
,
e
:
except
Exception
as
ex
:
logger
.
exception
(
e
)
logger
.
exception
(
e
x
)
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