try without batches

NDLANO · May 30, 2024 · 5eab664 · 5eab664
1 parent 3e4eff0
commit 5eab664
Show file tree

Hide file tree

Showing 40 changed files with 43 additions and 41 deletions.
diff --git a/e2e/apiMocks/authenticated_MyNDLA.spec.ts_have_new_posts_in_arena.har b/e2e/apiMocks/authenticated_MyNDLA.spec.ts_have_new_posts_in_arena.har
diff --git a/e2e/apiMocks/authenticated_MyNDLA.spec.ts_have_recently_added_to_folder.har b/e2e/apiMocks/authenticated_MyNDLA.spec.ts_have_recently_added_to_folder.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_add_and_delete_folder.har b/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_add_and_delete_folder.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_copy_sharable_link_to_folder.har b/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_copy_sharable_link_to_folder.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_drag_and_drop_folders.har b/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_drag_and_drop_folders.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_edit_folder_name_on_list_item_.har b/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_edit_folder_name_on_list_item_.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_go_to_shared_folder_page.har b/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_go_to_shared_folder_page.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_share_and_unshare_folder.har b/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_can_share_and_unshare_folder.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_change_sort_order_of_folders.har b/e2e/apiMocks/authenticated_MyNDLAFolder.spec.ts_change_sort_order_of_folders.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_can_navigate_to_folders.har b/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_can_navigate_to_folders.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_can_navigate_to_profile.har b/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_can_navigate_to_profile.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_can_navigate_to_subjects.har b/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_can_navigate_to_subjects.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_can_navigate_to_tags.har b/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_can_navigate_to_tags.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_have_all_options_at_the_different_pages.har b/e2e/apiMocks/authenticated_MyNDLAMenu.spec.ts_have_all_options_at_the_different_pages.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAProfile.spec.ts_can_change_folder_sharing_settings.har b/e2e/apiMocks/authenticated_MyNDLAProfile.spec.ts_can_change_folder_sharing_settings.har
diff --git a/e2e/apiMocks/authenticated_MyNDLAProfile.spec.ts_has_name,_school_and_profile_image.har b/e2e/apiMocks/authenticated_MyNDLAProfile.spec.ts_has_name,_school_and_profile_image.har
diff --git a/e2e/apiMocks/authenticated_MyNDLASubjects.spec.ts_all_subjects_button_works.har b/e2e/apiMocks/authenticated_MyNDLASubjects.spec.ts_all_subjects_button_works.har
diff --git a/e2e/apiMocks/authenticated_MyNDLASubjects.spec.ts_has_list_of_favoritesubjects.har b/e2e/apiMocks/authenticated_MyNDLASubjects.spec.ts_has_list_of_favoritesubjects.har
diff --git a/e2e/apiMocks/unauthenticated_article.spec.ts_contains_content.har b/e2e/apiMocks/unauthenticated_article.spec.ts_contains_content.har
diff --git a/e2e/apiMocks/unauthenticated_film_page.spec.ts_film_page_has_content.har b/e2e/apiMocks/unauthenticated_film_page.spec.ts_film_page_has_content.har
diff --git a/...iMocks/unauthenticated_frontpage.spec.ts_should_have_list_of_valid_links_on_frontpage.har b/...iMocks/unauthenticated_frontpage.spec.ts_should_have_list_of_valid_links_on_frontpage.har
diff --git a/e2e/apiMocks/unauthenticated_frontpage.spec.ts_show_have_functioning_language_box.har b/e2e/apiMocks/unauthenticated_frontpage.spec.ts_show_have_functioning_language_box.har
diff --git a/e2e/apiMocks/unauthenticated_iframe.spec.ts_oembed_contains_content.har b/e2e/apiMocks/unauthenticated_iframe.spec.ts_oembed_contains_content.har
diff --git a/e2e/apiMocks/unauthenticated_iframe.spec.ts_resource_contains_content.har b/e2e/apiMocks/unauthenticated_iframe.spec.ts_resource_contains_content.har
diff --git a/e2e/apiMocks/unauthenticated_iframe.spec.ts_topic_contains_content.har b/e2e/apiMocks/unauthenticated_iframe.spec.ts_topic_contains_content.har
diff --git a/e2e/apiMocks/unauthenticated_learningpath.spec.ts_contains_content.har b/e2e/apiMocks/unauthenticated_learningpath.spec.ts_contains_content.har
diff --git a/e2e/apiMocks/unauthenticated_multidisciplinary.spec.ts_contains_content.har b/e2e/apiMocks/unauthenticated_multidisciplinary.spec.ts_contains_content.har
diff --git a/e2e/apiMocks/unauthenticated_resource.spec.ts_contains_content.har b/e2e/apiMocks/unauthenticated_resource.spec.ts_contains_content.har
diff --git a/e2e/apiMocks/unauthenticated_search.spec.ts_LTI_contains_action_elements.har b/e2e/apiMocks/unauthenticated_search.spec.ts_LTI_contains_action_elements.har
diff --git a/e2e/apiMocks/unauthenticated_search.spec.ts_contains_search_bar.har b/e2e/apiMocks/unauthenticated_search.spec.ts_contains_search_bar.har
diff --git a/e2e/apiMocks/unauthenticated_server.spec.ts_That_invalid_urls_return_status_400.har b/e2e/apiMocks/unauthenticated_server.spec.ts_That_invalid_urls_return_status_400.har
diff --git a/e2e/apiMocks/unauthenticated_subjects.spec.ts_include_a_list_of_valid_topic_links.har b/e2e/apiMocks/unauthenticated_subjects.spec.ts_include_a_list_of_valid_topic_links.har
diff --git a/e2e/apiMocks/unauthenticated_subjects.spec.ts_should_have_valid_breadcrumbs.har b/e2e/apiMocks/unauthenticated_subjects.spec.ts_should_have_valid_breadcrumbs.har
diff --git a/e2e/apiMocks/unauthenticated_toolbox.spec.ts_shows_students.har b/e2e/apiMocks/unauthenticated_toolbox.spec.ts_shows_students.har
diff --git a/e2e/apiMocks/unauthenticated_toolbox.spec.ts_shows_teachers.har b/e2e/apiMocks/unauthenticated_toolbox.spec.ts_shows_teachers.har
diff --git a/e2e/apiMocks/unauthenticated_topic.spec.ts_contains_article_header_and_introduction.har b/e2e/apiMocks/unauthenticated_topic.spec.ts_contains_article_header_and_introduction.har
diff --git a/e2e/apiMocks/unauthenticated_topic.spec.ts_show_have_functioning_language_box.har b/e2e/apiMocks/unauthenticated_topic.spec.ts_show_have_functioning_language_box.har
diff --git a/e2e/apiMocks/unauthenticated_topicMenu.spec.ts_menu_is_displayed.har b/e2e/apiMocks/unauthenticated_topicMenu.spec.ts_menu_is_displayed.har
diff --git a/e2e/specs/authenticated/MyNDLAFolder.spec.ts b/e2e/specs/authenticated/MyNDLAFolder.spec.ts
@@ -87,7 +87,7 @@ test("can add and delete folder", async ({ page, harCheckpoint }) => {
   await expect(folderList.getByRole("listitem")).toHaveCount(count);
 });
 
-test("can drag and drop folders", async ({ page }) => {
+test("can drag and drop folders", async ({ page, harCheckpoint }) => {
   await expect(page.getByRole("heading").getByText("Mine mapper")).toBeVisible();
   const folderList = page.getByRole("list").filter({ has: page.locator('[data-type="list"]') });
   await expect(folderList).toBeVisible();
@@ -102,6 +102,7 @@ test("can drag and drop folders", async ({ page }) => {
 
   await firstItem.hover();
   await page.mouse.up();
+  await harCheckpoint();
 
   const newFolderOrder = await folderList.getByRole("listitem").getByRole("heading").allTextContents();
 
@@ -111,9 +112,10 @@ test("can drag and drop folders", async ({ page }) => {
   await page.mouse.down();
   await firstItem.hover();
   await page.mouse.up();
+  await harCheckpoint();
 
   const oldFolderOrder = await folderList.getByRole("listitem").getByRole("heading").allTextContents();
-
+  await page.waitForLoadState("networkidle");
   expect(initialFolderOrder).toStrictEqual(oldFolderOrder);
 });
 

diff --git a/src/util/apiHelpers.ts b/src/util/apiHelpers.ts
@@ -239,7 +239,7 @@ export const createApolloLinks = (lang: string, versionHash?: string) => {
     headersLink,
     new BatchHttpLink({
       uri,
-      batchInterval: 1,
+      batchInterval: 100,
     }),
   ]);
 };