[ckan-changes] [ckan/ckan] 0478b5: [#1940] Fix user edit tests

[GitHub]

  Branch: refs/heads/1976-crash-without-siteurl
  Home:   https://github.com/ckan/ckan
  Commit: 0478b564f11fe0338519b2aebe6c6aa3d451419f
      https://github.com/ckan/ckan/commit/0478b564f11fe0338519b2aebe6c6aa3d451419f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    R ckan/new_tests/controllers/test_user.py
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  [#1940] Fix user edit tests

The user edit tests hadn't been updated, and there was a bad merge that
made the new_tests folder reappear


  Commit: 5d1cbaec0b3b9936b0f84e235d5ec2ccfbb91e5a
      https://github.com/ckan/ckan/commit/5d1cbaec0b3b9936b0f84e235d5ec2ccfbb91e5a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  [#1940] Use underscore in data_dict param


  Commit: a35e7007349f3cf9ef3c786825599a377730e507
      https://github.com/ckan/ckan/commit/a35e7007349f3cf9ef3c786825599a377730e507
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  Merge branch 'george-sattler-1940-check-old-password-on-user-password-update'


  Commit: 0fcf6deef9af20aed02d9eed6046d601718e1f49
      https://github.com/ckan/ckan/commit/0fcf6deef9af20aed02d9eed6046d601718e1f49
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    R ckan/new_tests/controllers/test_user.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  Merge branch 'master' into 1976-crash-without-siteurl


Compare: https://github.com/ckan/ckan/compare/1b1fe8d9720a...0fcf6deef9af