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
0a1902e7
Commit
0a1902e7
authored
May 02, 2013
by
cahrens
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into feature/christina/fields
parents
e0ebe6da
22e147b2
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
8 deletions
+11
-8
cms/envs/jasmine.py
+6
-0
cms/envs/test.py
+0
-3
github-requirements.txt
+3
-3
jenkins/base.sh
+1
-1
jenkins/test.sh
+1
-1
No files found.
cms/envs/jasmine.py
View file @
0a1902e7
...
...
@@ -35,4 +35,10 @@ JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
STATICFILES_DIRS
.
append
(
COMMON_ROOT
/
'test'
/
'phantom-jasmine'
/
'lib'
)
# Remove the localization middleware class because it requires the test database
# to be sync'd and migrated in order to run the jasmine tests interactively
# with a browser
MIDDLEWARE_CLASSES
=
tuple
(
e
for
e
in
MIDDLEWARE_CLASSES
\
if
e
!=
'django.middleware.locale.LocaleMiddleware'
)
INSTALLED_APPS
+=
(
'django_jasmine'
,
)
cms/envs/test.py
View file @
0a1902e7
...
...
@@ -17,9 +17,6 @@ TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
TEST_ROOT
=
path
(
'test_root'
)
# Makes the tests run much faster...
SOUTH_TESTS_MIGRATE
=
False
# To disable migrations and use syncdb instead
# Want static files in the same dir for running on jenkins.
STATIC_ROOT
=
TEST_ROOT
/
"staticfiles"
...
...
github-requirements.txt
View file @
0a1902e7
# Python libraries to install directly from github
# Third-party:
-e git://github.com/
MIT
x/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
-e git://github.com/
MIT
x/django-pipeline.git#egg=django-pipeline
-e git://github.com/
MIT
x/django-wiki.git@e2e84558#egg=django-wiki
-e git://github.com/
ed
x/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
-e git://github.com/
ed
x/django-pipeline.git#egg=django-pipeline
-e git://github.com/
ed
x/django-wiki.git@e2e84558#egg=django-wiki
-e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
# Our libraries:
...
...
jenkins/base.sh
View file @
0a1902e7
function
github_status
{
gcli status create
mit
x mitx
$GIT_COMMIT
\
gcli status create
ed
x mitx
$GIT_COMMIT
\
--params
=
$1
\
target_url:
$BUILD_URL
\
description:
"Build #
$BUILD_NUMBER
is running"
\
...
...
jenkins/test.sh
View file @
0a1902e7
...
...
@@ -4,7 +4,7 @@ set -e
set
-x
function
github_status
{
gcli status create
mit
x mitx
$GIT_COMMIT
\
gcli status create
ed
x mitx
$GIT_COMMIT
\
--params
=
$1
\
target_url:
$BUILD_URL
\
description:
"Build #
$BUILD_NUMBER
$2
"
\
...
...
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