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.

Sign up for GitHub

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

Pharo13 + other development improvements #1450

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Pharo13 + other development improvements #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
61c22a4
Author was removed in Pharo 13: disregard setting the author when usi…
jbrichau Oct 25, 2024
d2b3dd7
Move Seaside control panel to a separate top-level Seaside menu (read…
jbrichau Oct 25, 2024
7738e58
run ci on ubuntu latest
jbrichau Oct 25, 2024
a87c9c8
added code to see why an assertion is broken in the CI
jbrichau Oct 25, 2024
4d3541c
Merge 7738e58f01bbf8d3f43261d802568469eb65a55d
jbrichau Oct 25, 2024
f3d68c0
add a delay to debug a test
jbrichau Oct 25, 2024
844a621
reduce delay in test
jbrichau Oct 25, 2024
7e4444b
Added a menu item to open selenium (on mac only for now)
jbrichau Oct 25, 2024
39a3a9a
trigger build to test CI
jbrichau Dec 4, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .../Seaside-Pharo-Development.package/WADevelopment.class/class/ensureAuthorInitialsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
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 ].

Check warning on line 11 in repository/Seaside-Pharo-Development.package/WADevelopment.class/class/ensureAuthorInitialsWith..st

View check run for this annotation

Codecov / codecov/patch

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

Added lines #L10 - L11 were not covered by tests
author isNil
ifTrue: [ ^ self error: 'unsupported Pharo version' ].
author fullNamePerSe isEmptyOrNil
Expand Down
4 changes: 3 additions & 1 deletion ...easide-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideIsAuthorNameSet.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion ...Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideSetAuthorName..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Check warning on line 5 in repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideSetAuthorName..st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideSetAuthorName..st#L3-L5 

Added lines #L3 - L5 were not covered by tests
8 changes: 4 additions & 4 deletions ...ontrolPanel.class/class/menuCommandOn..st → ...class/class/controlPanelMenuCommandOn..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
world menu
menuCommandOn: aBuilder
controlPanelMenuCommandOn: aBuilder

Check warning on line 2 in repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/controlPanelMenuCommandOn..st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/controlPanelMenuCommandOn..st#L2 

Added line #L2 was not covered by tests
<worldMenu>
self registerIcons.

Check warning on line 4 in repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/controlPanelMenuCommandOn..st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/controlPanelMenuCommandOn..st#L4 

Added line #L4 was not covered by tests
(aBuilder item: #ServerAdapterBrowser)
order: 0.21;
parent: #Tools;
order: 1;
parent: #Seaside;

Check warning on line 7 in repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/controlPanelMenuCommandOn..st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/controlPanelMenuCommandOn..st#L6-L7 

Added lines #L6 - L7 were not covered by tests
label: 'Seaside Control Panel';
icon: (self iconNamed: #adaptorRunningIcon);
action: [ self open ]
6 changes: 6 additions & 0 deletions ...aro100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminal.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"'''

Check warning on line 6 in repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminal.st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminal.st#L1-L6 

Added lines #L1 - L6 were not covered by tests
9 changes: 9 additions & 0 deletions ...pec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminalMenuCommandOn..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
world menu
runSeleniumServerInTerminalMenuCommandOn: builder

<worldMenu>

(builder item: 'Run Selenium Server in Terminal')
parent: #Seaside;
order: 3;
action: [ self runSeleniumServerInTerminal ]

Check warning on line 9 in repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminalMenuCommandOn..st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminalMenuCommandOn..st#L1-L9 

Added lines #L1 - L9 were not covered by tests
6 changes: 6 additions & 0 deletions ...-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideIcebergRepository.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.' ]

Check warning on line 6 in repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideIcebergRepository.st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideIcebergRepository.st#L1-L6 

Added lines #L1 - L6 were not covered by tests
7 changes: 7 additions & 0 deletions ...ide-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideMenuCommandOn..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
world menu
seasideMenuCommandOn: builder
<worldMenu>

(builder item: #Seaside)
target: self;
order: 1.4

Check warning on line 7 in repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideMenuCommandOn..st

View check run for this annotation

Codecov / codecov/patch

repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/seasideMenuCommandOn..st#L1-L7 

Added lines #L1 - L7 were not covered by tests
1 change: 1 addition & 0 deletions ...sol.package/WAWebDriverFunctionalTestCase.class/instance/testTableReportFunctionalTest.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]).
Expand Down
Loading