From 8ae3c95d63b1465df7e610e5de6869283a9f8865 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Thu, 23 Feb 2023 10:04:50 -0800 Subject: [PATCH 1/2] Issue #1355: for now just ignore #_continue and #array: in SentButNotImplementedTest --- .../BaselineOfSeaside3.package/.filetree | 5 ++--- .../instance/baselinegemstone..st | 3 +++ .../instance/baselinejavascript..st | 2 +- .../BaselineOfSeaside3.class/properties.json | 19 +++++++++++-------- .../monticello.meta/categories.st | 2 +- .../properties.json | 3 ++- .../nonImplementedSelectorsSeasideCore.st | 5 ++++- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/repository/BaselineOfSeaside3.package/.filetree b/repository/BaselineOfSeaside3.package/.filetree index 57a679737..8998102c2 100644 --- a/repository/BaselineOfSeaside3.package/.filetree +++ b/repository/BaselineOfSeaside3.package/.filetree @@ -1,5 +1,4 @@ { - "separateMethodMetaAndSource" : false, "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st index 013ecb4c5..510e4e288 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st @@ -101,6 +101,9 @@ baselinegemstone: spec do: [ spec group: 'CI' with: #('Swazoo') ]. + spec + for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x') + do: [ ]. spec for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x') do: [ diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinejavascript..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinejavascript..st index 2d353935c..950a0aace 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinejavascript..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinejavascript..st @@ -50,4 +50,4 @@ baselinejavascript: spec package: 'Javascript-Core' with: [ spec includes: #('Javascript-GemStone-Core') ]; package: 'Javascript-GemStone-Core' - with: [ spec requires: #('Javascript-Core') ] ]. + with: [ spec requires: #('Javascript-Core') ] ]. \ No newline at end of file diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/properties.json b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/properties.json index 57540298c..3638c28e5 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/properties.json +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/properties.json @@ -1,11 +1,14 @@ { - "commentStamp" : "", - "super" : "BaselineOf", "category" : "BaselineOfSeaside3", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], "name" : "BaselineOfSeaside3", - "type" : "normal" -} \ No newline at end of file + "pools" : [ + ], + "super" : "BaselineOf", + "type" : "normal" } diff --git a/repository/BaselineOfSeaside3.package/monticello.meta/categories.st b/repository/BaselineOfSeaside3.package/monticello.meta/categories.st index 33792de89..886c5b74e 100644 --- a/repository/BaselineOfSeaside3.package/monticello.meta/categories.st +++ b/repository/BaselineOfSeaside3.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #BaselineOfSeaside3! +SystemOrganization addCategory: #'BaselineOfSeaside3'! diff --git a/repository/BaselineOfSeaside3.package/properties.json b/repository/BaselineOfSeaside3.package/properties.json index 6f31cf5a2..f037444a7 100644 --- a/repository/BaselineOfSeaside3.package/properties.json +++ b/repository/BaselineOfSeaside3.package/properties.json @@ -1 +1,2 @@ -{ } \ No newline at end of file +{ + } diff --git a/repository/Seaside-GemStone-Core.package/SentButNotImplementedTest.extension/instance/nonImplementedSelectorsSeasideCore.st b/repository/Seaside-GemStone-Core.package/SentButNotImplementedTest.extension/instance/nonImplementedSelectorsSeasideCore.st index 7bc5279d1..97c6b6d0b 100644 --- a/repository/Seaside-GemStone-Core.package/SentButNotImplementedTest.extension/instance/nonImplementedSelectorsSeasideCore.st +++ b/repository/Seaside-GemStone-Core.package/SentButNotImplementedTest.extension/instance/nonImplementedSelectorsSeasideCore.st @@ -1,3 +1,6 @@ *seaside-gemstone-core nonImplementedSelectorsSeasideCore - ^ #(#'javascript:' #'internalServerErrorMessage:') "WAScriptGenerator>>writeLoadScriptsOn: is the bad boy for javascript: and GRGemStonePlatform>>seasideProcessRequest:adaptor:resultBlock: is bad boy for internalServerErrorMessage:" \ No newline at end of file + ^ #(#'javascript:' #'internalServerErrorMessage:' #array: #'_continue') "WAScriptGenerator>>writeLoadScriptsOn: is the bad boy for javascript: +GRGemStonePlatform>>seasideProcessRequest:adaptor:resultBlock: is bad boy for internalServerErrorMessage: +JQJsonFunctionalTest>>seasidePackagesOn: is bad boy for array: +WARemoteDebuggingWalkback>>resumeContinuation is bad boy for _continue (https://github.com/SeasideSt/Seaside/issues/1355)" \ No newline at end of file From b3831fb454c17df36dedf93070b9c406666a7dea Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Thu, 23 Feb 2023 10:06:59 -0800 Subject: [PATCH 2/2] Issue #1355: revert the BaselineOfSeaside3>>baselinegemstone: edit --- .../BaselineOfSeaside3.class/instance/baselinegemstone..st | 3 --- 1 file changed, 3 deletions(-) diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st index 510e4e288..013ecb4c5 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st @@ -101,9 +101,6 @@ baselinegemstone: spec do: [ spec group: 'CI' with: #('Swazoo') ]. - spec - for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x') - do: [ ]. spec for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x') do: [