Fix integration test utils

jupyterlab · Oct 23, 2023 · c383552 · c383552
1 parent 4577c58
commit c383552
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 25 deletions.
diff --git a/ui-tests/tests/add-tag.spec.ts b/ui-tests/tests/add-tag.spec.ts
@@ -6,9 +6,9 @@ const baseRepositoryPath = 'test-repository-dirty.tar.gz';
 test.use({ autoGoto: false, mockSettings: galata.DEFAULT_SETTINGS });
 
 test.describe('Add tag', () => {
-  test.beforeEach(async ({ baseURL, page, tmpPath }) => {
+  test.beforeEach(async ({ page, request, tmpPath }) => {
     await extractFile(
-      baseURL,
+      request,
       path.resolve(__dirname, 'data', baseRepositoryPath),
       path.join(tmpPath, 'repository.tar.gz')
     );

diff --git a/ui-tests/tests/commit-diff.spec.ts b/ui-tests/tests/commit-diff.spec.ts
@@ -6,9 +6,9 @@ const baseRepositoryPath = 'test-repository.tar.gz';
 test.use({ autoGoto: false });
 
 test.describe('Commits diff', () => {
-  test.beforeEach(async ({ baseURL, page, tmpPath }) => {
+  test.beforeEach(async ({ page, request, tmpPath }) => {
     await extractFile(
-      baseURL,
+      request,
       path.resolve(__dirname, 'data', baseRepositoryPath),
       path.join(tmpPath, 'repository.tar.gz')
     );

diff --git a/ui-tests/tests/file-selection.spec.ts b/ui-tests/tests/file-selection.spec.ts
@@ -6,9 +6,9 @@ const baseRepositoryPath = 'test-repository-dirty.tar.gz';
 test.use({ autoGoto: false });
 
 test.describe('File selection for normal staging', () => {
-  test.beforeEach(async ({ baseURL, page, tmpPath }) => {
+  test.beforeEach(async ({ page, request, tmpPath }) => {
     await extractFile(
-      baseURL,
+      request,
       path.resolve(__dirname, 'data', baseRepositoryPath),
       path.join(tmpPath, 'repository.tar.gz')
     );
@@ -51,9 +51,9 @@ test.describe('File selection for normal staging', () => {
 });
 
 test.describe('File selection for simple staging', () => {
-  test.beforeEach(async ({ baseURL, page, tmpPath }) => {
+  test.beforeEach(async ({ page, request, tmpPath }) => {
     await extractFile(
-      baseURL,
+      request,
       path.resolve(__dirname, 'data', baseRepositoryPath),
       path.join(tmpPath, 'repository.tar.gz')
     );

diff --git a/ui-tests/tests/git-stash.spec.ts b/ui-tests/tests/git-stash.spec.ts
@@ -6,9 +6,9 @@ const baseRepositoryPath = 'test-repository-stash.tar.gz';
 test.use({ autoGoto: false });
 
 test.describe('Git Stash Commands', () => {
-  test.beforeEach(async ({ baseURL, page, tmpPath }) => {
+  test.beforeEach(async ({ page, request, tmpPath }) => {
     await extractFile(
-      baseURL,
+      request,
       path.resolve(__dirname, 'data', baseRepositoryPath),
       path.join(tmpPath, 'repository.tar.gz')
     );

diff --git a/ui-tests/tests/image-diff.spec.ts b/ui-tests/tests/image-diff.spec.ts
@@ -6,9 +6,9 @@ const baseRepositoryPath = 'test-repository.tar.gz';
 test.use({ autoGoto: false });
 
 test.describe('Image diff', () => {
-  test.beforeEach(async ({ baseURL, page, tmpPath }) => {
+  test.beforeEach(async ({ page, request, tmpPath }) => {
     await extractFile(
-      baseURL,
+      request,
       path.resolve(__dirname, 'data', baseRepositoryPath),
       path.join(tmpPath, 'repository.tar.gz')
     );

diff --git a/ui-tests/tests/merge-commit.spec.ts b/ui-tests/tests/merge-commit.spec.ts
@@ -6,9 +6,9 @@ const baseRepositoryPath = 'test-repository-merge-commits.tar.gz';
 test.use({ autoGoto: false, mockSettings: galata.DEFAULT_SETTINGS });
 
 test.describe('Merge commit tests', () => {
-  test.beforeEach(async ({ baseURL, page, tmpPath }) => {
+  test.beforeEach(async ({ page, request, tmpPath }) => {
     await extractFile(
-      baseURL,
+      request,
       path.resolve(__dirname, 'data', baseRepositoryPath),
       path.join(tmpPath, 'repository.tar.gz')
     );

diff --git a/ui-tests/tests/merge-conflict.spec.ts b/ui-tests/tests/merge-conflict.spec.ts
@@ -6,9 +6,9 @@ const baseRepositoryPath = 'test-repository.tar.gz';
 test.use({ autoGoto: false, mockSettings: galata.DEFAULT_SETTINGS });
 
 test.describe('Merge conflict tests', () => {
-  test.beforeEach(async ({ baseURL, page, tmpPath }) => {
+  test.beforeEach(async ({ page, request, tmpPath }) => {
     await extractFile(
-      baseURL,
+      request,
       path.resolve(__dirname, 'data', baseRepositoryPath),
       path.join(tmpPath, 'repository.tar.gz')
     );

diff --git a/ui-tests/tests/rebase.spec.ts b/ui-tests/tests/rebase.spec.ts
@@ -6,9 +6,9 @@ const baseRepositoryPath = 'test-repository.tar.gz';
 test.use({ autoGoto: false, mockSettings: galata.DEFAULT_SETTINGS });
 
 test.describe('Rebase', () => {
-  test.beforeEach(async ({ baseURL, page, tmpPath }) => {
+  test.beforeEach(async ({ page, request, tmpPath }) => {
     await extractFile(
-      baseURL,
+      request,
       path.resolve(__dirname, 'data', baseRepositoryPath),
       path.join(tmpPath, 'repository.tar.gz')
     );

diff --git a/ui-tests/tests/utils.ts b/ui-tests/tests/utils.ts
@@ -1,18 +1,15 @@
 import { galata } from '@jupyterlab/galata';
-import fetch from 'node-fetch';
-import path from 'path';
+import { APIRequestContext } from '@playwright/test';
 
 export async function extractFile(
-  baseURL: string,
+  request: APIRequestContext,
   filePath: string,
   destination: string
 ): Promise<void> {
-  const contents = galata.newContentsHelper(baseURL);
+  const contents = galata.newContentsHelper(request);
   await contents.uploadFile(filePath, destination);
 
-  await fetch(`${contents.baseURL}/extract-archive/${destination}`, {
-    method: 'GET'
-  });
+  await request.get(`/extract-archive/${destination}`);
 
   await contents.deleteFile(destination);
 }