Skip to content

Commit

Permalink
Merge pull request #593 from nextcloud/dependabot/npm_and_yarn/nextcl…
Browse files Browse the repository at this point in the history
…oud/vue-2.6.4
  • Loading branch information
skjnldsv authored Sep 4, 2020
2 parents 2500d53 + b6b7b41 commit 67105ff
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 64 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/dependabot-approve-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,11 @@ name: Dependabot
on: pull_request

jobs:
auto-approve:
runs-on: ubuntu-latest
steps:
- uses: hmarr/[email protected]
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

auto-merge:
runs-on: ubuntu-latest
steps:
- uses: ahmadnassri/action-dependabot-auto-merge@v1
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
target: patch
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
10 changes: 5 additions & 5 deletions cypress/integration/sidebar.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already
// we hide the sidebar button if opened
cy.get('#viewer-content .modal-header button.icon-menu-sidebar-white-forced').should('not.be.visible')
// check the sidebar is opened for the correct file
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__title').should('contain', 'image1.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image1.jpg')
// check we indeed have a preview
cy.get('aside.app-sidebar .app-sidebar-header').should('have.class', 'app-sidebar-header--with-figure')
cy.getFileId('image1.jpg').then(fileID1 => {
Expand All @@ -104,11 +104,11 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already
cy.get('aside.app-sidebar').should('be.visible')

// check the sidebar is opened for the correct file
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__title').should('contain', 'image1.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image1.jpg')

// open the next file (image2.png) using the arrow
cy.get('#viewer-content .icon-next').click()
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__title').should('contain', 'image2.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image2.jpg')
})

it('Does not have any visual regression 3', function() {
Expand All @@ -123,11 +123,11 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already
cy.get('aside.app-sidebar').should('be.visible')

// check the sidebar is opened for the correct file
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__title').should('contain', 'image2.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image2.jpg')

// open the previous file (image1.png) using the arrow
cy.get('#viewer-content .icon-previous').click()
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__title').should('contain', 'image1.jpg')
cy.get('aside.app-sidebar .app-sidebar-header .app-sidebar-header__maintitle').should('contain', 'image1.jpg')
})

it('Does not have any visual regression 4', function() {
Expand Down
57 changes: 29 additions & 28 deletions js/viewer-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-main.js.map

Large diffs are not rendered by default.

31 changes: 10 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@nextcloud/dialogs": "^2.0.1",
"@nextcloud/paths": "^1.1.2",
"@nextcloud/router": "^1.2.0",
"@nextcloud/vue": "^2.6.1",
"@nextcloud/vue": "^2.6.4",
"camelcase": "^6.0.0",
"core-js": "^3.6.5",
"debounce": "^1.2.0",
Expand Down

0 comments on commit 67105ff

Please sign in to comment.