Skip to content

222 prepare for migration to seaside 360 #223

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

Merged
mtabacman merged 3 commits into from
Feb 11, 2026
Merged

222 prepare for migration to seaside 360 #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
818c5b3
Corrected implementation
mtabacman Jan 8, 2026
55964a8
Corrected Seaside,RenoirSt and Boardwalk dependencies
mtabacman Jan 10, 2026
74c96d2
Corrected tests to adjust for new JS renderer
mtabacman Jan 14, 2026
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
21 changes: 11 additions & 10 deletions source/BaselineOfWillow/BaselineOfWillow.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
Metacello Baseline definition for Willow
"
Class {
#name : #BaselineOfWillow,
#superclass : #BaselineOf,
#category : #BaselineOfWillow
#name : 'BaselineOfWillow',
#superclass : 'BaselineOf',
#category : 'BaselineOfWillow',
#package : 'BaselineOfWillow'
}

{ #category : #baselines }
{ #category : 'baselines' }
BaselineOfWillow >> baseline: spec [

<baseline>
Expand All @@ -23,38 +24,38 @@ BaselineOfWillow >> baseline: spec [
]
]

{ #category : #accessing }
{ #category : 'accessing' }
BaselineOfWillow >> projectClass [

^ MetacelloCypressBaselineProject
]

{ #category : #baselines }
{ #category : 'baselines' }
BaselineOfWillow >> setUpDependencies: spec [

spec
baseline: 'Seaside3' with: [ spec repository: 'github://SeasideSt/Seaside:v3.5.x/repository' ];
baseline: 'Seaside3' with: [ spec repository: 'github://SeasideSt/Seaside:v3.6.x/repository' ];
project: 'Seaside3-JQuery'
copyFrom: 'Seaside3'
with: [ spec loads: #('Core' 'Javascript' 'JQuery') ];
project: 'Seaside3-Development' copyFrom: 'Seaside3' with: [ spec loads: #('Development') ].

spec
baseline: 'RenoirSt' with: [ spec repository: 'github://ba-st/RenoirSt:v8/source' ];
baseline: 'RenoirSt' with: [ spec repository: 'github://ba-st/RenoirSt:v9/source' ];
project: 'RenoirSt-Deployment'
copyFrom: 'RenoirSt'
with: [ spec loads: 'Deployment-Seaside-Extensions' ].

spec
baseline: 'Boardwalk' with: [ spec repository: 'github://ba-st/Boardwalk:v7/source' ];
baseline: 'Boardwalk' with: [ spec repository: 'github://ba-st/Boardwalk:v8/source' ];
project: 'Boardwalk-Deployment' copyFrom: 'Boardwalk' with: [ spec loads: 'Deployment' ];
project: 'Boardwalk-SUnit'
copyFrom: 'Boardwalk'
with: [ spec loads: 'Dependent-SUnit-Extensions' ];
project: 'Boardwalk-Tools' copyFrom: 'Boardwalk' with: [ spec loads: 'Tools' ]
]

{ #category : #baselines }
{ #category : 'baselines' }
BaselineOfWillow >> setUpPackages: spec [

spec
Expand Down
2 changes: 1 addition & 1 deletion source/BaselineOfWillow/package.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Package { #name : #BaselineOfWillow }
Package { #name : 'BaselineOfWillow' }
54 changes: 27 additions & 27 deletions source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion source/Willow-Core-Tests/Html5ComponentSupplierTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Html5ComponentSupplierTest >> testDelayedViewShowingWhileEvaluatingThenRendering

self
assertRenderingOf: [ :supplier | supplier delayedViewShowing: 'Loading...' whileEvaluating: [ ] thenRendering: 'Done!' ]
equals: '<div id="container-id1">Loading...</div><script type="text/javascript">Willow.callServer({"url":"/","data":"2"});</script>'
equals: '<div id="container-id1">Loading...</div><script type="text/javascript">Willow.callServer({"dataType":"script","url":"/","data":"2"});</script>'
]

{ #category : 'tests-Supplying' }
Expand Down
2 changes: 1 addition & 1 deletion source/Willow-Core-Tests/PeriodicallyRenderedWebViewTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ PeriodicallyRenderedWebViewTest >> testScriptToRefreshAndRenderContentOn [
self
assert: html
equals:
'<div id="id3"></div><script type="text/javascript">$("#id3").html("Count: 2<br/>\x3Cscript type=\"text/javascript\">$.ajax({\"url\":\"/\",\"data\":\"2\"});\x3C/script>");</script>'
'<div id="id2"></div><script type="text/javascript">$("#id2").html("Count: 2<br/>\x3Cscript type=\"text/javascript\">$.ajax({\"url\":\"/\",\"data\":\"3\"});\x3C/script>");</script>'
]
74 changes: 36 additions & 38 deletions source/Willow-Core-Tests/WebInteractionInterpreterTest.class.st
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions source/Willow-Core/JSConcatenateBefore.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ Class {
}

{ #category : 'printing' }
JSConcatenateBefore >> javascriptContentOn: aStream [
JSConcatenateBefore >> javascriptContentOn: aRenderer [

aStream
javascript: self statement;
nextPut: $;.
super javascriptContentOn: aStream
aRenderer render: self statement.
aRenderer document separator.
super javascriptContentOn: aRenderer
]
4 changes: 2 additions & 2 deletions source/Willow-Core/WillowJavascriptNamespace.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ WillowJavascriptNamespace >> handleAjaxErrorCallFunction [
]

{ #category : 'printing' }
WillowJavascriptNamespace >> javascriptContentOn: aStream [
WillowJavascriptNamespace >> javascriptContentOn: aRenderer [

aStream nextPutAll: 'Willow'
aRenderer document identifier: 'Willow'
]

{ #category : 'Accessing' }
Expand Down
Loading