Skip to content

Add oauth integration test #101

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

Merged
julien-nc merged 8 commits into from
Mar 13, 2026
Merged

Add oauth integration test #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
94e9eba
chore: add oauth integration test
julien-nc Mar 12, 2026
9c40822
include psalm/composer.lock
julien-nc Mar 12, 2026
bcc113e
use phpunit 11
julien-nc Mar 12, 2026
89545a7
get rid of coverage warning
julien-nc Mar 12, 2026
4a3b07f
update phpseclib/phpseclib
julien-nc Mar 12, 2026
fffb086
migrate code to phpseclib3
julien-nc Mar 12, 2026
0e09d8b
delete nonce instead of setting it to ''
julien-nc Mar 12, 2026
1c90f27
safer decryption with rsa key
julien-nc Mar 13, 2026
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
4 changes: 3 additions & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,6 @@ jobs:
env:
DISCOURSE_URL: ${{ secrets.DISCOURSE_URL }}
DISCOURSE_TOKEN: ${{ secrets.DISCOURSE_TOKEN }}
run: phpunit -c tests/phpunit.integration.xml
DISCOURSE_USER_LOGIN: ${{ secrets.DISCOURSE_USER_LOGIN }}
DISCOURSE_USER_PASSWORD: ${{ secrets.DISCOURSE_USER_PASSWORD }}
run: composer run test:integration
34 changes: 17 additions & 17 deletions .github/workflows/phpunit-mariadb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,23 +157,23 @@ jobs:
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:unit

- name: Check PHPUnit integration script is defined
id: check_integration
continue-on-error: true
working-directory: apps/${{ env.APP_NAME }}
run: |
composer run --list | grep '^ test:integration ' | wc -l | grep 1

- name: Run Nextcloud
# Only run if phpunit integration config file exists
if: steps.check_integration.outcome == 'success'
run: php -S localhost:8080 &

- name: PHPUnit integration
# Only run if phpunit integration config file exists
if: steps.check_integration.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:integration
#- name: Check PHPUnit integration script is defined
# id: check_integration
# continue-on-error: true
# working-directory: apps/${{ env.APP_NAME }}
# run: |
# composer run --list | grep '^ test:integration ' | wc -l | grep 1

#- name: Run Nextcloud
# # Only run if phpunit integration config file exists
# if: steps.check_integration.outcome == 'success'
# run: php -S localhost:8080 &

#- name: PHPUnit integration
# # Only run if phpunit integration config file exists
# if: steps.check_integration.outcome == 'success'
# working-directory: apps/${{ env.APP_NAME }}
# run: composer run test:integration

- name: Print logs
if: always()
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/phpunit-pgsql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,23 +153,23 @@ jobs:
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:unit

- name: Check PHPUnit integration script is defined
id: check_integration
continue-on-error: true
working-directory: apps/${{ env.APP_NAME }}
run: |
composer run --list | grep '^ test:integration ' | wc -l | grep 1

- name: Run Nextcloud
# Only run if phpunit integration config file exists
if: steps.check_integration.outcome == 'success'
run: php -S localhost:8080 &

- name: PHPUnit integration
# Only run if phpunit integration config file exists
if: steps.check_integration.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:integration
#- name: Check PHPUnit integration script is defined
# id: check_integration
# continue-on-error: true
# working-directory: apps/${{ env.APP_NAME }}
# run: |
# composer run --list | grep '^ test:integration ' | wc -l | grep 1

#- name: Run Nextcloud
# # Only run if phpunit integration config file exists
# if: steps.check_integration.outcome == 'success'
# run: php -S localhost:8080 &

#- name: PHPUnit integration
# # Only run if phpunit integration config file exists
# if: steps.check_integration.outcome == 'success'
# working-directory: apps/${{ env.APP_NAME }}
# run: composer run test:integration

- name: Print logs
if: always()
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
]
},
"require": {
"phpseclib/phpseclib": "^2.0.28",
"phpseclib/phpseclib": "^3",
"bamarni/composer-bin-plugin": "^1.9"
},
"require-dev": {
"nextcloud/ocp": "dev-master",
"nextcloud/coding-standard": "^1.1",
"phpunit/phpunit": "^9.5"
"phpunit/phpunit": "^11"
},
"config": {
"allow-plugins": {
Expand Down
Loading
Loading