Commit cee479da authored by Grant's avatar Grant
Browse files

update fedi-testkit & add reporter

parent ba394d80

.gitlab/ci/federation_test.yml

+7 −1
Original line number Diff line number Diff line
@@ -29,7 +29,13 @@ 
    - npx -w backend prisma migrate deploy

    - npx -w backend prisma generate

  script:

    - yarn workspace @fediverse-auth/backend run test

    - yarn workspace @fediverse-auth/backend run ci:test

  artifacts:

    when: always

    paths:

      - backend/vitest.xml

    reports:

      junit: backend/vitest.xml



mr test federation:

  when: manual

backend/package.json

+3 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    "@js-temporal/polyfill": "^0.5.1",

    "@logtape/logtape": "^0.9.1",

    "@prisma/client": "^5.13.0",

    "@sc07/fedi-testkit": "^1.0.2",

    "@sc07/fedi-testkit": "^1.0.3",

    "@tsconfig/recommended": "^1.0.6",

    "body-parser": "^1.20.2",

    "cookie-parser": "^1.4.6",
@@ -44,6 +44,7 @@ 
    "dev:client": "tsx -r dotenv/config src/tools/create-dev-client.ts",

    "build": "tsc",

    "start": "node dist/index.js",

    "test": "vitest"

    "test": "vitest",

    "ci:test": "vitest --reporter=junit --outputFile=./vitest.xml"

  }

}

backend/src/__tests__/federation.test.ts

+8 −2
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ const DRY_SEND = !!process.env.TEST_DRY_SEND; 


interface ITestAccount extends FTK_Software {}



const getTestConfig = async () => {

const getTestConfig = async (): Promise<{

  accounts: (ITestAccount & { label: string })[];

}> => {

  const mode = process.env.TEST_FEDERATION_MODE;



  if (mode === "KEYRING") {
@@ -200,10 +202,14 @@ describe.for( 
    await APub.sendDM(authSession);

  });



  test.sequential("Delivery", { timeout: 30_000 }, async () => {

  test.sequential("Delivery", { timeout: 30_000 }, async (ctx) => {

    if (DRY_SEND) {

      await new Promise((res) => {});

    } else {

      const version = await TestKit.getVersion();

      await ctx.annotate(

        `${label} reports as using version ${account.type} ${version}`

      );

      await TestKit.expectToHave(sessionCode, 1000);

    }

  });

yarn.lock

+5 −5
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ __metadata: 
    "@js-temporal/polyfill": "npm:^0.5.1"

    "@logtape/logtape": "npm:^0.9.1"

    "@prisma/client": "npm:^5.13.0"

    "@sc07/fedi-testkit": "npm:^1.0.2"

    "@sc07/fedi-testkit": "npm:^1.0.3"

    "@tsconfig/recommended": "npm:^1.0.6"

    "@types/cookie-parser": "npm:^1.4.7"

    "@types/cors": "npm:^2.8.17"
@@ -1419,13 +1419,13 @@ __metadata: 
  languageName: node

  linkType: hard



"@sc07/fedi-testkit@npm:^1.0.2":

  version: 1.0.2

  resolution: "@sc07/fedi-testkit@npm:1.0.2::__archiveUrl=https%3A%2F%2Fsc07.dev%2Fapi%2Fv4%2Fprojects%2F78%2Fpackages%2Fnpm%2F%40sc07%2Ffedi-testkit%2F-%2F%40sc07%2Ffedi-testkit-1.0.2.tgz"

"@sc07/fedi-testkit@npm:^1.0.3":

  version: 1.0.3

  resolution: "@sc07/fedi-testkit@npm:1.0.3::__archiveUrl=https%3A%2F%2Fsc07.dev%2Fapi%2Fv4%2Fprojects%2F78%2Fpackages%2Fnpm%2F%40sc07%2Ffedi-testkit%2F-%2F%40sc07%2Ffedi-testkit-1.0.3.tgz"

  dependencies:

    puppeteer: "npm:^24.33.0"

    tsx: "npm:^4.21.0"

  checksum: 10c0/d101bafd4687785157c03e85d2683b41f0832f84a885ca58833411c3065929f89e1a97429b4f0366c3063668e3f4592a4ead73eab6e693e7b9bb8a88fb264cd8

  checksum: 10c0/5a46994aaefef017353cad66ed6aaf9577fb73f32a982486e45658036c7d0b618d4ccd26dc99e1c6a5b8db089162ca1dab78a0f9c8b8309ce796239246500dbb

  languageName: node

  linkType: hard