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
4e9de855
Commit
4e9de855
authored
Nov 08, 2013
by
Will Daly
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline
Acceptance tests use asset pipeline
parents
037da321
7830bb20
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletions
+14
-1
cms/envs/acceptance.py
+6
-0
lms/envs/acceptance.py
+7
-0
requirements/edx/github.txt
+1
-1
No files found.
cms/envs/acceptance.py
View file @
4e9de855
...
@@ -80,6 +80,12 @@ DATABASES = {
...
@@ -80,6 +80,12 @@ DATABASES = {
}
}
}
}
# Enable asset pipeline
# Our fork of django-pipeline uses `PIPELINE` instead of `PIPELINE_ENABLED`
# PipelineFinder is explained here: http://django-pipeline.readthedocs.org/en/1.1.24/storages.html
PIPELINE
=
True
STATICFILES_FINDERS
+=
(
'pipeline.finders.PipelineFinder'
,
)
# Use the auto_auth workflow for creating users and logging them in
# Use the auto_auth workflow for creating users and logging them in
MITX_FEATURES
[
'AUTOMATIC_AUTH_FOR_TESTING'
]
=
True
MITX_FEATURES
[
'AUTOMATIC_AUTH_FOR_TESTING'
]
=
True
...
...
lms/envs/acceptance.py
View file @
4e9de855
...
@@ -82,6 +82,13 @@ TRACKING_BACKENDS.update({
...
@@ -82,6 +82,13 @@ TRACKING_BACKENDS.update({
}
}
})
})
# Enable asset pipeline
# Our fork of django-pipeline uses `PIPELINE` instead of `PIPELINE_ENABLED`
# PipelineFinder is explained here: http://django-pipeline.readthedocs.org/en/1.1.24/storages.html
PIPELINE
=
True
STATICFILES_FINDERS
+=
(
'pipeline.finders.PipelineFinder'
,
)
BULK_EMAIL_DEFAULT_FROM_EMAIL
=
"test@test.org"
BULK_EMAIL_DEFAULT_FROM_EMAIL
=
"test@test.org"
# Forums are disabled in test.py to speed up unit tests, but we do not have
# Forums are disabled in test.py to speed up unit tests, but we do not have
...
...
requirements/edx/github.txt
View file @
4e9de855
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
# Third-party:
# Third-party:
-e git+https://github.com/edx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
-e git+https://github.com/edx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
-e git+https://github.com/edx/django-pipeline.git#egg=django-pipeline
-e git+https://github.com/edx/django-pipeline.git
@88ec8a011e481918fdc9d2682d4017c835acd8be
#egg=django-pipeline
-e git+https://github.com/edx/django-wiki.git@41815e2ef1b0323f92900f8e60711b0f0c37766b#egg=django-wiki
-e git+https://github.com/edx/django-wiki.git@41815e2ef1b0323f92900f8e60711b0f0c37766b#egg=django-wiki
-e git+https://github.com/edx/lettuce.git@503fe2d2599290c45b021d6c424ab5ea899e42be#egg=lettuce
-e git+https://github.com/edx/lettuce.git@503fe2d2599290c45b021d6c424ab5ea899e42be#egg=lettuce
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
...
...
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