From cfcc509c8ad9dc19b6ff7962f0bdf372da6be127 Mon Sep 17 00:00:00 2001
From: Marcus Denker <denker@acm.org>
Date: Thu, 30 Nov 2023 11:29:54 +0100
Subject: [PATCH] fixes #1468 fixes  #1460

---
 .../SpNotebookAdapterTest.class.st                    | 11 +++++++----
 src/Spec2-Core/SpAbstractPresenter.class.st           |  4 +---
 src/Spec2-Core/SpJob.class.st                         |  4 ++--
 src/Spec2-Core/SpWindowPresenter.class.st             |  5 +++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Spec2-Backend-Tests/SpNotebookAdapterTest.class.st b/src/Spec2-Backend-Tests/SpNotebookAdapterTest.class.st
index 99e34002..25c7e90b 100644
--- a/src/Spec2-Backend-Tests/SpNotebookAdapterTest.class.st
+++ b/src/Spec2-Backend-Tests/SpNotebookAdapterTest.class.st
@@ -91,13 +91,16 @@ SpNotebookAdapterTest >> testSelectedPage [
 
 { #category : 'tests' }
 SpNotebookAdapterTest >> testSelectingPageShouldAnnounceChangeEvent [
-	| change |
 
+	| change |
 	self adapter widget tabSelectorMorph selectedIndex: 1.
-	self adapter widget announcer when: SpNotebookPageChanged do: [ :ann | change := ann ].
-	
+	self adapter widget announcer
+		when: SpNotebookPageChanged
+		do: [ :ann | change := ann ]
+		for: self.
+
 	self adapter widget tabSelectorMorph selectedIndex: 2.
-	
+
 	self assert: change oldPage model title equals: 'Mock'.
 	self assert: change page model title equals: 'Mock2'
 ]
diff --git a/src/Spec2-Core/SpAbstractPresenter.class.st b/src/Spec2-Core/SpAbstractPresenter.class.st
index 4e56b633..eaca4d40 100644
--- a/src/Spec2-Core/SpAbstractPresenter.class.st
+++ b/src/Spec2-Core/SpAbstractPresenter.class.st
@@ -518,9 +518,7 @@ SpAbstractPresenter >> validateInto: aValidationReport [
 { #category : 'events' }
 SpAbstractPresenter >> whenBuiltDo: aBlock [
 
-	self announcer 
-		when: SpWidgetBuilt
-		do: aBlock
+	self announcer when: SpWidgetBuilt do: aBlock for: aBlock receiver
 ]
 
 { #category : 'events' }
diff --git a/src/Spec2-Core/SpJob.class.st b/src/Spec2-Core/SpJob.class.st
index bad6dd43..60d61fb3 100644
--- a/src/Spec2-Core/SpJob.class.st
+++ b/src/Spec2-Core/SpJob.class.st
@@ -331,11 +331,11 @@ SpJob >> whenChangedDo: aBlock [
 { #category : 'events' }
 SpJob >> whenEndDo: aBlock [
 
-	self announcer when: JobEnd do: aBlock
+	self announcer when: JobEnd do: aBlock for: aBlock receiver
 ]
 
 { #category : 'events' }
 SpJob >> whenStartDo: aBlock [
 
-	self announcer when: JobStart do: aBlock
+	self announcer when: JobStart do: aBlock for: aBlock receiver
 ]
diff --git a/src/Spec2-Core/SpWindowPresenter.class.st b/src/Spec2-Core/SpWindowPresenter.class.st
index 15b70259..fdc23372 100644
--- a/src/Spec2-Core/SpWindowPresenter.class.st
+++ b/src/Spec2-Core/SpWindowPresenter.class.st
@@ -689,10 +689,11 @@ SpWindowPresenter >> whenWillCloseDo: aBlock [
 	"Inform when window will close, allowing process before the close happen. 
 	 Note that user cannot cancel the close operation using this event. 
 	 `aBlock` receives one optional argument (an instance of the announcement `SpWindowWillClose`)."
-	
-	self announcer 
+
+	self announcer
 		when: SpWindowWillClose
 		do: aBlock
+		for: aBlock receiver
 ]
 
 { #category : 'private' }