feat(fixtures): add user1 and user2 fixtures (#113)

BREAKING CHANGE: This commit replaces the default_user fixture with
user1 and user2 fixtures. The default_user fixture is now deprecated and
will be removed in the next release.

Related to reanahub/reana-client#680

Author: Daan Rosendal

AUTHORS.md

@@ -4,6 +4,7 @@ The list of contributors in alphabetical order:
 
 - [Audrius Mecionis](https://orcid.org/0000-0002-3759-1663)
 - [Camila Diaz](https://orcid.org/0000-0001-5543-797X)
+- [Daan Rosendal](https://orcid.org/0000-0002-3447-9000)
 - [Diego Rodriguez](https://orcid.org/0000-0003-0649-2002)
 - [Dinos Kousidis](https://orcid.org/0000-0002-4914-4289)
 - [Giuseppe Steduto](https://orcid.org/0009-0002-1258-8553)

pytest_reana/fixtures.py

@@ -120,35 +120,99 @@ def create_ninja_turtle()
 
 
 @pytest.fixture()
-def default_user(app, session):
-    """Create users.
+def user0(app, session):
+    """Create admin user.
 
     Scope: function
 
-    This fixture creates an user with a default UUID
-    ``00000000-0000-0000-0000-000000000000``, ``email`` `info@reana.io`
-    and ``access_token`` ``secretkey`` and returns it.
+    This fixture creates an admin user with a default UUID
+    ``00000000-0000-0000-0000-000000000000``, ``email`` `user0@reana.io`
+    and ``access_token`` ``user0token`` and returns it.
 
     .. code-block:: python
 
-        def test_default_user_exists(default)
+        def test_user0_exists(default)
             with app.test_client() as client:
                 res = client.post(url_for('api.get_users'),
-                                  query_string={"user": default_user.id_})
+                                  query_string={"user": user0.id_})
 
                 assert res.status_code == 200
 
 
     """
     from reana_db.models import User
 
-    default_user_id = "00000000-0000-0000-0000-000000000000"
-    user = User.query.filter_by(id_=default_user_id).first()
+    user0_id = "00000000-0000-0000-0000-000000000000"
+    user = User.query.filter_by(id_=user0_id).first()
     if not user:
         with patch("reana_db.database.Session", return_value=session):
-            user = User(
-                id_=default_user_id, email="info@reana.io", access_token="secretkey"
-            )
+            user = User(id_=user0_id, email="user0@reana.io", access_token="user0token")
+        session.add(user)
+        session.commit()
+    return user
+
+
+@pytest.fixture()
+def user1(app, session):
+    """Create first regular user.
+
+    Scope: function
+
+    This fixture creates a user with UUID
+    ``11111111-1111-1111-1111-111111111111``, ``email`` `user1@reana.io`
+    and ``access_token`` ``user1token`` and returns it.
+
+    .. code-block:: python
+
+        def test_user1_exists(default)
+            with app.test_client() as client:
+                res = client.post(url_for('api.get_users'),
+                                  query_string={"user": user1.id_})
+
+                assert res.status_code == 200
+
+
+    """
+    from reana_db.models import User
+
+    user1_id = "11111111-1111-1111-1111-111111111111"
+    user = User.query.filter_by(id_=user1_id).first()
+    if not user:
+        with patch("reana_db.database.Session", return_value=session):
+            user = User(id_=user1_id, email="user1@reana.io", access_token="user1token")
+        session.add(user)
+        session.commit()
+    return user
+
+
+@pytest.fixture()
+def user2(app, session):
+    """Create second regular user.
+
+    Scope: function
+
+    This fixture creates a user with UUID
+    ``22222222-2222-2222-2222-222222222222``, ``email`` `user2@reana.io`
+    and ``access_token`` ``user2token`` and returns it.
+
+    .. code-block:: python
+
+        def test_user2_exists(default)
+            with app.test_client() as client:
+                res = client.post(url_for('api.get_users'),
+                                  query_string={"user": user2.id_})
+
+                assert res.status_code == 200
+
+
+    """
+    from reana_db.models import User
+
+    user2_id = "22222222-2222-2222-2222-222222222222"
+    user = User.query.filter_by(id_=user2_id).first()
+    if not user:
+        with patch("reana_db.database.Session", return_value=session):
+            user = User(id_=user2_id, email="user2@reana.io", access_token="user2token")
         session.add(user)
         session.commit()
     return user
@@ -712,7 +776,7 @@ def _create_sample_workflow_workspace(relative_workspace_path):
 @pytest.fixture()
 def sample_yadage_workflow_in_db(
     app,
-    default_user,
+    user0,
     session,
     yadage_workflow_with_name,
     sample_workflow_workspace,
@@ -728,13 +792,13 @@ def sample_yadage_workflow_in_db(
 
     workflow_id = uuid4()
     relative_workspace_path = build_workspace_path(
-        default_user.id_, workflow_id, tmp_shared_volume_path
+        user0.id_, workflow_id, tmp_shared_volume_path
     )
     next(sample_workflow_workspace(relative_workspace_path))
     workflow = Workflow(
         id_=workflow_id,
         name="sample_serial_workflow_1",
-        owner_id=default_user.id_,
+        owner_id=user0.id_,
         reana_specification=yadage_workflow_with_name["reana_specification"],
         operational_options={},
         type_=yadage_workflow_with_name["reana_specification"]["workflow"]["type"],
@@ -753,7 +817,7 @@ def sample_yadage_workflow_in_db(
 @pytest.fixture()
 def sample_serial_workflow_in_db(
     app,
-    default_user,
+    user0,
     session,
     serial_workflow,
     sample_workflow_workspace,
@@ -769,13 +833,13 @@ def sample_serial_workflow_in_db(
 
     workflow_id = uuid4()
     relative_workspace_path = build_workspace_path(
-        default_user.id_, workflow_id, tmp_shared_volume_path
+        user0.id_, workflow_id, tmp_shared_volume_path
     )
     next(sample_workflow_workspace(relative_workspace_path))
     workflow = Workflow(
         id_=workflow_id,
         name="sample_serial_workflow_1",
-        owner_id=default_user.id_,
+        owner_id=user0.id_,
         reana_specification=serial_workflow["reana_specification"],
         operational_options={},
         type_=serial_workflow["reana_specification"]["workflow"]["type"],

pytest_reana/plugin.py

@@ -20,7 +20,6 @@
     default_exchange,
     default_in_memory_producer,
     default_queue,
-    default_user,
     empty_user_secrets,
     in_memory_queue_connection,
     kerberos_user_secrets,
@@ -32,8 +31,11 @@
     session,
     snakemake_workflow_spec_loaded,
     tmp_shared_volume_path,
+    user0,
+    user1,
+    user2,
     user_secrets,
+    yadage_workflow_spec_loaded,
     yadage_workflow_with_name,
     yadage_workflow_without_name,
-    yadage_workflow_spec_loaded,
 )