Merge pull request #1555 from demarey/fix-withWindowDo

withWindowDo: should return the result of the block
pharo-spec · Jun 13, 2024 · 6d0b7a3 · 6d0b7a3
2 parents 704ba41 + 34e1541
commit 6d0b7a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Spec2-Core/SpAbstractPresenter.class.st b/src/Spec2-Core/SpAbstractPresenter.class.st
@@ -548,7 +548,7 @@ SpAbstractPresenter >> withAdapterDo: aValuable [
 { #category : 'private - utilities' }
 SpAbstractPresenter >> withWindowDo: aValuable [
 
-	self hasWindow ifFalse: [ ^ self ].
+	self hasWindow ifFalse: [ ^ nil ].
 	"Since Presenter has window, root = window"
-	aValuable value: self root
+	^ aValuable value: self root
 ]
diff --git a/src/Spec2-Core/SpDialogWindowPresenter.class.st b/src/Spec2-Core/SpDialogWindowPresenter.class.st
@@ -270,6 +270,6 @@ SpDialogWindowPresenter >> triggerOkAction [
 	"Trigger defined ok action. 
 	 See `SpDialogWindowPresenter>>#okAction:`"
 
-	okAction ifNil: [ ^ self ].
-	okAction cull: self
+	okAction ifNil: [ ^ nil ].
+	^ okAction cull: self
 ]
diff --git a/src/Spec2-Core/SpStringTableColumn.class.st b/src/Spec2-Core/SpStringTableColumn.class.st
@@ -125,7 +125,7 @@ SpStringTableColumn >> onAcceptEdition: aBlock [
 	acceptAction := aBlock
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpStringTableColumn >> onTextChanged: aBlock [
 	"Set the block to execute when cell edition is edited.
 	 `aBlock` receives two arguments:
@@ -135,7 +135,7 @@ SpStringTableColumn >> onTextChanged: aBlock [
 	textChanged := aBlock
 ]
 
-{ #category : #api }
+{ #category : 'api' }
 SpStringTableColumn >> sortFunction [
 
 	^ super sortFunction ifNil: [ self evaluation ascending ]
@@ -156,7 +156,7 @@ SpStringTableColumn >> sortFunction: aBlockOrSortFunction [
 	self isSortable: aBlockOrSortFunction isNotNil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 SpStringTableColumn >> textChanged [
 
 	^ textChanged