Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 5 additions & 8 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ on:
- master
- stable*

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
APP_NAME: text
CYPRESS_baseUrl: http://localhost:8081/index.php
Expand All @@ -28,7 +24,7 @@ jobs:
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
with:
repository: nextcloud/server
ref: ${{ matrix.server-versions }}
ref: master
submodules: true

- name: Checkout viewer
Expand Down Expand Up @@ -122,11 +118,12 @@ jobs:
PHP_CLI_SERVER_WORKERS: 10
run: |
mkdir data
echo '<?php $CONFIG=["memcache.local"=>"\OC\Memcache\APCu","hashing_default_password"=>true];' > config/config.php
echo '<?php $CONFIG=["loglevel"=>0,"memcache.local"=>"\OC\Memcache\APCu","hashing_default_password"=>true];' > config/config.php
php occ maintenance:install --verbose --database=pgsql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
php -f index.php
php -S 0.0.0.0:8081 &
export OC_PASS=1234561
php occ background:cron
php occ user:add --password-from-env user1
php occ user:add --password-from-env user2
php occ app:enable viewer
Expand Down Expand Up @@ -161,9 +158,9 @@ jobs:

- name: Upload nextcloud logs
uses: actions/upload-artifact@v2
if: failure()
if: always()
with:
name: Upload nextcloud log
name: Upload nextcloud log ${{ matrix.containers }}
path: data/nextcloud.log
retention-days: 5

Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ on:
permissions:
contents: read

concurrency:
group: phpunit-mysql-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
phpunit-mysql:
runs-on: ubuntu-latest
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/phpunit-oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ on:
permissions:
contents: read

concurrency:
group: phpunit-oci-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
phpunit-oci:
runs-on: ubuntu-22.04
Expand Down
6 changes: 3 additions & 3 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ module.exports = defineConfig({
},

baseUrl: 'http://localhost:8081/index.php/',
experimentalSessionAndOrigin: true,
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
experimentalRunAllSpecs: true,
},
retries: {
runMode: 2,
runMode: 0,
// do not retry in `cypress open`
openMode: 0,
},
"numTestsKeptInMemory": 5,
numTestsKeptInMemory: 5,
})
Empty file.
10 changes: 10 additions & 0 deletions cypress/support/e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ import './commands.js'
import './sessions.js'
import chaiExtension from './chai.js'

beforeEach(() => {
cy.intercept('GET', '**/preview-service-worker.js', { fixture: 'preview-service-worker.txt' })
})

before(() => {
chai.use(chaiExtension)
})

Cypress.on('window:before:load', (win) => {
// disable service workers
// eslint-disable-next-line
delete win.navigator.ServiceWorker
})