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
0fed2f59
Commit
0fed2f59
authored
Aug 19, 2015
by
Ned Batchelder
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9364 from edx/ned/django-1-4-22
Upgrade Django to 1.4.22
parents
5ee49351
9f92054c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
common/djangoapps/microsite_configuration/tests/test_middleware.py
+8
-1
requirements/edx/base.txt
+1
-1
No files found.
common/djangoapps/microsite_configuration/tests/test_middleware.py
View file @
0fed2f59
...
@@ -10,6 +10,8 @@ from django.test.client import Client
...
@@ -10,6 +10,8 @@ from django.test.client import Client
from
django.test.utils
import
override_settings
from
django.test.utils
import
override_settings
import
unittest
import
unittest
from
student.tests.factories
import
UserFactory
# NOTE: We set SESSION_SAVE_EVERY_REQUEST to True in order to make sure
# NOTE: We set SESSION_SAVE_EVERY_REQUEST to True in order to make sure
# Sessions are always started on every request
# Sessions are always started on every request
...
@@ -22,8 +24,13 @@ class MicroSiteSessionCookieTests(TestCase):
...
@@ -22,8 +24,13 @@ class MicroSiteSessionCookieTests(TestCase):
def
setUp
(
self
):
def
setUp
(
self
):
super
(
MicroSiteSessionCookieTests
,
self
)
.
setUp
()
super
(
MicroSiteSessionCookieTests
,
self
)
.
setUp
()
# create a test client
# Create a test client, and log it in so that it will save some session
# data.
self
.
user
=
UserFactory
.
create
()
self
.
user
.
set_password
(
'password'
)
self
.
user
.
save
()
self
.
client
=
Client
()
self
.
client
=
Client
()
self
.
client
.
login
(
username
=
self
.
user
.
username
,
password
=
"password"
)
def
test_session_cookie_domain_no_microsite
(
self
):
def
test_session_cookie_domain_no_microsite
(
self
):
"""
"""
...
...
requirements/edx/base.txt
View file @
0fed2f59
...
@@ -34,7 +34,7 @@ django-storages==1.1.5
...
@@ -34,7 +34,7 @@ django-storages==1.1.5
django-threaded-multihost==1.4-1
django-threaded-multihost==1.4-1
django-method-override==0.1.0
django-method-override==0.1.0
djangorestframework==2.3.14
djangorestframework==2.3.14
django==1.4.2
1
django==1.4.2
2
elasticsearch==0.4.5
elasticsearch==0.4.5
facebook-sdk==0.4.0
facebook-sdk==0.4.0
feedparser==5.1.3
feedparser==5.1.3
...
...
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