From 34689a0a6045cb58fe8c9666ce5568267a7047cd Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 14 May 2023 15:00:49 +0200 Subject: [PATCH 1/5] enable context functional test in gemstone --- .../instance/expectedFailures.st | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/expectedFailures.st b/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/expectedFailures.st index e888983df..3ea4117d9 100644 --- a/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/expectedFailures.st +++ b/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/expectedFailures.st @@ -1,7 +1,3 @@ running expectedFailures - | todo | - todo := #(testExpiryFunctionalTest testFilterFunctionalTest testUploadFunctionalTest). - ^ (GRPlatform current class == (Smalltalk at: #GRGemStonePlatform ifAbsent:[ nil ])) - ifTrue: [ #(testContextFunctionalTest), todo "requires https://github.com/GsDevKit/Grease/pull/17 to be merged" ] - ifFalse:[ todo ] \ No newline at end of file + ^ #(testExpiryFunctionalTest testFilterFunctionalTest testUploadFunctionalTest testCORSFilterFunctionalTest) \ No newline at end of file From bd69d4e0834f31ab6dc56562d13140696340a6ae Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 14 May 2023 15:12:40 +0200 Subject: [PATCH 2/5] revert --- .../instance/expectedFailures.st | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/expectedFailures.st b/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/expectedFailures.st index 3ea4117d9..048aec0c2 100644 --- a/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/expectedFailures.st +++ b/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/expectedFailures.st @@ -1,3 +1,7 @@ running expectedFailures - ^ #(testExpiryFunctionalTest testFilterFunctionalTest testUploadFunctionalTest testCORSFilterFunctionalTest) \ No newline at end of file + | todo | + todo := #(testExpiryFunctionalTest testFilterFunctionalTest testUploadFunctionalTest testCORSFilterFunctionalTest). + ^ (GRPlatform current class == (Smalltalk at: #GRGemStonePlatform ifAbsent:[ nil ])) + ifTrue: [ #(testContextFunctionalTest), todo "requires https://github.com/GsDevKit/Grease/pull/17 to be merged" ] + ifFalse:[ todo ] \ No newline at end of file From 7adf27cdd7672e8a4d7d787291e21f42987421bf Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 14 May 2023 15:19:37 +0200 Subject: [PATCH 3/5] remove use of .checkbox and .text from welcomeCss (these css classes were removed from input elements in Seaside 3.2) --- .../WAWelcomeFiles.class/instance/welcomeCss.st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repository/Seaside-Welcome.package/WAWelcomeFiles.class/instance/welcomeCss.st b/repository/Seaside-Welcome.package/WAWelcomeFiles.class/instance/welcomeCss.st index 7ed0aa34f..c3894d4a0 100644 --- a/repository/Seaside-Welcome.package/WAWelcomeFiles.class/instance/welcomeCss.st +++ b/repository/Seaside-Welcome.package/WAWelcomeFiles.class/instance/welcomeCss.st @@ -10,7 +10,7 @@ html, body { margin-top: 0px; background: #fff url("background.jpg") repeat-y center top; } -input.text { +input[type=text] { color: #2a2a2a; font-size: 100%; border: 1px solid #ccc; @@ -175,7 +175,7 @@ pre.codeSample { margin: 2em; } -form.config input.checkbox { margin-right: 1em; } +form.config input[type=checkbox] { margin-right: 1em; } form.config label { vertical-align: top; } .container .buttons { text-align: center; margin-top: 2em; } .container .buttons a { margin: 0 1em; } From 762cbe1333c91c949cb18fbf17834193d0a50955 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 14 May 2023 15:21:11 +0200 Subject: [PATCH 4/5] Mark JsJSONParser class as deprecated (it was already but hard to see and never removed) --- .../JSJsonParser.class/class/isDeprecated.st | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 repository/Seaside-JSON-Core.package/JSJsonParser.class/class/isDeprecated.st diff --git a/repository/Seaside-JSON-Core.package/JSJsonParser.class/class/isDeprecated.st b/repository/Seaside-JSON-Core.package/JSJsonParser.class/class/isDeprecated.st new file mode 100644 index 000000000..32d85251e --- /dev/null +++ b/repository/Seaside-JSON-Core.package/JSJsonParser.class/class/isDeprecated.st @@ -0,0 +1,3 @@ +testing +isDeprecated + ^ true \ No newline at end of file From 5e7a9900ac67ed843dbc887cc28a3fc4a5e6e7aa Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 14 May 2023 15:35:24 +0200 Subject: [PATCH 5/5] Remove unused method GRPlatform>>sourceFileEncoding --- .../GRPlatform.extension/instance/sourceFileEncoding.st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 repository/Seaside-Core.package/GRPlatform.extension/instance/sourceFileEncoding.st diff --git a/repository/Seaside-Core.package/GRPlatform.extension/instance/sourceFileEncoding.st b/repository/Seaside-Core.package/GRPlatform.extension/instance/sourceFileEncoding.st deleted file mode 100644 index b5e168591..000000000 --- a/repository/Seaside-Core.package/GRPlatform.extension/instance/sourceFileEncoding.st +++ /dev/null @@ -1,4 +0,0 @@ -*Seaside-Core -sourceFileEncoding - "Answer the encoding used for source files." - ^ 'ISO-8859-1' \ No newline at end of file