fix some tests

pharo-spec · Dec 18, 2023 · da2d111 · da2d111
1 parent 01ff23e
commit da2d111
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/src/Spec2-Core/SpAbstractTextPresenter.class.st b/src/Spec2-Core/SpAbstractTextPresenter.class.st
@@ -338,21 +338,6 @@ SpAbstractTextPresenter >> updateSelectionFromModel: aSelection [
 		anAdapter setSelectionFromModel: aSelection ]
 ]
 
-{ #category : 'TOREMOVE' }
-SpAbstractTextPresenter >> whenAboutToStyleChangedDo: aBlock [
-	"Set a block to perform when the about to style block changed"
-
-	self whenAboutToStyleBlockChanged: [:block :old :announcement :anAnnouncer | 
-		aBlock cull: (block value) cull: old cull: announcement cull: anAnnouncer ]
-]
-
-{ #category : 'TOREMOVE' }
-SpAbstractTextPresenter >> whenAcceptBlockChangedDo: aBlock [
-	"Set a block to perform when the accept block changed"
-
-	self property: #actionToPerform whenChangedDo: aBlock
-]
-
 { #category : 'api - events' }
 SpAbstractTextPresenter >> whenEditableChangedDo: aBlock [
 	"Inform when editable property has changed. 

diff --git a/src/Spec2-Core/SpDialogWindowPresenter.class.st b/src/Spec2-Core/SpDialogWindowPresenter.class.st
@@ -76,8 +76,15 @@ SpDialogWindowPresenter >> addButton: aString do: aBlock [
 { #category : 'private' }
 SpDialogWindowPresenter >> addDefaultButton: aButtonPresenter [
 	"Adds button logic to dialog."
+	| actionBlock |
 
+
+	actionBlock := aButtonPresenter action.
 	defaultButton := self addButton: aButtonPresenter.
+	aButtonPresenter action: [ 
+		actionBlock value.
+		"this is ugly, but this is how we can ensure this is not keeping the status as cancelled."
+		self beOk ].
 	defaultButton addStyle: 'default'.
 	^ defaultButton
 ]

diff --git a/src/Spec2-Examples/SpPanedLayout.extension.st b/src/Spec2-Examples/SpPanedLayout.extension.st
@@ -8,16 +8,14 @@ SpPanedLayout class >> exampleNotResizingStartChild [
 	app := SpApplication new.
 
 	presenter := SpPresenter newApplication: app.
-	presenter layout: (SpPanedLayout newVertical
+	presenter layout: (SpPanedLayout newTopToBottom
 		positionOfSlider: 50;
-		add: (child1 := presenter newListView) 
-			withConstraints: [ :c | c beNotResizable ];
-		add: (child2 := presenter newListView);
+		add: (child1 := presenter newList) withConstraints: [ :c | c beNotResizable ];
+		add: (child2 := presenter newList);
 		yourself).
 
 	child1 items: #(one two).
 	child2 items: String loremIpsum substrings.
 
 	presenter open
-
 ]