Skip to content

Commit 8ada0f6

Browse files
committed
Testing debug
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
1 parent 59f8f32 commit 8ada0f6

File tree

8 files changed

+50
-20
lines changed

8 files changed

+50
-20
lines changed

.drone.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ name: cypress-e2e-testing master
2525
services:
2626
# nextcloud server
2727
- name: server
28-
image: nextcloudci/server:server-10
28+
image: nextcloudci/server:server-15
2929
commands:
3030
# Add app sources to the app directory
3131
- export BRANCH=$DRONE_TARGET_BRANCH
@@ -37,7 +37,7 @@ services:
3737
- chown -R www-data:www-data /var/www/html/data
3838

3939
# Install nextcloud, watch logs and run apache
40-
- bash /initnc.sh
40+
- bash /usr/local/bin/initnc.sh
4141

4242
steps:
4343
# clone and build the app
@@ -89,6 +89,7 @@ steps:
8989
CYPRESS_baseUrl: http://server/index.php/
9090
LOGIN: login
9191
commands:
92+
- export DEBUG=cypress:*
9293
- cd /drone/src
9394
- $(npm bin)/cypress run --record --key $CYPRESS_RECORD_TOKEN --parallel --ci-build-id ci-$DRONE_BUILD_NUMBER-master
9495

@@ -117,6 +118,7 @@ steps:
117118
CYPRESS_baseUrl: http://server/index.php/
118119
LOGIN: login
119120
commands:
121+
- export DEBUG=cypress:*
120122
- cd /drone/src
121123
- $(npm bin)/cypress run --record --key $CYPRESS_RECORD_TOKEN --parallel --ci-build-id ci-$DRONE_BUILD_NUMBER-master
122124

@@ -145,6 +147,7 @@ steps:
145147
CYPRESS_baseUrl: http://server/index.php/
146148
LOGIN: login
147149
commands:
150+
- export DEBUG=cypress:*
148151
- cd /drone/src
149152
- $(npm bin)/cypress run --record --key $CYPRESS_RECORD_TOKEN --parallel --ci-build-id ci-$DRONE_BUILD_NUMBER-master
150153

@@ -173,6 +176,7 @@ steps:
173176
CYPRESS_baseUrl: http://server/index.php/
174177
LOGIN: login
175178
commands:
179+
- export DEBUG=cypress:*
176180
- cd /drone/src
177181
- $(npm bin)/cypress run --record --key $CYPRESS_RECORD_TOKEN --parallel --ci-build-id ci-$DRONE_BUILD_NUMBER-master
178182

babel.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
module.exports = {
22
plugins: [
33
'@babel/plugin-syntax-dynamic-import',
4-
['@babel/plugin-proposal-class-properties', { loose: true }]
4+
['@babel/plugin-proposal-class-properties', { loose: true }],
5+
'inline-json-import'
56
],
67
presets: [
78
[

cypress/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ else
99
echo "Launching docker server for the $appname app"
1010
dockername="cypress_testing_$appname"
1111

12-
docker run -p 8000:80 --rm --name $dockername --volume $(pwd):/var/www/html/apps/$appname --env BRANCH=master --detach nextcloudci/server:server-10
12+
docker run -p 8000:80 --rm --name $dockername --volume $(pwd):/var/www/html/apps/$appname --env BRANCH=master --detach nextcloudci/server:server-15
1313
sleep 10
1414
docker exec --user www-data $dockername php occ app:enable $appname
1515
docker exec --user www-data $dockername php occ config:system:set force_language --value en

js/viewer.js

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/viewer.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Listener/LoadViewerScript.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ public function handle(Event $event): void {
3737
return;
3838
}
3939

40-
Util::addScript(Application::APP_ID, Application::APP_ID);
40+
Util::addScript(Application::APP_ID, 'viewer');
4141
}
4242
}

package-lock.json

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"not dead"
5555
],
5656
"engines": {
57-
"node": "11"
57+
"node": ">=10.0.0"
5858
},
5959
"devDependencies": {
6060
"@babel/core": "^7.6.4",
@@ -64,6 +64,7 @@
6464
"@nextcloud/browserslist-config": "^1.0.0",
6565
"babel-eslint": "^10.0.3",
6666
"babel-loader": "^8.0.6",
67+
"babel-plugin-inline-json-import": "^0.3.2",
6768
"browserslist-config-nextcloud": "0.1.0",
6869
"css-loader": "^3.2.0",
6970
"cypress": "^3.4.1",

0 commit comments

Comments
 (0)