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
d2f370dd
Commit
d2f370dd
authored
Feb 13, 2017
by
umar-nawaz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sailthru cookie name statements in add_email_marketing_cookies function
parent
d4b713ca
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
lms/djangoapps/email_marketing/signals.py
+3
-3
lms/djangoapps/email_marketing/tests/test_signals.py
+2
-2
No files found.
lms/djangoapps/email_marketing/signals.py
View file @
d2f370dd
...
...
@@ -50,12 +50,12 @@ def add_email_marketing_cookies(sender, response=None, user=None,
'vars'
:
{
'last_login_date'
:
datetime
.
datetime
.
now
()
.
strftime
(
"
%
Y-
%
m-
%
d"
)}
}
# get
sailthru_conten
t cookie to capture usage before logon
# get
anonymous_interes
t cookie to capture usage before logon
request
=
crum
.
get_current_request
()
if
request
:
sailthru_content
=
request
.
COOKIES
.
get
(
'
sailthru_conten
t'
)
sailthru_content
=
request
.
COOKIES
.
get
(
'
anonymous_interes
t'
)
if
sailthru_content
:
post_parms
[
'cookies'
]
=
{
'
sailthru_conten
t'
:
sailthru_content
}
post_parms
[
'cookies'
]
=
{
'
anonymous_interes
t'
:
sailthru_content
}
try
:
sailthru_client
=
SailthruClient
(
email_config
.
sailthru_key
,
email_config
.
sailthru_secret
)
...
...
lms/djangoapps/email_marketing/tests/test_signals.py
View file @
d2f370dd
...
...
@@ -87,13 +87,13 @@ class EmailMarketingTests(TestCase):
"success"
:
True
,
"redirect_url"
:
'test.com/test'
,
})
self
.
request
.
COOKIES
[
'
sailthru_conten
t'
]
=
'cookie_content'
self
.
request
.
COOKIES
[
'
anonymous_interes
t'
]
=
'cookie_content'
mock_get_current_request
.
return_value
=
self
.
request
mock_sailthru
.
return_value
=
SailthruResponse
(
JsonResponse
({
'keys'
:
{
'cookie'
:
'test_cookie'
}}))
add_email_marketing_cookies
(
None
,
response
=
response
,
user
=
self
.
user
)
mock_sailthru
.
assert_called_with
(
'user'
,
{
'fields'
:
{
'keys'
:
1
},
'cookies'
:
{
'
sailthru_conten
t'
:
'cookie_content'
},
'cookies'
:
{
'
anonymous_interes
t'
:
'cookie_content'
},
'id'
:
TEST_EMAIL
,
'vars'
:
{
'last_login_date'
:
ANY
}})
self
.
assertTrue
(
'sailthru_hid'
in
response
.
cookies
)
...
...
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