diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-14 20:21:06 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-14 20:21:06 +0900 |
| commit | 8451e08aaa4609d40ae0ec0f9c1164637c784120 (patch) | |
| tree | 5e2cdfe46eb1568dd650b41fbe3dc93f74b659af | |
| parent | enhance(server): add rate limits for some endpoints (diff) | |
| parent | forkしたリポジトリからのPRではCI Destroy preview environment が... (diff) | |
| download | misskey-8451e08aaa4609d40ae0ec0f9c1164637c784120.tar.gz misskey-8451e08aaa4609d40ae0ec0f9c1164637c784120.tar.bz2 misskey-8451e08aaa4609d40ae0ec0f9c1164637c784120.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
| -rw-r--r-- | .github/workflows/pr-preview-deploy.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/pr-preview-destroy.yml | 1 | ||||
| -rw-r--r-- | cypress/e2e/widgets.cy.js | 4 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkWidgets.vue | 6 |
5 files changed, 7 insertions, 9 deletions
diff --git a/.github/workflows/pr-preview-deploy.yml b/.github/workflows/pr-preview-deploy.yml index fd43bce9e6..f43d1b2290 100644 --- a/.github/workflows/pr-preview-deploy.yml +++ b/.github/workflows/pr-preview-deploy.yml @@ -1,7 +1,5 @@ # Run secret-dependent integration tests only after /deploy approval on: - pull_request: - types: [opened, reopened, synchronize] repository_dispatch: types: [deploy-command] @@ -12,7 +10,6 @@ jobs: deploy-preview-environment: runs-on: ubuntu-latest if: - github.event_name == 'repository_dispatch' && github.event.client_payload.slash_command.sha != '' && contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha) steps: diff --git a/.github/workflows/pr-preview-destroy.yml b/.github/workflows/pr-preview-destroy.yml index c14c3db5c5..49f1ba8a34 100644 --- a/.github/workflows/pr-preview-destroy.yml +++ b/.github/workflows/pr-preview-destroy.yml @@ -9,6 +9,7 @@ name: Destroy preview environment jobs: destroy-preview-environment: runs-on: ubuntu-latest + if: github.repository == github.event.pull_request.head.repo.full_name steps: - name: Context uses: okteto/context@latest diff --git a/cypress/e2e/widgets.cy.js b/cypress/e2e/widgets.cy.js index 56ad95ee94..f0ca30b71b 100644 --- a/cypress/e2e/widgets.cy.js +++ b/cypress/e2e/widgets.cy.js @@ -29,8 +29,8 @@ describe('After user signed in', () => { it('first widget should be removed', () => { cy.get('.mk-widget-edit').click(); - cy.get('.customize-container:first-child .remove._button').click(); - cy.get('.customize-container').should('have.length', 2); + cy.get('.data-cy-customize-container:first-child .data-cy-customize-container-remove._button').click(); + cy.get('.data-cy-customize-container').should('have.length', 2); }); function buildWidgetTest(widgetName) { diff --git a/package.json b/package.json index bedfbc5a19..67c6a949a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "13.0.0-rc.3", + "version": "13.0.0-rc.4", "codename": "indigo", "repository": { "type": "git", diff --git a/packages/frontend/src/components/MkWidgets.vue b/packages/frontend/src/components/MkWidgets.vue index e3e4484405..eff64c12e5 100644 --- a/packages/frontend/src/components/MkWidgets.vue +++ b/packages/frontend/src/components/MkWidgets.vue @@ -19,9 +19,9 @@ @update:model-value="v => emit('updateWidgets', v)" > <template #item="{element}"> - <div :class="[$style.widget, $style['customize-container']]"> + <div :class="[$style.widget, $style['customize-container']]" class="data-cy-customize-container"> <button :class="$style['customize-container-config']" class="_button" @click.prevent.stop="configWidget(element.id)"><i class="ti ti-settings"></i></button> - <button :class="$style['customize-container-remove']" class="_button" @click.prevent.stop="removeWidget(element)"><i class="ti ti-x"></i></button> + <button :class="$style['customize-container-remove']" class="_button data-cy-customize-container-remove" @click.prevent.stop="removeWidget(element)"><i class="ti ti-x"></i></button> <div class="handle"> <component :is="`widget-${element.name}`" :ref="el => widgetRefs[element.id] = el" class="widget" :class="$style['customize-container-handle-widget']" :widget="element" @update-props="updateWidget(element.id, $event)"/> </div> @@ -171,7 +171,7 @@ function onContextmenu(widget: Widget, ev: MouseEvent) { &-widget { pointer-events: none; - } + } } } |