diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-12 19:05:07 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-12 19:05:07 +0900 |
| commit | b81ff340b1ab42254de1612c3264867205b0112f (patch) | |
| tree | 1696900c9d7dd07a0e380e9b95da01dceeeaad6e /src | |
| parent | Create config.yml (diff) | |
| download | misskey-b81ff340b1ab42254de1612c3264867205b0112f.tar.gz misskey-b81ff340b1ab42254de1612c3264867205b0112f.tar.bz2 misskey-b81ff340b1ab42254de1612c3264867205b0112f.zip | |
Introduce e2e test
Diffstat (limited to 'src')
| -rw-r--r-- | src/argv.ts | 2 | ||||
| -rw-r--r-- | src/client/components/post-form.vue | 4 | ||||
| -rwxr-xr-x | src/client/components/signin.vue | 4 | ||||
| -rw-r--r-- | src/client/components/signup.vue | 8 | ||||
| -rw-r--r-- | src/client/instance.ts | 2 | ||||
| -rw-r--r-- | src/client/pages/welcome.entrance.a.vue | 4 | ||||
| -rw-r--r-- | src/client/pages/welcome.setup.vue | 8 | ||||
| -rw-r--r-- | src/client/ui/default.sidebar.vue | 2 | ||||
| -rw-r--r-- | src/db/postgre.ts | 10 | ||||
| -rw-r--r-- | src/server/api/endpoints/reset-db.ts | 21 |
10 files changed, 50 insertions, 15 deletions
diff --git a/src/argv.ts b/src/argv.ts index ae6396129c..8e00bcf47d 100644 --- a/src/argv.ts +++ b/src/argv.ts @@ -18,7 +18,7 @@ program if (process.env.MK_ONLY_QUEUE) program.onlyQueue = true; if (process.env.NODE_ENV === 'test') program.disableClustering = true; -if (process.env.NODE_ENV === 'test') program.quiet = true; +//if (process.env.NODE_ENV === 'test') program.quiet = true; if (process.env.NODE_ENV === 'test') program.noDaemons = true; export { program }; diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue index f2c625a556..221dc74313 100644 --- a/src/client/components/post-form.vue +++ b/src/client/components/post-form.vue @@ -17,7 +17,7 @@ <span v-if="visibility === 'followers'"><i class="fas fa-unlock"></i></span> <span v-if="visibility === 'specified'"><i class="fas fa-envelope"></i></span> </button> - <button class="submit _buttonPrimary" :disabled="!canPost" @click="post">{{ submitText }}<i :class="reply ? 'fas fa-reply' : renote ? 'fas fa-quote-right' : 'fas fa-paper-plane'"></i></button> + <button class="submit _buttonPrimary" :disabled="!canPost" @click="post" data-cy-open-post-form-submit>{{ submitText }}<i :class="reply ? 'fas fa-reply' : renote ? 'fas fa-quote-right' : 'fas fa-paper-plane'"></i></button> </div> </header> <div class="form" :class="{ fixed }"> @@ -36,7 +36,7 @@ </div> <MkInfo warn v-if="hasNotSpecifiedMentions" class="hasNotSpecifiedMentions">{{ $ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ $ts.add }}</button></MkInfo> <input v-show="useCw" ref="cw" class="cw" v-model="cw" :placeholder="$ts.annotation" @keydown="onKeydown"> - <textarea v-model="text" class="text" :class="{ withCw: useCw }" ref="text" :disabled="posting" :placeholder="placeholder" @keydown="onKeydown" @paste="onPaste" @compositionupdate="onCompositionUpdate" @compositionend="onCompositionEnd" /> + <textarea v-model="text" class="text" :class="{ withCw: useCw }" ref="text" :disabled="posting" :placeholder="placeholder" @keydown="onKeydown" @paste="onPaste" @compositionupdate="onCompositionUpdate" @compositionend="onCompositionEnd" data-cy-post-form-text/> <input v-show="withHashtags" ref="hashtags" class="hashtags" v-model="hashtags" :placeholder="$ts.hashtags" list="hashtags"> <XPostFormAttaches class="attaches" :files="files" @updated="updateFiles" @detach="detachFile" @changeSensitive="updateFileSensitive" @changeName="updateFileName"/> <XPollEditor v-if="poll" :poll="poll" @destroyed="poll = null" @updated="onPollUpdate"/> diff --git a/src/client/components/signin.vue b/src/client/components/signin.vue index f1e5d6afe5..0094038fb6 100755 --- a/src/client/components/signin.vue +++ b/src/client/components/signin.vue @@ -3,11 +3,11 @@ <div class="auth _section"> <div class="avatar" :style="{ backgroundImage: user ? `url('${ user.avatarUrl }')` : null }" v-show="withAvatar"></div> <div class="normal-signin" v-if="!totpLogin"> - <MkInput v-model="username" :placeholder="$ts.username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required @update:modelValue="onUsernameChange"> + <MkInput v-model="username" :placeholder="$ts.username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required @update:modelValue="onUsernameChange" data-cy-signin-username> <template #prefix>@</template> <template #suffix>@{{ host }}</template> </MkInput> - <MkInput v-model="password" :placeholder="$ts.password" type="password" :with-password-toggle="true" v-if="!user || user && !user.usePasswordLessLogin" required> + <MkInput v-model="password" :placeholder="$ts.password" type="password" :with-password-toggle="true" v-if="!user || user && !user.usePasswordLessLogin" required data-cy-signin-password> <template #prefix><i class="fas fa-lock"></i></template> <template #caption><button class="_textButton" @click="resetPassword" type="button">{{ $ts.forgotPassword }}</button></template> </MkInput> diff --git a/src/client/components/signup.vue b/src/client/components/signup.vue index 0cdeb633d8..b0b0c2ad4d 100644 --- a/src/client/components/signup.vue +++ b/src/client/components/signup.vue @@ -5,7 +5,7 @@ <template #label>{{ $ts.invitationCode }}</template> <template #prefix><i class="fas fa-key"></i></template> </MkInput> - <MkInput v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @update:modelValue="onChangeUsername"> + <MkInput v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @update:modelValue="onChangeUsername" data-cy-signup-username> <template #label>{{ $ts.username }}</template> <template #prefix>@</template> <template #suffix>@{{ host }}</template> @@ -19,7 +19,7 @@ <span v-if="usernameState == 'max-range'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.tooLong }}</span> </template> </MkInput> - <MkInput v-model="password" type="password" :autocomplete="Math.random()" required @update:modelValue="onChangePassword"> + <MkInput v-model="password" type="password" :autocomplete="Math.random()" required @update:modelValue="onChangePassword" data-cy-signup-password> <template #label>{{ $ts.password }}</template> <template #prefix><i class="fas fa-lock"></i></template> <template #caption> @@ -28,7 +28,7 @@ <span v-if="passwordStrength == 'high'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.strongPassword }}</span> </template> </MkInput> - <MkInput v-model="retypedPassword" type="password" :autocomplete="Math.random()" required @update:modelValue="onChangePasswordRetype"> + <MkInput v-model="retypedPassword" type="password" :autocomplete="Math.random()" required @update:modelValue="onChangePasswordRetype" data-cy-signup-password-retype> <template #label>{{ $ts.password }} ({{ $ts.retype }})</template> <template #prefix><i class="fas fa-lock"></i></template> <template #caption> @@ -46,7 +46,7 @@ </label> <captcha v-if="meta.enableHcaptcha" class="captcha" provider="hcaptcha" ref="hcaptcha" v-model:value="hCaptchaResponse" :sitekey="meta.hcaptchaSiteKey"/> <captcha v-if="meta.enableRecaptcha" class="captcha" provider="recaptcha" ref="recaptcha" v-model:value="reCaptchaResponse" :sitekey="meta.recaptchaSiteKey"/> - <MkButton type="submit" :disabled="shouldDisableSubmitting" primary>{{ $ts.start }}</MkButton> + <MkButton type="submit" :disabled="shouldDisableSubmitting" primary data-cy-signup-submit>{{ $ts.start }}</MkButton> </template> </form> </template> diff --git a/src/client/instance.ts b/src/client/instance.ts index 04d3353208..6e912aa2e5 100644 --- a/src/client/instance.ts +++ b/src/client/instance.ts @@ -25,6 +25,7 @@ export async function fetchInstance() { } export const emojiCategories = computed(() => { + if (instance.emojis == null) return []; const categories = new Set(); for (const emoji of instance.emojis) { categories.add(emoji.category); @@ -33,6 +34,7 @@ export const emojiCategories = computed(() => { }); export const emojiTags = computed(() => { + if (instance.emojis == null) return []; const tags = new Set(); for (const emoji of instance.emojis) { for (const tag of emoji.aliases) { diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue index 7d49ddd7d7..82b439ddd3 100644 --- a/src/client/pages/welcome.entrance.a.vue +++ b/src/client/pages/welcome.entrance.a.vue @@ -27,8 +27,8 @@ <div class="desc" v-html="meta.description || $ts.headlineMisskey"></div> </div> <div class="action"> - <MkButton @click="signup()" inline primary>{{ $ts.signup }}</MkButton> - <MkButton @click="signin()" inline>{{ $ts.login }}</MkButton> + <MkButton @click="signup()" inline primary data-cy-signup>{{ $ts.signup }}</MkButton> + <MkButton @click="signin()" inline data-cy-signin>{{ $ts.login }}</MkButton> </div> <div class="status" v-if="onlineUsersCount && stats"> <div> diff --git a/src/client/pages/welcome.setup.vue b/src/client/pages/welcome.setup.vue index 5ed1ae49c4..de844ece1c 100644 --- a/src/client/pages/welcome.setup.vue +++ b/src/client/pages/welcome.setup.vue @@ -3,17 +3,19 @@ <h1>Welcome to Misskey!</h1> <div> <p>{{ $ts.intro }}</p> - <MkInput v-model="username" pattern="^[a-zA-Z0-9_]{1,20}$" spellcheck="false" required> + <MkInput v-model="username" pattern="^[a-zA-Z0-9_]{1,20}$" spellcheck="false" required data-cy-admin-username> <template #label>{{ $ts.username }}</template> <template #prefix>@</template> <template #suffix>@{{ host }}</template> </MkInput> - <MkInput v-model="password" type="password"> + <MkInput v-model="password" type="password" data-cy-admin-password> <template #label>{{ $ts.password }}</template> <template #prefix><i class="fas fa-lock"></i></template> </MkInput> <footer> - <MkButton primary type="submit" :disabled="submitting">{{ submitting ? $ts.processing : $ts.done }}<MkEllipsis v-if="submitting"/></MkButton> + <MkButton primary type="submit" :disabled="submitting" data-cy-admin-ok> + {{ submitting ? $ts.processing : $ts.done }}<MkEllipsis v-if="submitting"/> + </MkButton> </footer> </div> </form> diff --git a/src/client/ui/default.sidebar.vue b/src/client/ui/default.sidebar.vue index dd6d4d1516..b500ab582c 100644 --- a/src/client/ui/default.sidebar.vue +++ b/src/client/ui/default.sidebar.vue @@ -3,7 +3,7 @@ <button class="item _button account" @click="openAccountMenu" v-click-anime> <MkAvatar :user="$i" class="avatar"/><MkAcct class="text" :user="$i"/> </button> - <div class="post" @click="post"> + <div class="post" @click="post" data-cy-open-post-form> <MkButton class="button" primary full> <i class="fas fa-pencil-alt fa-fw"></i><span class="text" v-if="!iconOnly">{{ $ts.note }}</span> </MkButton> diff --git a/src/db/postgre.ts b/src/db/postgre.ts index 3ad81203f2..bc691319cf 100644 --- a/src/db/postgre.ts +++ b/src/db/postgre.ts @@ -211,3 +211,13 @@ export function initDb(justBorrow = false, sync = false, forceRecreate = false) entities: entities }); } + +export async function resetDb() { + const conn = await getConnection(); + const tables = await conn.query(`SELECT relname AS "table" + FROM pg_class C LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) + WHERE nspname NOT IN ('pg_catalog', 'information_schema') + AND C.relkind = 'r' + AND nspname !~ '^pg_toast';`); + await Promise.all(tables.map(t => t.table).map(x => conn.query(`DELETE FROM "${x}" CASCADE`))); +} diff --git a/src/server/api/endpoints/reset-db.ts b/src/server/api/endpoints/reset-db.ts new file mode 100644 index 0000000000..f430869302 --- /dev/null +++ b/src/server/api/endpoints/reset-db.ts @@ -0,0 +1,21 @@ +import $ from 'cafy'; +import define from '../define'; +import { ApiError } from '../error'; +import { resetDb } from '@/db/postgre'; + +export const meta = { + requireCredential: false as const, + + params: { + }, + + errors: { + + } +}; + +export default define(meta, async (ps, user) => { + if (process.env.NODE_ENV !== 'test') throw 'NODE_ENV is not a test'; + + await resetDb(); +}); |