diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-12 11:13:24 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-12 11:13:24 +0200 |
| commit | 885b6be7336c250aa3664e7074405665dbeea0ab (patch) | |
| tree | fc78761e95af3e617f732b08c613ee58ca249e11 | |
| parent | 27e68964a0da8fe2a9882dca5dbe392955979c9f (diff) | |
| download | nextcloud-server-885b6be7336c250aa3664e7074405665dbeea0ab.tar.gz nextcloud-server-885b6be7336c250aa3664e7074405665dbeea0ab.zip | |
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| -rw-r--r-- | .drone.yml | 2 | ||||
| -rwxr-xr-x | build/vue-builds.sh | 1 | ||||
| -rw-r--r-- | tests/Settings/Controller/AppSettingsControllerTest.php | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.drone.yml b/.drone.yml index 26a72c9b43a..094a678d2e3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ pipeline: vue-build-settings: image: node commands: - - ./build/vue-builds.sh ./settings/js/main.js + - ./build/vue-builds.sh ./settings/js/settings-vue.js when: matrix: TESTS: vue-builds diff --git a/build/vue-builds.sh b/build/vue-builds.sh index e0ab377387e..782abe11a7c 100755 --- a/build/vue-builds.sh +++ b/build/vue-builds.sh @@ -1,6 +1,5 @@ #!/bin/bash -declare -a apps=("./settings/js/settings-vue.js" "./apps/updatenotification/js/merged.js") root=$(pwd) entryFile=$1 diff --git a/tests/Settings/Controller/AppSettingsControllerTest.php b/tests/Settings/Controller/AppSettingsControllerTest.php index 14f2c8f47bd..14e537437ff 100644 --- a/tests/Settings/Controller/AppSettingsControllerTest.php +++ b/tests/Settings/Controller/AppSettingsControllerTest.php @@ -193,7 +193,7 @@ class AppSettingsControllerTest extends TestCase { $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com'); $expected = new TemplateResponse('settings', - 'settings', + 'settings-vue', [ 'serverData' => [ 'updateCount' => 0, @@ -227,7 +227,7 @@ class AppSettingsControllerTest extends TestCase { $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com'); $expected = new TemplateResponse('settings', - 'settings', + 'settings-vue', [ 'serverData' => [ 'updateCount' => 0, |