[ckan-changes] [okfn/ckan] 3fc2bf: [#801] Upgrade to mocha

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 3fc2bf4c0e120a37ffd19e225de523e577933003
      https://github.com/okfn/ckan/commit/3fc2bf4c0e120a37ffd19e225de523e577933003
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js

  Log Message:
  -----------
  [#801] Upgrade to mocha


  Commit: 13f90eb34162d534887c156f986ac21ade8db9a1
      https://github.com/okfn/ckan/commit/13f90eb34162d534887c156f986ac21ade8db9a1
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/public/base/test/index.html

  Log Message:
  -----------
  [#801] Get mocha running within mocha-phantomjs


  Commit: f8a5d32b2fe7ef3df2e54b5cc364eaf4ea1e7d59
      https://github.com/okfn/ckan/commit/f8a5d32b2fe7ef3df2e54b5cc364eaf4ea1e7d59
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Run mocha tests on travis


  Commit: a33cc3ce73cdfa12efd3af8bf3b570cf0839c5d9
      https://github.com/okfn/ckan/commit/a33cc3ce73cdfa12efd3af8bf3b570cf0839c5d9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Run CKAN in background when running mocha tests. Might not work but need to test on travis.


  Commit: 2f4818c42a1f06f7f0b7a6305c071b2c1f161065
      https://github.com/okfn/ckan/commit/2f4818c42a1f06f7f0b7a6305c071b2c1f161065
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Correct ini file


  Commit: c0d288cee5a32ff84bd827a9c51d2563250f5d73
      https://github.com/okfn/ckan/commit/c0d288cee5a32ff84bd827a9c51d2563250f5d73
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build
    M ckan/public/base/test/index.html

  Log Message:
  -----------
  [#801] Simplified the logic for running the mocha tests in and out of browser


  Commit: 197bb64d892a58c12c25f6590f020b08ec660db2
      https://github.com/okfn/ckan/commit/197bb64d892a58c12c25f6590f020b08ec660db2
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/templates/ajax_snippets/related-item.html

  Log Message:
  -----------
  [#801] Fix for related-item.html snippet so that all mocha tests pass


  Commit: 1a5b63cf2e732a25e2eb89b53c369b295e0aa95a
      https://github.com/okfn/ckan/commit/1a5b63cf2e732a25e2eb89b53c369b295e0aa95a
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Move install of npm deps to before nosetests


  Commit: d7b5b3ce1df8c3d6e997acbc151c2a0c1958f8c2
      https://github.com/okfn/ckan/commit/d7b5b3ce1df8c3d6e997acbc151c2a0c1958f8c2
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Moved mocha to before nosetests


  Commit: dd46f25a8c756d2221c8bc8f824e09b3d10005a7
      https://github.com/okfn/ckan/commit/dd46f25a8c756d2221c8bc8f824e09b3d10005a7
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/public/base/test/spec/ckan.spec.js

  Log Message:
  -----------
  [#801] Added deliberate failing test for travis


  Commit: b89ab943d01aa0ab8142ff9bbc8016a08464f5f8
      https://github.com/okfn/ckan/commit/b89ab943d01aa0ab8142ff9bbc8016a08464f5f8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] a more precise kill and some extra comments


  Commit: ced323274132a9c4f65b30f3988ab762954f25fe
      https://github.com/okfn/ckan/commit/ced323274132a9c4f65b30f3988ab762954f25fe
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Sleep so ckan is up and running


  Commit: 9d0db5b8ed052d009e47b63af73179b085ce9a8d
      https://github.com/okfn/ckan/commit/9d0db5b8ed052d009e47b63af73179b085ce9a8d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Return errors to travis


  Commit: a22375da22d7efd34db5eb1292ac48bc69de34b9
      https://github.com/okfn/ckan/commit/a22375da22d7efd34db5eb1292ac48bc69de34b9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Improve output so fails easier to find


  Commit: 89dd6ec630aa40d6754a5d1886e1938eabe14df9
      https://github.com/okfn/ckan/commit/89dd6ec630aa40d6754a5d1886e1938eabe14df9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/test/spec/ckan.spec.js

  Log Message:
  -----------
  Revert "[#801] Added deliberate failing test for travis"

fix the mocha test that was made to fail for testing

This reverts commit dd46f25a8c756d2221c8bc8f824e09b3d10005a7.


  Commit: 0a339db6bb17cb9e16eb203def3fc1b8bd540029
      https://github.com/okfn/ckan/commit/0a339db6bb17cb9e16eb203def3fc1b8bd540029
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build
    M ckan/public/base/test/index.html
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js

  Log Message:
  -----------
  Merge branch '801-travis-run-mocha-tests'


Compare: https://github.com/okfn/ckan/compare/118c2b629889...0a339db6bb17