Merge 7f0e5d4

pharo-project · Jul 3, 2024 · 7550aec · 7550aec
2 parents 9b9f913 + 7f0e5d4
commit 7550aec
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 47 deletions.
diff --git a/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st b/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st
@@ -72,6 +72,14 @@ BaselineOfPharoLauncher >> clap: spec [
 		with: [ spec repository: 'github://pharo-contributions/clap-st:master/src' ]
 ]
 
+{ #category : 'external projects' }
+BaselineOfPharoLauncher >> interactions: spec [
+
+	spec 
+		baseline: #Interactions
+		with: [ spec repository: 'github://pharo-contributions/interactions' ]
+]
+
 { #category : 'external projects' }
 BaselineOfPharoLauncher >> objCBridge: spec [
 

diff --git a/src/PharoLauncher-Core/PhLLaunchImageFromDiskCommand.class.st b/src/PharoLauncher-Core/PhLLaunchImageFromDiskCommand.class.st
@@ -30,11 +30,11 @@ PhLLaunchImageFromDiskCommand >> execute [
 	| imageFile |
 	imageFile := self imagesPresenter newFileRequest 
 		title: 'Open a Pharo image';
-		extensionsToShow: #('image');
-		path: FileLocator home;
+		filter: '.image';
+		currentFolder: FileLocator home;
 		chooseFile.
 	imageFile ifNil: [ ^ self ].
-	imageFile isFile ifFalse: [ ^self ].
+	imageFile isFile ifFalse: [ ^ self ].
 	^ self launchImage: (PhLImage location: imageFile).
 ]
 

diff --git a/src/PharoLauncher-Core/PhLUIFileRequest.class.st b/src/PharoLauncher-Core/PhLUIFileRequest.class.st
diff --git a/src/PharoLauncher-Tests-Commands/PhLTestRequest.class.st b/src/PharoLauncher-Tests-Commands/PhLTestRequest.class.st
@@ -33,7 +33,12 @@ PhLTestRequest >> chooseFrom: aCollection [
 ]
 
 { #category : 'noop' }
-PhLTestRequest >> extensionsToShow: aCollection [ 
+PhLTestRequest >> currentFolder: aFileLocator [ 
+	"noop"
+]
+
+{ #category : 'noop' }
+PhLTestRequest >> filter: aFilterString [ 
 	"noop"
 ]
 
@@ -52,11 +57,6 @@ PhLTestRequest >> parentWindow: aWindowPresenter [
 	"no need to keep the parent"
 ]
 
-{ #category : 'noop' }
-PhLTestRequest >> path: aFileLocator [ 
-	"noop"
-]
-
 { #category : 'accessing' }
 PhLTestRequest >> request [
 	^ (validationBlock value: self answer)

diff --git a/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st b/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st
@@ -99,7 +99,7 @@ PhLLaunchImageTest >> testCanLaunchImageWithNonAsciiCharacters [
 	| image |
 	image := self copyCurrentImageToTestDir.
 
-	image launch.
+	process := image launch.
 	2 seconds wait. "let time to the process to be launched, else test cleanup will interfer with process launch"
 
 	"ensure image determination succeeded"
@@ -143,7 +143,7 @@ PhLLaunchImageTest >> testLaunchImageSetShouldRunInitilizationScriptToFalse [
 
 	image := self copyCurrentImageToTestDir.
 
-	image launch.
+	process := image launch.
 	2 seconds wait. "let time to the process to be launched, else test cleanup will interfer with process launch"
 
 	image := PhLImage location: imageDir / FileLocator image basename. "read image metadata from disk"