Merge pull request #1450 from SeasideSt/pharo13-development

Pharo13 + other development improvements
SeasideSt · Dec 20, 2024 · c16dc88 · c16dc88
2 parents 47a88fc + 39a3a9a
commit c16dc88
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -13,7 +13,7 @@ jobs:
         include:
           - smalltalk: Pharo64-13
             experimental: true
-          - smalltalk: GToolkit64-release
+          - smalltalk: GToolkit64-release 
             experimental: true
           - smalltalk: Squeak64-6.0
             experimental: true

diff --git a/.../Seaside-Pharo-Development.package/WADevelopment.class/class/ensureAuthorInitialsWith..st b/.../Seaside-Pharo-Development.package/WADevelopment.class/class/ensureAuthorInitialsWith..st
@@ -7,7 +7,8 @@ ensureAuthorInitialsWith: aOneArgumentBlock
 		ifTrue: [
 			"Special Pharo code path to avoid deprecation"
 			| author |
-			author := Smalltalk at: #Author.
+			SystemVersion current major >= 13 ifTrue:[ ^ self. "do nothing because Author does not exist anymore" ].
+			author := Smalltalk at: #Author ifAbsent: [ nil ].
 			author isNil
 				ifTrue: [ ^ self error: 'unsupported Pharo version' ].
 			author fullNamePerSe isEmptyOrNil

diff --git a/...easide-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideIsAuthorNameSet.st b/...easide-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideIsAuthorNameSet.st
@@ -1,3 +1,5 @@
 *seaside-pharo-welcome
 seasideIsAuthorNameSet
-	^ Author fullNamePerSe isEmptyOrNil not
+
+	SystemVersion current major >= 13 ifTrue:[ ^ true. "Author does not exist anymore" ].
+	^ (Smalltalk at: #Author) fullNamePerSe isEmptyOrNil not
diff --git a/...Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideSetAuthorName..st b/...Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideSetAuthorName..st
@@ -1,3 +1,5 @@
 *seaside-pharo-welcome
 seasideSetAuthorName: anAuthorName
-	Author fullName: anAuthorName
+
+	SystemVersion current major >= 13 ifTrue:[ ^ self error: 'Author does not exist anymore.' ].
+	(Smalltalk at: #Author) fullName: anAuthorName
diff --git a/...ontrolPanel.class/class/menuCommandOn..st → ...class/class/controlPanelMenuCommandOn..st b/...ontrolPanel.class/class/menuCommandOn..st → ...class/class/controlPanelMenuCommandOn..st
@@ -1,10 +1,10 @@
 world menu
-menuCommandOn: aBuilder
+controlPanelMenuCommandOn: aBuilder
 	<worldMenu>
-	self registerIcons. 
+
 	(aBuilder item: #ServerAdapterBrowser)
-		order: 0.21;
-		parent: #Tools;
+		order: 1;
+		parent: #Seaside;
 		label: 'Seaside Control Panel';
 		icon: (self iconNamed: #adaptorRunningIcon);
 		action: [ self open ]
diff --git a/...aro100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminal.st b/...aro100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminal.st
@@ -0,0 +1,6 @@
+commands
+runSeleniumServerInTerminal
+	<script>
+
+	"Only works on Mac at this time"
+	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"'''
diff --git a/...pec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminalMenuCommandOn..st b/...pec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminalMenuCommandOn..st
@@ -0,0 +1,9 @@
+world menu
+runSeleniumServerInTerminalMenuCommandOn: builder
+
+	<worldMenu>
+
+	(builder item: 'Run Selenium Server in Terminal')
+		parent: #Seaside;
+		order: 3;
+		action: [ self runSeleniumServerInTerminal ]
diff --git a/...-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideIcebergRepository.st b/...-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideIcebergRepository.st
@@ -0,0 +1,6 @@
+private
+seasideIcebergRepository
+
+	^ IceRepository registry 
+		detect: [ :repository | repository workingCopy packages anySatisfy:[ :p | p packageName = 'Seaside-Core' ] ] 
+		ifNone: [ Error signal: 'Could not find the Seaside repository.' ]
diff --git a/...ide-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideMenuCommandOn..st b/...ide-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideMenuCommandOn..st
@@ -0,0 +1,7 @@
+world menu
+seasideMenuCommandOn: builder 
+	<worldMenu>
+
+	(builder item: #Seaside)
+		target: self;
+		order: 1.4
diff --git a/...sol.package/WAWebDriverFunctionalTestCase.class/instance/testTableReportFunctionalTest.st b/...sol.package/WAWebDriverFunctionalTestCase.class/instance/testTableReportFunctionalTest.st
@@ -3,6 +3,7 @@ testTableReportFunctionalTest
 	| firstColumn classNames |
 	self selectTest: 'WATableReportFunctionalTest'.
 
+	(Delay forMilliseconds: 500) wait."Because it was failing on the CI for some older versions..."
 	firstColumn := driver findElementsByCSSSelector: 'table>tbody>tr>td:first-child'.
 	classNames := (firstColumn collect: [ :e | e getText ]).
 	self assert: ((WAComponent allSubclasses collect: [ :c | c name greaseString ]) allSatisfy: [ :className | classNames includes: className ]).