Merge pull request #1473 from Ducasse/introduceInformDuring

Introduce inform during
pharo-spec · Nov 22, 2023 · 42f0c0a · 42f0c0a
2 parents e911631 + 384476d
commit 42f0c0a
Show file tree

Hide file tree

Showing 9 changed files with 304 additions and 153 deletions.
diff --git a/src/BaselineOfSpecCore/BaselineOfSpecCore.class.st b/src/BaselineOfSpecCore/BaselineOfSpecCore.class.st
@@ -17,6 +17,7 @@ BaselineOfSpecCore >> baseline: spec [
 			package: 'Spec2-Layout';
 			package: 'Spec2-Core' with: [ spec requires: #('Spec2-Layout') ];
 			package: 'Spec2-Dialogs' with: [ spec requires: #('Spec2-Core') ];
+			package: 'Spec2-Dialogs-Tests' with: [ spec requires: #('Spec2-Dialogs') ];
 			package: 'Spec2-CommandLine' with: [ spec requires: #('Spec2-Core') ];
 			package: 'Spec2-Commands';
 			package: 'Spec2-Transmission' with: [ spec requires: #('Spec2-Core') ];
@@ -32,7 +33,7 @@ BaselineOfSpecCore >> baseline: spec [
 			"Tests"			
 			package: 'Spec2-Adapters-Stub' with: [ spec requires: #('Spec2-Core') ];
 			package: 'Spec2-Commander2-Tests' with: [ spec requires: #('Spec2-Commander2') ];
-			package: 'Spec2-Tests' with: [ spec requires: #('Spec2-Core' 'Spec2-Examples') ];
+			package: 'Spec2-Tests' with: [ spec requires: #('Spec2-Core' 'Spec2-Examples' 'Spec2-Dialogs-Tests') ];
 			package: 'Spec2-Code-Tests' with: [ spec requires: #('Spec2-Tests' 'Spec2-Code') ];
 			package: 'Spec2-Code-Diff-Tests' with: [ spec requires: #('Spec2-Tests' 'Spec2-Code-Diff') ];
 			"Examples"

diff --git a/src/Spec2-Core/SpApplication.class.st b/src/Spec2-Core/SpApplication.class.st
@@ -109,16 +109,6 @@ SpApplication >> adapterBindings [
 	^ self backend adapterBindings
 ]
 
-{ #category : 'ui - dialogs' }
-SpApplication >> alert: aString [
-	"Displays an inform dialog, for more configurable version please use `self application newInform title: ....`."
-
-	^ self newAlert
-		  title: 'Alert';
-		  label: aString;
-		  openModal
-]
-
 { #category : 'accessing - backend' }
 SpApplication >> backend [
 
@@ -150,16 +140,6 @@ SpApplication >> configuration [
 		configuration ]
 ]
 
-{ #category : 'ui - dialogs' }
-SpApplication >> confirm: aString [
-	"Displays a confirm dialog, for more configurable version please use `self application newConfirm title: ....`."
-
-	^ self newConfirm
-		  title: 'Please confirm';
-		  label: aString;
-		  openModal
-]
-
 { #category : 'showing' }
 SpApplication >> defaultBlockedDialogWindowPresenterClass [
 
@@ -251,16 +231,6 @@ SpApplication >> iconProvider: anIconProvider [
 	iconProvider := anIconProvider
 ]
 
-{ #category : 'ui - dialogs' }
-SpApplication >> inform: aString [
-	"Displays an inform dialog, for more configurable version please use `self application newInform title: ....`."
-
-	^ self newInform
-		  title: 'Alert';
-		  label: aString;
-		  openModal
-]
-
 { #category : 'accessing' }
 SpApplication >> locale [
 
@@ -292,18 +262,6 @@ SpApplication >> notificationCenter [
 	^ notificationCenter ifNil: [ notificationCenter := SpNotificationCenter new forApplication: self; yourself ]
 ]
 
-{ #category : 'ui - dialogs' }
-SpApplication >> notificationClass [ 
-
-	^ SpNotificationItem
-]
-
-{ #category : 'ui - dialogs' }
-SpApplication >> notify: aString [
-
-	self notificationCenter add: (self notificationClass with: aString)
-]
-
 { #category : 'accessing - properties' }
 SpApplication >> properties [
 
@@ -386,18 +344,6 @@ SpApplication >> run [
 	self start
 ]
 
-{ #category : 'ui - dialogs' }
-SpApplication >> selectDirectoryTitle: aString [
-
-	^ self backend selectDirectoryTitle: aString
-]
-
-{ #category : 'ui - dialogs' }
-SpApplication >> selectFileTitle: aString [
-
-	^ self backend selectFileTitle: aString
-]
-
 { #category : 'ui' }
 SpApplication >> showWaitCursorWhile: aBlock [
 

diff --git a/src/Spec2-Core/SpPresenter.class.st b/src/Spec2-Core/SpPresenter.class.st
@@ -525,6 +525,13 @@ SpPresenter >> inform: aString [
 	^ self application inform: aString
 ]
 
+{ #category : 'simple dialog helpers' }
+SpPresenter >> informUser: aString during: aBlock [
+	"Displays a simple inform dialog while a task is perform without progress bar."
+
+	^ self application informUser: aString during: aBlock
+]
+
 { #category : 'TOREMOVE' }
 SpPresenter >> initialExtent [
 

diff --git a/src/Spec2-Dialogs-Tests/SpDialogTest.class.st b/src/Spec2-Dialogs-Tests/SpDialogTest.class.st
@@ -0,0 +1,44 @@
+Class {
+	#name : 'SpDialogTest',
+	#superclass : 'TestCase',
+	#category : 'Spec2-Dialogs-Tests',
+	#package : 'Spec2-Dialogs-Tests'
+}
+
+{ #category : 'tests - informUserDuring' }
+SpDialogTest >> testInformUserDuring [
+
+	self shouldnt: [ SpInformUserDialog new informUser: 'hello' during: [  (Delay forMilliseconds: 100)  wait] ] raise: Error
+]
+
+{ #category : 'tests - progress bar' }
+SpDialogTest >> testInformUserDuringExecutesItsBlock [
+
+	| executed | 
+	executed := false. 
+	SpInformUserDialog new informUser: 'hello' during: [ executed := true ].
+	self assert: executed.
+]
+
+{ #category : 'tests - informUserDuring' }
+SpDialogTest >> testInformUserDuringViaApplication [
+
+	self shouldnt: [ SpPresenter new application informUser: 'hello' during: [  (Delay forMilliseconds: 100)  wait] ] raise: Error.
+
+]
+
+{ #category : 'tests - informUserDuring' }
+SpDialogTest >> testInformUserDuringViaPresenter [
+
+	self shouldnt: [ SpPresenter new informUser: 'hello' during: [  (Delay forMilliseconds: 100)  wait] ] raise: Error.
+	self shouldnt: [ SpPresenter new informUser: 'hello' during: [  (Delay forMilliseconds: 100)  wait] ] raise: Error
+]
+
+{ #category : 'tests - progress bar' }
+SpDialogTest >> testProgressInformUserDuringExecutesItsBlock [
+
+	| executed | 
+	executed := false. 
+	SpProgressDialog new informUser: 'hello' during: [ executed := true.  ]. 
+	self assert: executed.
+]
diff --git a/src/Spec2-Dialogs-Tests/package.st b/src/Spec2-Dialogs-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : 'Spec2-Dialogs-Tests' }
diff --git a/src/Spec2-Dialogs/SpApplication.extension.st b/src/Spec2-Dialogs/SpApplication.extension.st
@@ -1,5 +1,45 @@
 Extension { #name : 'SpApplication' }
 
+{ #category : '*Spec2-Dialogs' }
+SpApplication >> alert: aString [
+	"Displays an inform dialog, for more configurable version please use `self application newInform title: ....`."
+
+	^ self newAlert
+		  title: 'Alert';
+		  label: aString;
+		  openModal
+]
+
+{ #category : '*Spec2-Dialogs' }
+SpApplication >> confirm: aString [
+	"Displays a confirm dialog, for more configurable version please use `self application newConfirm title: ....`."
+
+	^ self newConfirm
+		  title: 'Please confirm';
+		  label: aString;
+		  openModal
+]
+
+{ #category : '*Spec2-Dialogs' }
+SpApplication >> inform: aString [
+	"Displays an inform dialog, for more configurable version please use `self application newInform title: ....`."
+
+	^ self newInform
+		  title: 'Alert';
+		  label: aString;
+		  openModal
+]
+
+{ #category : '*Spec2-Dialogs' }
+SpApplication >> informUser: aString during: aBlock [
+	"Displays an inform user dialog."
+
+	^ self newInformUser
+		title: aString; 
+		informUserDuring: aBlock;
+		 openModal
+]
+
 { #category : '*Spec2-Dialogs' }
 SpApplication >> newAlert [
 
@@ -18,6 +58,12 @@ SpApplication >> newInform [
 	^ SpInformDialog newApplication: self
 ]
 
+{ #category : '*Spec2-Dialogs' }
+SpApplication >> newInformUser [
+
+	^ SpInformUserDialog newApplication: self
+]
+
 { #category : '*Spec2-Dialogs' }
 SpApplication >> newJobList [
 
@@ -51,3 +97,27 @@ SpApplication >> newSelect [
 
 	^ SpSelectDialog newApplication: self
 ]
+
+{ #category : '*Spec2-Dialogs' }
+SpApplication >> notificationClass [ 
+
+	^ SpNotificationItem
+]
+
+{ #category : '*Spec2-Dialogs' }
+SpApplication >> notify: aString [
+
+	self notificationCenter add: (self notificationClass with: aString)
+]
+
+{ #category : '*Spec2-Dialogs' }
+SpApplication >> selectDirectoryTitle: aString [
+
+	^ self backend selectDirectoryTitle: aString
+]
+
+{ #category : '*Spec2-Dialogs' }
+SpApplication >> selectFileTitle: aString [
+
+	^ self backend selectFileTitle: aString
+]