[ckan-changes] [ckan/ckan] 417182: [#2489] Frontend tests for admin config.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 417182318b574f6690a4cecc03126da915d22099
      https://github.com/ckan/ckan/commit/417182318b574f6690a4cecc03126da915d22099
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M ckan/templates/admin/config.html
    A ckan/tests/controllers/test_admin.py
    M dev-requirements.txt

  Log Message:
  -----------
  [#2489] Frontend tests for admin config.

Also adds BeatifulSoup4 to dev-requirements.txt.


  Commit: 5bd44ccea828ec3a7d0d5d2dc0fc7896134a5ebd
      https://github.com/ckan/ckan/commit/5bd44ccea828ec3a7d0d5d2dc0fc7896134a5ebd
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M ckan/tests/controllers/test_admin.py

  Log Message:
  -----------
  [#2489] Add asserts after config reset.

Also fixes reset config method bug.


  Commit: bba552d35eb923e68522556064eb3c67b9f5c9eb
      https://github.com/ckan/ckan/commit/bba552d35eb923e68522556064eb3c67b9f5c9eb
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M ckan/tests/controllers/test_admin.py

  Log Message:
  -----------
  [#2489] Dataset purge tests for admin trash


  Commit: 840f3350b09bc8b7ddd160aea13528bf65475ee8
      https://github.com/ckan/ckan/commit/840f3350b09bc8b7ddd160aea13528bf65475ee8
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

  Changed paths:
    M ckan/__init__.py
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    A ckan/migration/versions/077_add_revisions_to_system_info.py
    M ckan/model/__init__.py
    M ckan/model/system_info.py
    M ckan/plugins/interfaces.py
    M ckan/templates/admin/config.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    A ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_update.py
    A ckan/tests/model/test_system_info.py
    M ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/plugin_v1.py
    A ckanext/example_iconfigurer/plugin_v2.py
    A ckanext/example_iconfigurer/templates/admin/config.html
    A ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M contrib/docker/my_init.d/50_configure
    M doc/extensions/index.rst
    A doc/extensions/remote-config-update.rst
    A doc/images/custom_config_fields.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-source.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2489-admin-config-tests

Conflicts:
	ckan/templates/admin/config.html
	ckan/tests/controllers/test_admin.py


  Commit: 2b3f0523d985cb19597fb9316d8ddfa988072689
      https://github.com/ckan/ckan/commit/2b3f0523d985cb19597fb9316d8ddfa988072689
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

  Changed paths:
    M ckan/tests/controllers/test_admin.py

  Log Message:
  -----------
  [#2489] PEP8


  Commit: 6570cc7733a1248f593f1c162d394b1223c88f87
      https://github.com/ckan/ckan/commit/6570cc7733a1248f593f1c162d394b1223c88f87
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

  Changed paths:
    M ckan/templates/admin/config.html
    M ckan/tests/controllers/test_admin.py
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #2489 from ckan/2489-admin-config-tests

admin controller tests


Compare: https://github.com/ckan/ckan/compare/96d7b232ccbe...6570cc7733a1