Fix e2e tests

jkokosar · Feb 22, 2022 · 0137a12 · 0137a12
1 parent e28dac1
commit 0137a12
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/docs/files/tutorial-create.py b/docs/files/tutorial-create.py
@@ -89,18 +89,18 @@
 
 # Run a workflow
 res.run(
-    slug='workflow-bbduk-star-featurecounts-qc-single',
+    slug='workflow-bbduk-star-featurecounts-qc',
     input={
-        'preprocessing': {'reads': reads},
-        'alignment': {'genome': res.data.get('resdk-example-genome-index')},
-        'quantification': {'annotation': res.data.get('resdk-example-annotation')},
-        'qc': {
-            'globin_reference': res.data.get('resdk-example-globin-index'),
-            'rrna_reference': res.data.get('resdk-example-rrna-index'),
-        },
+        'reads': reads,
+        'genome': res.data.get('resdk-example-genome-index'),
+        'annotation': res.data.get('resdk-example-annotation'),
+        'rrna_reference': res.data.get('resdk-example-rrna-index'),
+        'globin_reference': res.data.get('resdk-example-globin-index'),
     }
 )
 
+
+
 # Update the data object to get the most recent info
 alignment.update()
 

diff --git a/docs/tutorial-create.rst b/docs/tutorial-create.rst
@@ -183,7 +183,7 @@ normal process and have a process slug, inputs... For example, we
 can run workflow "General RNA-seq pipeline" on our reads:
 
 .. literalinclude:: files/tutorial-create.py
-   :lines: 90-102
+   :lines: 90-100
 
 Solving problems
 ================

diff --git a/tests/functional/docs/e2e_docs.py b/tests/functional/docs/e2e_docs.py
@@ -210,7 +210,7 @@ def setUp(self):
         # Set permissions for running processes:
         self.allow_run_process(self.res, "upload-fastq-single")
         self.allow_run_process(self.res, "alignment-star")
-        self.allow_run_process(self.res, "workflow-bbduk-star-featurecounts-qc-single")
+        self.allow_run_process(self.res, "workflow-bbduk-star-featurecounts-qc")
         # Set permissions for using descriptor_schemas:
         self.allow_use_descriptor_schema(self.res, "reads")
         self.allow_use_descriptor_schema(self.res, "sample")

diff --git a/tests/functional/resolwe/e2e_resolwe.py b/tests/functional/resolwe/e2e_resolwe.py
@@ -76,7 +76,5 @@ def test_admin_user(self):
     def test_ordering(self):
         usage_info = self.res.data_usage(ordering=["username"])
         self.assertEqual(len(usage_info), 2)
-        first = usage_info[0]
-        second = usage_info[1]
-        self.assertEqual(first["username"], ADMIN_USERNAME)
-        self.assertEqual(second["username"], USER_USERNAME)
+        self.assertEqual(usage_info[0]["username"], ADMIN_USERNAME)
+        self.assertEqual(usage_info[1]["username"], USER_USERNAME)