Skip to content

Commit

Permalink
Merge pull request #1814 from pharo-vcs/dev-2.0
Browse files Browse the repository at this point in the history
minor fixes
  • Loading branch information
estebanlm authored Apr 8, 2024
2 parents 80860aa + ffc9ba4 commit 4cdc21d
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 4 deletions.
7 changes: 7 additions & 0 deletions Iceberg-Tests/IceBasicRepositoryFixture.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ IceBasicRepositoryFixture class >> inMemory [
yourself
]

{ #category : 'private' }
IceBasicRepositoryFixture >> deleteAllForcingClose [

self repository free.
super deleteAllForcingClose
]

{ #category : 'initialization' }
IceBasicRepositoryFixture >> initialize [
super initialize.
Expand Down
7 changes: 7 additions & 0 deletions Iceberg-Tests/IceClonedFromRemoteFixture.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ Class {
#tag : 'Common-Fixtures'
}

{ #category : 'private' }
IceClonedFromRemoteFixture >> deleteAllForcingClose [

self repository free.
super deleteAllForcingClose
]

{ #category : 'accessing' }
IceClonedFromRemoteFixture >> pushRepository [
^ pushRepository
Expand Down
1 change: 1 addition & 0 deletions Iceberg-Tests/IceGitTestFactory.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ IceGitTestFactory >> tearDownWithRepository: aRepository [

aRepository ifNotNil: [
aRepository free.
Smalltalk garbageCollect.
[ aRepository location ifNotNil: #ensureDeleteAll ]
on: CannotDeleteFileException
do: [ "On windows it is possible we need to finalize everything before deleting the files. We do not do it directly to avoid to lose too much speed"
Expand Down
16 changes: 13 additions & 3 deletions Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ IceNotYetClonedRepositoryFixture class >> inMemory [
yourself
]

{ #category : 'private' }
IceNotYetClonedRepositoryFixture >> deleteAllForcingClose [
"On windows it is possible we need to finalize everything before deleting the files.
We do not do it directly to avoid to lose too much speed"

Smalltalk garbageCollect.
self location ifNotNil: #ensureDeleteAll
]

{ #category : 'initialization' }
IceNotYetClonedRepositoryFixture >> ensureRemoteRepository [

Expand Down Expand Up @@ -111,7 +120,8 @@ IceNotYetClonedRepositoryFixture >> tearDown [

[ self location ifNotNil: #ensureDeleteAll ]
on: CannotDeleteFileException
do: [ "On windows it is possible we need to finalize everything before deleting the files. We do not do it directly to avoid to lose too much speed"
Smalltalk garbageCollect.
self location ifNotNil: #ensureDeleteAll ]
do: [
"On windows it is possible we need to finalize everything before deleting the files.
We do not do it directly to avoid to lose too much speed"
self deleteAllForcingClose ]
]
3 changes: 2 additions & 1 deletion Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ IceTipInteractiveErrorVisitor >> repository: anObject [

{ #category : 'visiting' }
IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [
context application

context application newInform
label: anError messageText;
title: 'Iceberg authentication Error';
openModal
Expand Down
2 changes: 2 additions & 0 deletions Iceberg-UI-Tests/IceTipCommitBrowserTest.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ IceTipCommitBrowserTest >> setUp [

{ #category : 'running' }
IceTipCommitBrowserTest >> tearDown [

presenter ifNotNil: [ presenter window close ].
super tearDown
]
Expand Down Expand Up @@ -154,6 +155,7 @@ IceTipCommitBrowserTest >> testIsCommittingWithTheRightMessage [
{ #category : 'tests' }
IceTipCommitBrowserTest >> testIsNotAutomaticallySavingWhenNotChecked [
| previousState |

previousState := presenter commentPanel isSaving.
presenter commentPanel saveOnCommit: false.
[
Expand Down

0 comments on commit 4cdc21d

Please sign in to comment.