Skip to content

Commit c16dc88

Browse files
author
Johan Brichau
authored
Merge pull request #1450 from SeasideSt/pharo13-development
Pharo13 + other development improvements
2 parents 47a88fc + 39a3a9a commit c16dc88

File tree

10 files changed

+43
-9
lines changed

10 files changed

+43
-9
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
test:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-latest
88
strategy:
99
fail-fast: false
1010
matrix:
@@ -13,7 +13,7 @@ jobs:
1313
include:
1414
- smalltalk: Pharo64-13
1515
experimental: true
16-
- smalltalk: GToolkit64-release
16+
- smalltalk: GToolkit64-release
1717
experimental: true
1818
- smalltalk: Squeak64-6.0
1919
experimental: true

repository/Seaside-Pharo-Development.package/WADevelopment.class/class/ensureAuthorInitialsWith..st

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ ensureAuthorInitialsWith: aOneArgumentBlock
77
ifTrue: [
88
"Special Pharo code path to avoid deprecation"
99
| author |
10-
author := Smalltalk at: #Author.
10+
SystemVersion current major >= 13 ifTrue:[ ^ self. "do nothing because Author does not exist anymore" ].
11+
author := Smalltalk at: #Author ifAbsent: [ nil ].
1112
author isNil
1213
ifTrue: [ ^ self error: 'unsupported Pharo version' ].
1314
author fullNamePerSe isEmptyOrNil
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
*seaside-pharo-welcome
22
seasideIsAuthorNameSet
3-
^ Author fullNamePerSe isEmptyOrNil not
3+
4+
SystemVersion current major >= 13 ifTrue:[ ^ true. "Author does not exist anymore" ].
5+
^ (Smalltalk at: #Author) fullNamePerSe isEmptyOrNil not
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
*seaside-pharo-welcome
22
seasideSetAuthorName: anAuthorName
3-
Author fullName: anAuthorName
3+
4+
SystemVersion current major >= 13 ifTrue:[ ^ self error: 'Author does not exist anymore.' ].
5+
(Smalltalk at: #Author) fullName: anAuthorName
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
world menu
2-
menuCommandOn: aBuilder
2+
controlPanelMenuCommandOn: aBuilder
33
<worldMenu>
4-
self registerIcons.
4+
55
(aBuilder item: #ServerAdapterBrowser)
6-
order: 0.21;
7-
parent: #Tools;
6+
order: 1;
7+
parent: #Seaside;
88
label: 'Seaside Control Panel';
99
icon: (self iconNamed: #adaptorRunningIcon);
1010
action: [ self open ]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
commands
2+
runSeleniumServerInTerminal
3+
<script>
4+
5+
"Only works on Mac at this time"
6+
LibC system: 'osascript -e ''tell app "Terminal" to activate'' && osascript -e ''tell app "Terminal" to do script "npm install selenium-standalone && npx selenium-standalone install && npx selenium-standalone start"'''
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
world menu
2+
runSeleniumServerInTerminalMenuCommandOn: builder
3+
4+
<worldMenu>
5+
6+
(builder item: 'Run Selenium Server in Terminal')
7+
parent: #Seaside;
8+
order: 3;
9+
action: [ self runSeleniumServerInTerminal ]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
private
2+
seasideIcebergRepository
3+
4+
^ IceRepository registry
5+
detect: [ :repository | repository workingCopy packages anySatisfy:[ :p | p packageName = 'Seaside-Core' ] ]
6+
ifNone: [ Error signal: 'Could not find the Seaside repository.' ]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
world menu
2+
seasideMenuCommandOn: builder
3+
<worldMenu>
4+
5+
(builder item: #Seaside)
6+
target: self;
7+
order: 1.4

repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/testTableReportFunctionalTest.st

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ testTableReportFunctionalTest
33
| firstColumn classNames |
44
self selectTest: 'WATableReportFunctionalTest'.
55

6+
(Delay forMilliseconds: 500) wait."Because it was failing on the CI for some older versions..."
67
firstColumn := driver findElementsByCSSSelector: 'table>tbody>tr>td:first-child'.
78
classNames := (firstColumn collect: [ :e | e getText ]).
89
self assert: ((WAComponent allSubclasses collect: [ :c | c name greaseString ]) allSatisfy: [ :className | classNames includes: className ]).

0 commit comments

Comments
 (0)