ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2046 from nextcloud/dependabot/npm_and_yarn/js/stable0.8/angular-1.8.0

Browse Source
This commit is contained in:
Julius Härtl
2020-06-26 11:36:50 +02:00
committed by GitHub
parent 6c0da2bea1 ccc02e23b6
commit 1ce0643c6b
8 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.drone.yml
View File

@@ -5,7 +5,7 @@ steps:
image: nextcloudci/php7.2:php7.2-13 image: nextcloudci/php7.2:php7.2-13
environment: environment:
APP_NAME: deck APP_NAME: deck
CORE_BRANCH: master CORE_BRANCH: stable17
DB: sqlite DB: sqlite
commands: commands:
# Pre-setup steps # Pre-setup steps
@@ -20,7 +20,7 @@ steps:
image: nextcloudci/php7.2:php7.2-13 image: nextcloudci/php7.2:php7.2-13
environment: environment:
APP_NAME: deck APP_NAME: deck
CORE_BRANCH: master CORE_BRANCH: stable17
DB: sqlite DB: sqlite
commands: commands:
- composer install - composer install
@@ -29,7 +29,7 @@ steps:
image: nextcloudci/php7.3:php7.3-2 image: nextcloudci/php7.3:php7.3-2
environment: environment:
APP_NAME: deck APP_NAME: deck
CORE_BRANCH: master CORE_BRANCH: stable17
DB: sqlite DB: sqlite
commands: commands:
- composer install - composer install
@@ -38,7 +38,7 @@ steps:
image: nextcloudci/php7.4:2 image: nextcloudci/php7.4:2
environment: environment:
APP_NAME: deck APP_NAME: deck
CORE_BRANCH: master CORE_BRANCH: stable17
DB: sqlite DB: sqlite
commands: commands:
- composer install - composer install
@@ -58,7 +58,7 @@ steps:
image: nextcloudci/php7.2:php7.2-13 image: nextcloudci/php7.2:php7.2-13
environment: environment:
APP_NAME: deck APP_NAME: deck
CORE_BRANCH: master CORE_BRANCH: stable17
DB: sqlite DB: sqlite
commands: commands:
# Pre-setup steps # Pre-setup steps
@@ -68,8 +68,8 @@ steps:
- php occ app:enable deck - php occ app:enable deck
- cd apps/$APP_NAME - cd apps/$APP_NAME
- composer install - composer install
- phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml - ./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
- phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml - ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
trigger: trigger:
branch: branch:
- master - master
@@ -85,7 +85,7 @@ steps:
image: nextcloudci/php7.3:php7.3-5 image: nextcloudci/php7.3:php7.3-5
environment: environment:
APP_NAME: deck APP_NAME: deck
CORE_BRANCH: master CORE_BRANCH: stable17
DB: sqlite DB: sqlite
commands: commands:
# Pre-setup steps # Pre-setup steps
@@ -95,8 +95,8 @@ steps:
- php occ app:enable deck - php occ app:enable deck
- cd apps/$APP_NAME - cd apps/$APP_NAME
- composer install - composer install
- phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml - ./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
- phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml - ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
trigger: trigger:
branch: branch:
- master - master
@@ -112,7 +112,7 @@ steps:
image: nextcloudci/php7.2:php7.2-13 image: nextcloudci/php7.2:php7.2-13
environment: environment:
APP_NAME: deck APP_NAME: deck
CORE_BRANCH: master CORE_BRANCH: stable17
DB: sqlite DB: sqlite
commands: commands:
# Pre-setup steps # Pre-setup steps

2
.travis.yml
View File

@@ -5,7 +5,7 @@ php:
- 7.2 - 7.2
- 7.3 - 7.3
env: env:
- CORE_BRANCH=master DB=mysql - CORE_BRANCH=stable17 DB=mysql
before_install: before_install:
- export PATH="$PWD/vendor/bin:$PATH" - export PATH="$PWD/vendor/bin:$PATH"

12
Makefile
View File

@@ -81,16 +81,8 @@ test: test-unit test-integration
test-unit: test-unit:
mkdir -p build/ mkdir -p build/
ifeq (, $(shell which phpunit 2> /dev/null)) ./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
@echo "No phpunit command available, downloading a copy from the web" ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
mkdir -p $(build_tools_directory)
curl -sSL https://phar.phpunit.de/phpunit-8.2.phar -o $(build_tools_directory)/phpunit.phar
php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
else
phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
endif
test-integration: test-integration:
cd tests/integration && ./run.sh cd tests/integration && ./run.sh

4
appinfo/info.xml
View File

@@ -17,7 +17,7 @@
- 🚀 Get your project organized - 🚀 Get your project organized
</description> </description>
<version>0.8.1</version> <version>0.8.2</version>
<licence>agpl</licence> <licence>agpl</licence>
<author>Julius Härtl</author> <author>Julius Härtl</author>
<namespace>Deck</namespace> <namespace>Deck</namespace>
@@ -36,7 +36,7 @@
<database min-version="9.4">pgsql</database> <database min-version="9.4">pgsql</database>
<database>sqlite</database> <database>sqlite</database>
<database min-version="5.5">mysql</database> <database min-version="5.5">mysql</database>
<nextcloud min-version="17" max-version="19" /> <nextcloud min-version="17" max-version="17" />
</dependencies> </dependencies>
<background-jobs> <background-jobs>
<job>OCA\Deck\Cron\DeleteCron</job> <job>OCA\Deck\Cron\DeleteCron</job>

2
composer.json
View File

@@ -15,6 +15,6 @@
"roave/security-advisories": "dev-master", "roave/security-advisories": "dev-master",
"christophwurst/nextcloud": "^17", "christophwurst/nextcloud": "^17",
"jakub-onderka/php-parallel-lint": "^1.0.0", "jakub-onderka/php-parallel-lint": "^1.0.0",
"phpunit/phpunit": "^8" "phpunit/phpunit": "6.5.*"
} }
} }

6
js/package-lock.json generated
View File

@@ -1708,9 +1708,9 @@
"dev": true "dev": true
}, },
"angular": { "angular": {
"version": "1.7.9", "version": "1.8.0",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.7.9.tgz", "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.0.tgz",
"integrity": "sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ==" "integrity": "sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg=="
}, },
"angular-animate": { "angular-animate": {
"version": "1.7.9", "version": "1.7.9",

2
js/package.json
View File

@@ -8,7 +8,7 @@
}, },
"dependencies": { "dependencies": {
"@uirouter/angularjs": "^1.0.26", "@uirouter/angularjs": "^1.0.26",
"angular": "^1.7.9", "angular": "^1.8.0",
"angular-animate": "^1.7.9", "angular-animate": "^1.7.9",
"angular-file-upload": "^2.5.0", "angular-file-upload": "^2.5.0",
"angular-markdown-it": "^0.6.1", "angular-markdown-it": "^0.6.1",

2
tests/unit/Activity/ActivityManagerTest.php
View File

@@ -97,7 +97,7 @@ class ActivityManagerTest extends TestCase {
if (strpos($constant, 'SUBJECT') === 0) { if (strpos($constant, 'SUBJECT') === 0) {
$format = $this->activityManager->getActivityFormat($value, [], false); $format = $this->activityManager->getActivityFormat($value, [], false);
if ($format !== '') { if ($format !== '') {
$this->assertStringContainsString('{user}', $format); $this->assertContains('{user}', $format);
} else { } else {
/** @noinspection ForgottenDebugOutputInspection */ /** @noinspection ForgottenDebugOutputInspection */
print_r('No activity string found for '. $constant . PHP_EOL); print_r('No activity string found for '. $constant . PHP_EOL);