Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Front into test/integration_model

JulienChampagnol · JulienChampagnol · commit 545ce7f919ea · 2025-11-03T15:27:13.000+01:00
diff --git a/tests/integration/microservices/viewer/requirements.txt b/tests/integration/microservices/viewer/requirements.txt
@@ -5,3 +5,4 @@
 #    pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in
 #
 
+opengeodeweb-viewer==1.*,>=1.11.6rc3
diff --git a/utils/local.js b/utils/local.js
@@ -118,7 +118,7 @@ async function run_back(
   return new Promise(async (resolve, reject) => {
     let upload_folder_path = args.upload_folder_path
     if (!args.upload_folder_path) {
-      upload_folder_path = os.path.join(args.project_folder_path, "uploads")
+      upload_folder_path = path.join(args.project_folder_path, "uploads")
     }
     const port = await get_available_port()
     const back_args = [

Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,4 @@`
`5`	`5`	`# pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in`
`6`	`6`	`#`
`7`	`7`
	`8`	`+opengeodeweb-viewer==1.*,>=1.11.6rc3`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ async function run_back(`
`118`	`118`	`return new Promise(async (resolve, reject) => {`
`119`	`119`	`let upload_folder_path = args.upload_folder_path`
`120`	`120`	`if (!args.upload_folder_path) {`
`121`		`- upload_folder_path = os.path.join(args.project_folder_path, "uploads")`
	`121`	`+ upload_folder_path = path.join(args.project_folder_path, "uploads")`
`122`	`122`	`}`
`123`	`123`	`const port = await get_available_port()`
`124`	`124`	`const back_args = [`