Merge branch 'master' into feature/christina/fields

cms/envs/jasmine.py

@@ -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

@@ -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

 # Python libraries to install directly from github
 
 # Third-party:
--e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
--e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
--e git://github.com/MITx/django-wiki.git@e2e84558#egg=django-wiki
+-e git://github.com/edx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
+-e git://github.com/edx/django-pipeline.git#egg=django-pipeline
+-e git://github.com/edx/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

 
 function github_status {
-    gcli status create mitx mitx $GIT_COMMIT \
+    gcli status create edx mitx $GIT_COMMIT \
          --params=$1 \
                   target_url:$BUILD_URL \
                   description:"Build #$BUILD_NUMBER is running" \
@@ -9,4 +9,4 @@ function github_status {
 
 function github_mark_failed_on_exit {
     trap '[ $? == "0" ] || github_status state:failed' EXIT
-}
\ No newline at end of file
+}

jenkins/test.sh

@@ -4,7 +4,7 @@ set -e
 set -x
 
 function github_status {
-    gcli status create mitx mitx $GIT_COMMIT \
+    gcli status create edx mitx $GIT_COMMIT \
          --params=$1 \
                   target_url:$BUILD_URL \
                   description:"Build #$BUILD_NUMBER $2" \