Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-tes…

…t-suite

.tx/config

@@ -1,5 +1,5 @@
 [main]
-host = http://www.transifex.net
+host = https://www.transifex.com
 
 [ckan.2-0]
 file_filter = ckan/i18n/<lang>/LC_MESSAGES/ckan.po

CONTRIBUTING.rst

@@ -161,11 +161,10 @@ This section will walk you through the steps for making a pull request.
    its own branch forked from the master branch.
 
    The name of the branch should include the issue number (if this work has an
-   issue in the `CKAN issue tracker`_), the branch type (e.g. "feature" or
-   "bug"), and a brief one-line synopsis of the work, for example::
+   issue in the `CKAN issue tracker`_), and a brief one-line synopsis of the work,
+   for example::
 
-    2298-feature-add-sort-by-controls-to-search-page
-    1518-bug-upload-file-with-spaces
+    2298-add-sort-by-controls-to-search-page
 
 
 #. Fork CKAN on GitHub

bin/ckan_spam.py

@@ -14,7 +14,7 @@
 
 import os
 
-from sqlobject import *
+import sqlobject
 
 import loadconfig
 path = os.path.abspath(cfg_path)
@@ -36,7 +36,7 @@ def purge_packages_by_name():
     pkg = model.Package.byName(pkg_name)
     # for efficiency reasons best to have revisions in descending order
     sel = model.PackageRevision.select(
-            AND(model.PackageRevision.q.baseID==pkg.id,
+            sqlobject.AND(model.PackageRevision.q.baseID==pkg.id,
                 model.PackageRevision.q.revisionID>=start_at_id),
             orderBy=-model.PackageRevision.q.revisionID,
             )

bin/travis-build

@@ -27,6 +27,9 @@ pip install -r requirements.txt -r dev-requirements.txt --use-mirrors
 
 python setup.py develop
 
+# Install npm dpes for mocha
+npm install -g mocha-phantomjs phantomjs
+
 # Configure Solr
 echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty
 # FIXME the solr schema cannot be hardcoded as it is dependent on the ckan version
@@ -47,5 +50,23 @@ fi
 
 cat test-core.ini
 
-# And finally, run the tests
+# Run mocha front-end tests
+# We need ckan to be running for some tests
+paster serve test-core.ini &
+sleep 5 # Make sure the server has fully started
+mocha-phantomjs http://localhost:5000/base/test/index.html
+# Did an error occur?
+MOCHA_ERROR=$?
+# We are done so kill ckan
+killall paster
+
+# And finally, run the nosetests
 nosetests --ckan --with-pylons=test-core.ini --nologcapture ckan ckanext
+# Did an error occur?
+NOSE_ERROR=$?
+
+[ "0" -ne "$MOCHA_ERROR" ] && echo MOCKA tests have failed
+[ "0" -ne "$NOSE_ERROR" ] && echo NOSE tests have failed
+
+# If an error occured in our tests make sure travis knows
+exit `expr $MOCHA_ERROR + $NOSE_ERROR`