Update other tests to account for fixture getting used earlier

Author: tw4l

backend/test/conftest.py

@@ -563,7 +563,7 @@ def custom_behaviors_crawl_id(admin_auth_headers, default_org_id):
 def canceled_crawl_id(admin_auth_headers, default_org_id):
     crawl_data = {
         "runNow": True,
-        "name": "Canceled crawl",
+        "name": "Canceled Crawl",
         "tags": ["canceled"],
         "config": {
             "seeds": [{"url": "https://old.webrecorder.net/"}],

backend/test/test_crawl_config_search_values.py

@@ -44,7 +44,7 @@ def test_get_search_values_1(admin_auth_headers, default_org_id):
     )
     data = r.json()
     assert sorted(data["names"]) == sorted(
-        [NAME_1, "Admin Test Crawl", "Crawler User Test Crawl"]
+        [NAME_1, "Admin Test Crawl", "Canceled Crawl", "Crawler User Test Crawl"]
     )
     assert sorted(data["descriptions"]) == sorted(
         ["Admin Test Crawl description", "crawler test crawl", DESCRIPTION_1]
@@ -74,7 +74,13 @@ def test_get_search_values_2(admin_auth_headers, default_org_id):
     )
     data = r.json()
     assert sorted(data["names"]) == sorted(
-        [NAME_1, NAME_2, "Admin Test Crawl", "Crawler User Test Crawl"]
+        [
+            NAME_1,
+            NAME_2,
+            "Admin Test Crawl",
+            "Canceled Crawl",
+            "Crawler User Test Crawl",
+        ]
     )
     assert sorted(data["descriptions"]) == sorted(
         [
@@ -111,7 +117,13 @@ def test_get_search_values_3(admin_auth_headers, default_org_id):
     )
     data = r.json()
     assert sorted(data["names"]) == sorted(
-        [NAME_1, NAME_2, "Admin Test Crawl", "Crawler User Test Crawl"]
+        [
+            NAME_1,
+            NAME_2,
+            "Admin Test Crawl",
+            "Canceled Crawl",
+            "Crawler User Test Crawl",
+        ]
     )
     assert sorted(data["descriptions"]) == sorted(
         [

backend/test/test_crawl_config_tags.py

@@ -47,7 +47,7 @@ def test_get_config_by_tag_1(admin_auth_headers, default_org_id):
         headers=admin_auth_headers,
     )
     data = r.json()
-    assert sorted(data) == ["tag-1", "tag-2", "wr-test-1", "wr-test-2"]
+    assert sorted(data) == ["canceled", "tag-1", "tag-2", "wr-test-1", "wr-test-2"]
 
 
 def test_get_config_by_tag_counts_1(admin_auth_headers, default_org_id):
@@ -59,6 +59,7 @@ def test_get_config_by_tag_counts_1(admin_auth_headers, default_org_id):
     assert data == {
         "tags": [
             {"tag": "wr-test-2", "count": 2},
+            {"tag": "canceled", "count": 1},
             {"tag": "tag-1", "count": 1},
             {"tag": "tag-2", "count": 1},
             {"tag": "wr-test-1", "count": 1},
@@ -91,6 +92,7 @@ def test_get_config_by_tag_2(admin_auth_headers, default_org_id):
     )
     data = r.json()
     assert sorted(data) == [
+        "canceled",
         "tag-0",
         "tag-1",
         "tag-2",
@@ -109,6 +111,7 @@ def test_get_config_by_tag_counts_2(admin_auth_headers, default_org_id):
     assert data == {
         "tags": [
             {"tag": "wr-test-2", "count": 2},
+            {"tag": "canceled", "count": 1},
             {"tag": "tag-0", "count": 1},
             {"tag": "tag-1", "count": 1},
             {"tag": "tag-2", "count": 1},

backend/test/test_filter_sort_results.py

@@ -102,8 +102,8 @@ def test_ensure_crawl_and_admin_user_crawls(
         f"{API_PREFIX}/orgs/{default_org_id}/crawls",
         headers=crawler_auth_headers,
     )
-    assert len(r.json()["items"]) == 2
-    assert r.json()["total"] == 2
+    assert len(r.json()["items"]) == 3
+    assert r.json()["total"] == 3
 
 
 def test_get_crawl_job_by_user(
@@ -212,9 +212,9 @@ def test_sort_crawls(
         headers=crawler_auth_headers,
     )
     data = r.json()
-    assert data["total"] == 2
+    assert data["total"] == 3
     items = data["items"]
-    assert len(items) == 2
+    assert len(items) == 3
 
     last_created = None
     for crawl in items:
@@ -362,9 +362,9 @@ def test_sort_crawl_configs(
         headers=crawler_auth_headers,
     )
     data = r.json()
-    assert data["total"] == 16
+    assert data["total"] == 17
     items = data["items"]
-    assert len(items) == 16
+    assert len(items) == 17
 
     last_created = None
     for config in items:

backend/test/test_uploads.py

@@ -592,7 +592,7 @@ def test_get_all_crawls_by_first_seed(
     )
     assert r.status_code == 200
     data = r.json()
-    assert data["total"] == 5
+    assert data["total"] == 6
     for item in data["items"]:
         assert item["firstSeed"] == first_seed
 
@@ -607,7 +607,7 @@ def test_get_all_crawls_by_type(
     )
     assert r.status_code == 200
     data = r.json()
-    assert data["total"] == 6
+    assert data["total"] == 7
     for item in data["items"]:
         assert item["type"] == "crawl"
 
@@ -823,9 +823,10 @@ def test_all_crawls_search_values(
     assert r.status_code == 200
     data = r.json()
 
-    assert len(data["names"]) == 8
+    assert len(data["names"]) == 9
     expected_names = [
         "Crawler User Test Crawl",
+        "Canceled Crawl",
         "Custom Behavior Logs",
         "My Upload Updated",
         "test2.wacz",
@@ -849,10 +850,11 @@ def test_all_crawls_search_values(
     assert r.status_code == 200
     data = r.json()
 
-    assert len(data["names"]) == 5
+    assert len(data["names"]) == 6
     expected_names = [
         "Admin Test Crawl",
         "All Crawls Test Crawl",
+        "Canceled Crawl",
         "Crawler User Crawl for Testing QA",
         "Crawler User Test Crawl",
         "Custom Behavior Logs",