Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pharo12 #1407

Merged
merged 16 commits into from
Mar 24, 2024
Merged

Pharo12 #1407

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.6.6, GemStone64-3.5.7 ]
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.7 ]
experimental: [ false ]
include:
- smalltalk: Pharo64-12
Expand Down Expand Up @@ -47,6 +47,7 @@ jobs:
name: Screenshots Test Failures ${{ matrix.smalltalk }}
path: ${{ env.SMALLTALK_CI_BUILD }}/*.png
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
name: ${{ matrix.smalltalk }}
token: ${{ secrets.CODECOV_TOKEN }}
4 changes: 4 additions & 0 deletions .smalltalk.ston
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ SmalltalkCISpec {
#platforms : [ #gemstone ]
}
],
#preTesting : SCICustomScript {
#path : 'scripts/preTestingPharo.st',
#platforms : [ #pharo ]
},
#testing : {
#defaultTimeout : 30,
#exclude : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
hooks
afterCheck: aNode mappings: dict

aNode methodNode method isRenderingMethod ifFalse: [ ^ false ].
aNode methodNode compiledMethod isRenderingMethod ifFalse: [ ^ false ].
aNode isWrite ifFalse: [ ^ false ].
(WASlime isWithinCallback: aNode) ifTrue:[ ^ false ].

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
hooks
afterCheck: aNode mappings: dict

aNode methodNode method isRenderingMethod ifFalse: [ ^ false ].
aNode methodNode compiledMethod isRenderingMethod ifFalse: [ ^ false ].
(WASlime isWithinCallback: aNode) ifTrue: [ ^ false ].
^ true
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
hooks
afterCheck: aNode mappings: dict

aNode methodNode method isRenderingMethod ifFalse: [ ^ false ].
aNode methodNode compiledMethod isRenderingMethod ifFalse: [ ^ false ].
(WASlime isWithinCallback: aNode) ifFalse: [ ^ false ].
^ true
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hooks
afterCheck: aNode mappings: dict

| class |
aNode methodNode method isRenderingMethod ifFalse: [ ^ false ].
aNode methodNode compiledMethod isRenderingMethod ifFalse: [ ^ false ].
class := Smalltalk classNamed: aNode receiver name.
class ifNil: [ ^ false ].
^ class isBehavior and: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hooks
afterCheck: aNode mappings: dict

| owner |
aNode methodNode method isRenderingMethod ifFalse:[ ^ false ].
aNode methodNode compiledMethod isRenderingMethod ifFalse:[ ^ false ].
owner := aNode isCascaded
ifTrue: [ aNode parent parent ]
ifFalse: [ aNode parent ].
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
hooks
afterCheck: aNode mappings: dict

aNode methodNode method isRenderingMethod ifFalse:[ ^ false ].
aNode methodNode compiledMethod isRenderingMethod ifFalse:[ ^ false ].
^ (aNode selector = #with:)
ifTrue: [ WASlime isBrushSelector: aNode receiver selector ]
ifFalse: [ WASlime isBrushSelector: aNode selector ]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
hooks
afterCheck: aNode mappings: dict

aNode methodNode method isRenderingMethod ifFalse: [ ^ false ].
aNode methodNode compiledMethod isRenderingMethod ifFalse: [ ^ false ].
^ (aNode parent isCascade not)
and: [ (WASlime isBrushSelector: aNode receiver selector)
and: [ (WASlime isBrushSelector: aNode receiver selector , ':')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
hooks
afterCheck: aNode mappings: dict

^ aNode methodNode method isRenderingMethod and: [
^ aNode methodNode compiledMethod isRenderingMethod and: [
aNode parent isCascade and: [
aNode parent messages last ~= aNode and: [
WASlime isBrushSelector: aNode receiver selector ] ] ]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Seaside-Pharo110-Slime'!
self packageOrganizer ensurePackage: #'Seaside-Pharo110-Slime' withTags: #()!
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ testAddAllFilesIn
(directory / '.Seaside_Store') ensureCreateFile .
(directory / 'foo') ensureCreateFile.
GRPlatform current doSilently: [
library := WAFileLibrary
subclass: #XXXTestFileLibrary
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'Uncategorized'.
library := WAFileLibrary classInstaller make: [ :builder |
builder
superclass: WAFileLibrary;
name: #XXXTestFileLibrary;
environment: WAFileLibrary environment ].
[ library addAllFilesIn: directory fullName.
self assert: library selectors size = 1 ] "reject .Seaside_Store"
ensure: [ library removeFromSystem ] ] ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Seaside-Tests-Pharo-Core'!
self packageOrganizer ensurePackage: #'Seaside-Tests-Pharo-Core' withTags: #()!

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Seaside-Tests-Pharo-Development'!
self packageOrganizer ensurePackage: #'Seaside-Tests-Pharo-Development' withTags: #()!
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
*seaside-tests-pharo-email
testSeasideSmtpServer

| seasideSmtpServer |
seasideSmtpServer := [ GRPlatform current seasideSmtpServer ]
on: ProvideAnswerNotification
do: [ :e | e resume: '1.2.3.4' ].
| seasideSmtpServer oldSmtpServer |
oldSmtpServer := [ MailComposition smtpServer ] on: Error do: [ :e | "If the smtpServer was not set, an error is thrown. Set it back to nil afterwards." nil ].
MailComposition setSmtpServer: '1.2.3.4'.
[ seasideSmtpServer := GRPlatform current seasideSmtpServer ]
ensure: [ MailComposition setSmtpServer: oldSmtpServer ].

Check warning on line 8 in repository/Seaside-Tests-Pharo-Email.package/GRPharoPlatformTest.extension/instance/testSeasideSmtpServer.st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Tests-Pharo-Email.package/GRPharoPlatformTest.extension/instance/testSeasideSmtpServer.st#L4-L8

Added lines #L4 - L8 were not covered by tests
self assert: seasideSmtpServer isString
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Seaside-Tests-Pharo-Email'!
self packageOrganizer ensurePackage: #'Seaside-Tests-Pharo-Email' withTags: #()!

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ convertMultipartStreamingEntity: anEntity with: aMultiValueDictionary
partsDecodeWith: [ :znMimePart |
aMultiValueDictionary
at: znMimePart fieldName
add: (self codec url decode: (znMimePart hasEntity
ifTrue: [ znMimePart fieldValueString ]
ifFalse: [ '' ])) ]
add: (self codec url decode: (znMimePart hasEntity ifTrue: [ znMimePart fieldValueString ] ifFalse: [ '' ])) ]
decodeFilesWith: [ :znMimePart :filePath |
"Empty file + empty filename means that the file form
field did not contain a value (no file was selected)."
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Seaside-Zinc-Core'!
self packageOrganizer ensurePackage: #'Seaside-Zinc-Core' withTags: #()!
1 change: 1 addition & 0 deletions scripts/preTestingPharo.st
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Deprecation activateTransformations: false.
Loading