Merge 85602a5 into c16c6f2

CHANGES.rst

@@ -22,6 +22,9 @@ Bugfixes:
 Fixes `issue 531 <https://github.com/plone/plone.restapi/issues/531>`_.
 [buchi]
 
+- Plone 5.2 compatible tests.
+  [sunew]
+
 
 2.1.0 (2018-06-23)
 ------------------

src/plone/restapi/tests/test_roles.py

@@ -22,7 +22,7 @@ def setUp(self):
     def test_roles_endpoint_lists_roles(self):
         response = self.api_session.get('/@roles')
 
-        self.assertEqual([
+        self.assertItemsEqual([
             {u'@id': u'http://localhost:55001/plone/@roles/Contributor',
              u'@type': u'role',
              u'id': u'Contributor',

src/plone/restapi/tests/test_search.py

@@ -276,7 +276,7 @@ def test_keyword_index_str_query_or(self):
         query = {'test_list_field': ['Keyword2', 'Keyword3']}
         response = self.api_session.get('/@search', params=query)
 
-        self.assertEqual(
+        self.assertItemsEqual(
             [u'/plone/folder/doc',
              u'/plone/folder/other-document'],
             result_paths(response.json())

src/plone/restapi/tests/test_services_users.py

@@ -451,9 +451,11 @@ def test_update_user_password(self):
             self.portal.acl_users.source_users._user_passwords
         )
         payload = {'password': 'secret'}
-        self.api_session.patch('/@users/noam', json=payload)
+        response = self.api_session.patch('/@users/noam', json=payload)
         transaction.commit()
 
+        self.assertEqual(response.status_code, 204)
+
         new_password_hashes = dict(
             self.portal.acl_users.source_users._user_passwords
         )