Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: e2eテストがCIで失敗していた問題をいくつか修正 #8642

Merged
merged 3 commits into from
May 14, 2022
Merged

test: e2eテストがCIで失敗していた問題をいくつか修正 #8642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
089a0d6
test: indexeddbをテスト毎に初期化するように
ishowta May 10, 2022
28269f6
fix: metaが無いときにfetch-metaを同時に呼ぶと死ぬことがある問題を修正
ishowta May 10, 2022
94200f7
test: ログイン後のクライアント側処理を待たずにリロードされてログイン出来ないことがあったのを修正
ishowta May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions cypress/integration/basic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
describe('Before setup instance', () => {
beforeEach(() => {
cy.window(win => {
win.indexedDB.deleteDatabase('keyval-store');
});
cy.request('POST', '/api/reset-db').as('reset');
cy.get('@reset').its('status').should('equal', 204);
cy.reload(true);
Expand Down Expand Up @@ -32,6 +35,9 @@ describe('Before setup instance', () => {

describe('After setup instance', () => {
beforeEach(() => {
cy.window(win => {
win.indexedDB.deleteDatabase('keyval-store');
});
cy.request('POST', '/api/reset-db').as('reset');
cy.get('@reset').its('status').should('equal', 204);
cy.reload(true);
Expand Down Expand Up @@ -70,6 +76,9 @@ describe('After setup instance', () => {

describe('After user signup', () => {
beforeEach(() => {
cy.window(win => {
win.indexedDB.deleteDatabase('keyval-store');
});
cy.request('POST', '/api/reset-db').as('reset');
cy.get('@reset').its('status').should('equal', 204);
cy.reload(true);
Expand Down Expand Up @@ -129,6 +138,9 @@ describe('After user signup', () => {

describe('After user singed in', () => {
beforeEach(() => {
cy.window(win => {
win.indexedDB.deleteDatabase('keyval-store');
});
cy.request('POST', '/api/reset-db').as('reset');
cy.get('@reset').its('status').should('equal', 204);
cy.reload(true);
Expand Down Expand Up @@ -163,12 +175,10 @@ describe('After user singed in', () => {
});

it('successfully loads', () => {
cy.visit('/');
cy.get('[data-cy-open-post-form]').should('be.visible');
});

it('note', () => {
cy.visit('/');

cy.get('[data-cy-open-post-form]').click();
cy.get('[data-cy-post-form-text]').type('Hello, Misskey!');
cy.get('[data-cy-open-post-form-submit]').click();
Expand Down
13 changes: 10 additions & 3 deletions packages/backend/src/misc/fetch-meta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,16 @@ export async function fetchMeta(noCache = false): Promise<Meta> {
cache = meta;
return meta;
} else {
const saved = await transactionalEntityManager.save(Meta, {
id: 'x',
}) as Meta;
// metaが空のときfetchMetaが同時に呼ばれるとここが同時に呼ばれてしまうことがあるのでフェイルセーフなupsertを使う
const saved = await transactionalEntityManager
.upsert(
Meta,
{
id: 'x',
},
['id'],
)
.then((x) => transactionalEntityManager.findOneByOrFail(Meta, x.identifiers[0]));

cache = saved;
return saved;
Expand Down