[ckan-changes] [okfn/ckan] 3a22c9: First version of the suggested front end testing d...

Thu Nov 29 16:57:46 UTC 2012

  Branch: refs/heads/2939-orgs
  Home:   https://github.com/okfn/ckan
  Commit: 3a22c90824427ffb90f5a6359ae0d7d7eb3299f6
      https://github.com/okfn/ckan/commit/3a22c90824427ffb90f5a6359ae0d7d7eb3299f6
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-23 (Fri, 23 Nov 2012)

  Changed paths:
    A doc/frontend-testing.rst

  Log Message:
  -----------
  First version of the suggested front end testing document

  Commit: 4b2b0f6d3171291f5dea9decabd1894430086a5f
      https://github.com/okfn/ckan/commit/4b2b0f6d3171291f5dea9decabd1894430086a5f
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-23 (Fri, 23 Nov 2012)

  Changed paths:
    M doc/frontend-testing.rst

  Log Message:
  -----------
  Final tweaks to front end testing doc

  Commit: f0669af5071080742ca80663fcd0e221f4ae44e6
      https://github.com/okfn/ckan/commit/f0669af5071080742ca80663fcd0e221f4ae44e6
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-23 (Fri, 23 Nov 2012)

  Changed paths:
    M doc/frontend-testing.rst

  Log Message:
  -----------
  Clarified browser stats and added some code samples

  Commit: 1625ecf2e4552e82222b9bc65e03ffd0070fd5fe
      https://github.com/okfn/ckan/commit/1625ecf2e4552e82222b9bc65e03ffd0070fd5fe
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-23 (Fri, 23 Nov 2012)

  Changed paths:
    M doc/frontend-testing.rst

  Log Message:
  -----------
  Minor doc tweeks

  Commit: 77f8224a16bf861a058ee81302f8df6f5a39c448
      https://github.com/okfn/ckan/commit/77f8224a16bf861a058ee81302f8df6f5a39c448
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-25 (Sun, 25 Nov 2012)

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Clarify single-quotes rule in Python coding standards

  Commit: 24b94da868b702d15acfc55fbf11861387223e2f
      https://github.com/okfn/ckan/commit/24b94da868b702d15acfc55fbf11861387223e2f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-25 (Sun, 25 Nov 2012)

  Changed paths:
    M doc/contributing.rst

  Log Message:
  -----------
  Add CHANGELOG and docs to pull review process

  Commit: 7f630a9c497a62e991bc237c42570abad77b171b
      https://github.com/okfn/ckan/commit/7f630a9c497a62e991bc237c42570abad77b171b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/user/dashboard.html
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  Move URL /user/dashboard to /dashboard

We decided this makes more sense

  Commit: 9bc76a0eed3f0318a85ec8771b6224e8ddb4aeb7
      https://github.com/okfn/ckan/commit/9bc76a0eed3f0318a85ec8771b6224e8ddb4aeb7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    A ckan/templates/package/activity.html
    M ckan/templates/package/read.html

  Log Message:
  -----------
  Add activity stream tab to dataset page

  Commit: 0594077936740949f9875766f14365bc0363fd6e
      https://github.com/okfn/ckan/commit/0594077936740949f9875766f14365bc0363fd6e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/tests/functional/api/__init__.py

  Log Message:
  -----------
  Fix some PEP8 issues

  Commit: b1f46c40298e741c3d6c2b01b14ef7eabc010192
      https://github.com/okfn/ckan/commit/b1f46c40298e741c3d6c2b01b14ef7eabc010192
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/tests/functional/api/__init__.py

  Log Message:
  -----------
  Tidy a couple of docstrings

  Commit: 3b84c92210aa3aaf761d3f03bea6a94f0f929038
      https://github.com/okfn/ckan/commit/3b84c92210aa3aaf761d3f03bea6a94f0f929038
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/tests/functional/api/__init__.py

  Log Message:
  -----------
  Delete a commented-out set_trace()

  Commit: eb55a659db75a21803a0a9bf66d50e6918152c87
      https://github.com/okfn/ckan/commit/eb55a659db75a21803a0a9bf66d50e6918152c87
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  Refactor dashboard activity stream tests

- Move tests for contents of dashboard activity stream out of test_activity.py,
this test module was way too long and confusing, leave it for testing the
public activity streams only. Add a docstring to the module saying so.

- Add a docstring to test_follow.py explaining that it tests the follower
functions only (follow, unfollow, etc.) and not the contents of the dashboard
activity stream that is generated from what you're folllowing.

- Add new tests for the contents of the dashboard activity stream in
test_dashboard.py along with other dashboard tests.

Currently some of these tests are failing because activities from followed
groups are not appearing in the dashboard.

  Commit: 0235f1a812cd879c3f540807afb6a462f3ccecf3
      https://github.com/okfn/ckan/commit/0235f1a812cd879c3f540807afb6a462f3ccecf3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Add activities from followed groups to dashboard activity stream

Add activities from groups that a user is following (e.g. when someone
updates a group) to the user's dashboard activity stream.

There are still some test_dashboard.py tests failing because activities
from datasets belonging to followed groups dob't appear in the dashboard
yet.

  Commit: 5847bd00065b4fc92121432d57a002fc1fd688dd
      https://github.com/okfn/ckan/commit/5847bd00065b4fc92121432d57a002fc1fd688dd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/group.py

  Log Message:
  -----------
  Move group_package_show SQLAlchemy into model

Move the SQLAlchemy query that the group_package_show() action function
uses into the model. I need this for architectural reasons for upcoming
commits, and we're supposed to encapsulate SQLAlchemy in the model
anyway.

I made the new model function support the 'return_query' option but note
that there are no tests covering this, all the tests pass even without
this option.

  Commit: 8f5c897c06633b1f2e7cb7d7cd78573fac5fb57d
      https://github.com/okfn/ckan/commit/8f5c897c06633b1f2e7cb7d7cd78573fac5fb57d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  Remove group.members_of_type()

Remove group.members_of_type() and related code. It isn't used anywhere
except in the old publisher and organizations extensions which are to be
replaced by a new organizations implementation in CKAN core. Also it
duplicates functionality provided by group.active_packages().

  Commit: bdc72d7abd41fbdad5a5a30c8468ce6ea370ebc1
      https://github.com/okfn/ckan/commit/bdc72d7abd41fbdad5a5a30c8468ce6ea370ebc1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/group.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  Remove duplicate methods to get a group's packages

Refactor active_packages() and get_package_revisions(), both of which
return a group's packages (but in slightly different ways), replace with
just one method packages().

We now have just one way to get a group's packages, the packages()
method of the group model. The group_package_show() action function
calls it.

  Commit: e9a55a11c26e037da62b4230d54ee11611a431e4
      https://github.com/okfn/ckan/commit/e9a55a11c26e037da62b4230d54ee11611a431e4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  Fix following of groups

Add activities from the datasets of followed groups into the user's
dashboard activity stream. All the test_dashboard.py tests now pass.

Move SQLAlchemy from group_activity_list() into model, alongside the SQLAlchemy
queries for the other types of activity stream.

Change the SQLAlchemy in activities_from_groups_followed_by_user() to be the
union of group_activity_list() for each of the followed groups.

Update some tests.

  Commit: 8e2f2a0baa703998337e3f035ab97064341cca4d
      https://github.com/okfn/ckan/commit/8e2f2a0baa703998337e3f035ab97064341cca4d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Add docstring to group_activity_list()

  Commit: 3a8c37c41efa548a0f59f475e01c748a3a0669d6
      https://github.com/okfn/ckan/commit/3a8c37c41efa548a0f59f475e01c748a3a0669d6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Add some docstrings to model/activity.py

  Commit: a96757e1cd082f6c449ec5cb9eb4a60c4b610d84
      https://github.com/okfn/ckan/commit/a96757e1cd082f6c449ec5cb9eb4a60c4b610d84
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/model/activity.py
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  Fix dashboard activity stream from followed groups

It was returning all activities from the entire site, fix to return
activities from followed groups only.

The tests didn't catch this error because they didn't test doing random
activities that should _not_ appear in the user's dashboard and
asserting that they don't.

Add a quick test that catches this.

This is probably a problem for the other activity streams tests in
test_activity.py as well.

  Commit: bc179530aa05f3aa8ff6927f31ba298234093085
      https://github.com/okfn/ckan/commit/bc179530aa05f3aa8ff6927f31ba298234093085
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/model/group.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan

  Commit: afcce35935daa0ce4136d41bfbc66c496e46cba3
      https://github.com/okfn/ckan/commit/afcce35935daa0ce4136d41bfbc66c496e46cba3
  Author: amercader <amercadero at gmail.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Add requests to core requirements

  Commit: aeddf425583e58d72f3ab3259ff0c4347f2a7903
      https://github.com/okfn/ckan/commit/aeddf425583e58d72f3ab3259ff0c4347f2a7903
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Fix an activity streams crash

It seems that _group_activity_query() can sometimes be called for a
group that doesn't exist (though I'm not sure exactly how this happens).
A test was failing. Not sure how this crept into master.  Fix it to
handle this case.

  Commit: 81a471c5e58436ce27931916ae6fd4e928d737cf
      https://github.com/okfn/ckan/commit/81a471c5e58436ce27931916ae6fd4e928d737cf
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan

  Commit: e4f38380deab1ec8711ffd8b0fe5b69091782752
      https://github.com/okfn/ckan/commit/e4f38380deab1ec8711ffd8b0fe5b69091782752
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M ckan/tests/mock_publisher_auth.py

  Log Message:
  -----------
  Fix a crash in mock_publisher_auth

mock_publisher_auth uses `log` but doesn't initialise it. Import logging
and initialise log.

  Commit: 6aad4b8aa4549d613769ac57896773532287172f
      https://github.com/okfn/ckan/commit/6aad4b8aa4549d613769ac57896773532287172f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M ckan/tests/mock_publisher_auth.py

  Log Message:
  -----------
  Delete an unused import

  Commit: 53013843af361b7310a6418b3609c2ff1fc0378e
      https://github.com/okfn/ckan/commit/53013843af361b7310a6418b3609c2ff1fc0378e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M ckan/tests/mock_publisher_auth.py

  Log Message:
  -----------
  PEP8 fixes

  Commit: 3ea18168e62ae887d38a2d46948434d8b60ebe66
      https://github.com/okfn/ckan/commit/3ea18168e62ae887d38a2d46948434d8b60ebe66
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  Add test helper function for posting to CKAN API

Add ckan.tests.post(), a helper function for posting to CKAN's action API and
getting the result, that handles forming the correct action API URL, converting
the apikey to a string and putting it in a headers dict like TestApp expects,
collecting params into a dict and dumping them to a JSON string, and checking
the 'success' field of the response.

This can save a lot of lines of code and make tests more readable. I've
converted test_follow.py as an example of how much can be saved.

Similar savings could be made in many other test modules:

ckan/tests/functional/api/model/test_vocabulary.py,
ckan/tests/functional/api/model/test_group.py,
ckan/tests/functional/api/test_dashboard.py,
ckan/tests/functional/api/test_activity.py,
ckan/tests/functional/test_follow.py,
ckan/tests/functional/test_tag_vocab.py,
ckan/tests/functional/test_related.py,
ckan/tests/logic/test_action.py
ckan/tests/logic/test_tag.py.

ckan/tests/functional/api/model/test_package.py could also be changed to use
this function. It currently uses a similar function defined in
ckan.tests.functional.api.base:ApiTestCase.

  Commit: 740a0d887021abad60324ad421f06c36ffaa6f93
      https://github.com/okfn/ckan/commit/740a0d887021abad60324ad421f06c36ffaa6f93
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  Rename post -> call_action_api

More descriptive name

  Commit: 0429cb92b3d9d4676a201412be661d20eab9e2e1
      https://github.com/okfn/ckan/commit/0429cb92b3d9d4676a201412be661d20eab9e2e1
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/model/group.py
    A ckan/templates/package/activity.html
    M ckan/templates/package/read.html
    M ckan/templates/user/dashboard.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/__init__.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M doc/contributing.rst
    A doc/frontend-testing.rst
    M doc/python-coding-standards.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 2939-orgs

Conflicts:
	ckan/lib/dictization/model_dictize.py
	ckan/model/group.py
	ckan/tests/functional/api/test_follow.py
	ckan/tests/functional/test_group.py

  Commit: 2a756aa62cd8584d35df8b9bad47d72b4693c8df
      https://github.com/okfn/ckan/commit/2a756aa62cd8584d35df8b9bad47d72b4693c8df
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  [#2939] Fix tests due to creation rights issue

Compare: https://github.com/okfn/ckan/compare/07b4fa52af35...2a756aa62cd8