Merge pull request #46 from adobe-apiplatform/v2

Add files left out of prior commit.

Author: adobeDan

HISTORY.md

@@ -78,3 +78,10 @@ Bug fix release:
 * [Issue 41](https://github.com/adobe-apiplatform/umapi-client.py/issues/41)
     * original fix had an overly accepting email/username validator
     * there were formatting errors in the failed validation reports
+
+### Version 2.5
+
+Bug fix release:
+
+* [Issue 44](https://github.com/adobe-apiplatform/umapi-client.py/issues/44)
+    * Default behavior of UsersQuery is now correct: only return direct memberships in the info about queried users.

tests/test_functional.py

@@ -22,8 +22,11 @@
 
 import pytest
 
+from conftest import mock_connection_params
+from umapi_client import Connection
 from umapi_client import IdentityTypes, GroupTypes, RoleTypes
 from umapi_client import UserAction, UserGroupAction
+from umapi_client import UsersQuery
 
 
 def test_user_emptyid():
@@ -399,3 +402,13 @@ def test_remove_users_error():
     group = UserGroupAction(group_name="SampleUsers")
     with pytest.raises(ValueError):
         group.remove_users(users=[])
+
+
+def test_query_users():
+    conn = Connection(**mock_connection_params)
+    query = UsersQuery(conn)
+    assert query.url_params == []
+    assert query.query_params == {"directOnly": True}
+    query = UsersQuery(conn, in_group="test", in_domain="test.com", direct_only=False)
+    assert query.url_params == ["test"]
+    assert query.query_params == {"directOnly": False, "domain": "test.com"}

umapi_client/version.py

@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = "2.4.1"
+__version__ = "2.5"