Testing debug

Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
nextcloud · Nov 5, 2019 · 8ada0f6 · 8ada0f6
1 parent 59f8f32
commit 8ada0f6
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 20 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -25,7 +25,7 @@ name: cypress-e2e-testing master
 services:
    # nextcloud server
   - name: server
-    image: nextcloudci/server:server-10
+    image: nextcloudci/server:server-15
     commands:
       # Add app sources to the app directory
       - export BRANCH=$DRONE_TARGET_BRANCH
@@ -37,7 +37,7 @@ services:
       - chown -R www-data:www-data /var/www/html/data
 
        # Install nextcloud, watch logs and run apache
-      - bash /initnc.sh
+      - bash /usr/local/bin/initnc.sh
 
 steps:
   # clone and build the app
@@ -89,6 +89,7 @@ steps:
       CYPRESS_baseUrl: http://server/index.php/
       LOGIN: login
     commands:
+      - export DEBUG=cypress:*
       - cd /drone/src
       - $(npm bin)/cypress run --record --key $CYPRESS_RECORD_TOKEN --parallel --ci-build-id ci-$DRONE_BUILD_NUMBER-master
 
@@ -117,6 +118,7 @@ steps:
       CYPRESS_baseUrl: http://server/index.php/
       LOGIN: login
     commands:
+      - export DEBUG=cypress:*
       - cd /drone/src
       - $(npm bin)/cypress run --record --key $CYPRESS_RECORD_TOKEN --parallel --ci-build-id ci-$DRONE_BUILD_NUMBER-master
 
@@ -145,6 +147,7 @@ steps:
       CYPRESS_baseUrl: http://server/index.php/
       LOGIN: login
     commands:
+      - export DEBUG=cypress:*
       - cd /drone/src
       - $(npm bin)/cypress run --record --key $CYPRESS_RECORD_TOKEN --parallel --ci-build-id ci-$DRONE_BUILD_NUMBER-master
 
@@ -173,6 +176,7 @@ steps:
       CYPRESS_baseUrl: http://server/index.php/
       LOGIN: login
     commands:
+      - export DEBUG=cypress:*
       - cd /drone/src
       - $(npm bin)/cypress run --record --key $CYPRESS_RECORD_TOKEN --parallel --ci-build-id ci-$DRONE_BUILD_NUMBER-master
 

diff --git a/babel.config.js b/babel.config.js
@@ -1,7 +1,8 @@
 module.exports = {
 	plugins: [
 		'@babel/plugin-syntax-dynamic-import',
-		['@babel/plugin-proposal-class-properties', { loose: true }]
+		['@babel/plugin-proposal-class-properties', { loose: true }],
+		'inline-json-import'
 	],
 	presets: [
 		[

diff --git a/cypress/start.sh b/cypress/start.sh
@@ -9,7 +9,7 @@ else
 	echo "Launching docker server for the $appname app"
 	dockername="cypress_testing_$appname"
 
-	docker run -p 8000:80 --rm --name $dockername --volume $(pwd):/var/www/html/apps/$appname --env BRANCH=master --detach nextcloudci/server:server-10
+	docker run -p 8000:80 --rm --name $dockername --volume $(pwd):/var/www/html/apps/$appname --env BRANCH=master --detach nextcloudci/server:server-15
 	sleep 10
 	docker exec --user www-data $dockername php occ app:enable $appname
 	docker exec --user www-data $dockername php occ config:system:set force_language --value en

diff --git a/js/viewer.js b/js/viewer.js
diff --git a/js/viewer.js.map b/js/viewer.js.map
diff --git a/lib/Listener/LoadViewerScript.php b/lib/Listener/LoadViewerScript.php
@@ -37,6 +37,6 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		Util::addScript(Application::APP_ID, Application::APP_ID);
+		Util::addScript(Application::APP_ID, 'viewer');
 	}
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "not dead"
   ],
   "engines": {
-    "node": "11"
+    "node": ">=10.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.6.4",
@@ -64,6 +64,7 @@
     "@nextcloud/browserslist-config": "^1.0.0",
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
+    "babel-plugin-inline-json-import": "^0.3.2",
     "browserslist-config-nextcloud": "0.1.0",
     "css-loader": "^3.2.0",
     "cypress": "^3.4.1",
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,6 @@ public function handle(Event $event): void { @@
     			return;
     		}
-    		Util::addScript(Application::APP_ID, Application::APP_ID);
+    		Util::addScript(Application::APP_ID, 'viewer');
     	}
     }