Merge pull request #1238 from SeasideSt/pharo9-tests

Pharo9 and various other additions

.github/workflows/ci.yml

@@ -8,10 +8,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-8.0, Pharo64-7.0, Pharo-6.1, Pharo-5.0, GemStone64-3.5.4, GemStone64-3.4.5, GemStone64-3.3.9, GemStone64-3.2.17, GemStone64-3.1.0.6 ]
+        smalltalk: [ Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo-6.1, GemStone64-3.5.4, GemStone64-3.4.5, GemStone64-3.3.9, GemStone64-3.2.17, GemStone64-3.1.0.6 ]
         experimental: [ false ]
         include:
-          - smalltalk: Pharo64-9.0
+          - smalltalk: Pharo64-alpha
+            experimental: true
+          - smalltalk: Squeak64-5.3
             experimental: true
           - smalltalk: Squeak-5.2
             experimental: true
@@ -29,12 +31,6 @@ jobs:
           sudo apt install google-chrome-stable
       - name: Install selenium
         run: npm install selenium-standalone && npx selenium-standalone install && npx selenium-standalone start &
-      - name: Fix missing OS prerequisites for GemStone builds
-        run: |
-          git clone https://github.com/GsDevKit/GsDevKit_home.git
-          ./GsDevKit_home/bin/utils/installOsPrereqs
-        continue-on-error: true
-        if: startsWith(matrix.smalltalk,'GemStone')
       - name: Run tests
         run: smalltalkci -s ${{ matrix.smalltalk }}
         shell: bash

.smalltalk.ston

@@ -27,6 +27,11 @@ SmalltalkCISpec {
       #platforms : [ #gemstone ]
     }
   ],
+  #postLoading : [
+    SCICustomScript {
+      #path : 'scripts/loadParasolAndTests.st'
+    }
+  ],
   #testing : {
       #exclude : {
         #packages : [ 'Cryptography.*' ]

.travis.yml

@@ -14,16 +14,11 @@ before_script:
   - "java -Dwebdriver.chrome.driver=chromedriver -Dwebdriver.chrome.logfile=\"${TRAVIS_BUILD_DIR}/chromedriver.log\" -Dwebdriver.chrome.args=--verbose -jar ${TRAVIS_BUILD_DIR}/selenium-server-standalone-3.141.59.jar -port 4444 -log ${TRAVIS_BUILD_DIR}/seleniumlog.txt &"
   - "sleep 3" #allow for all processes to start before testing
 
-aliases:
-  - &pharo4-has-latest-metacello
-    smalltalk_config: .pharo4.ston
-
 matrix:
   allow_failures:
     - smalltalk: Squeak-trunk
     - smalltalk: Squeak-5.1
     - smalltalk: Squeak-5.2   ### see https://github.com/SeasideSt/Seaside/issues/1229
-    - smalltalk: Pharo64-9.0
 
   include:
     - smalltalk: Pharo64-9.0
@@ -34,11 +29,6 @@ matrix:
       env: BUILD_NAME=Pharo64-7.0
     - smalltalk: Pharo-6.1
       env: BUILD_NAME=Pharo-6.1
-    - smalltalk: Pharo-5.0
-      env: BUILD_NAME=Pharo-5.0
-    - smalltalk: Pharo-4.0
-      env: BUILD_NAME=Pharo-4.0
-      <<: *pharo4-has-latest-metacello
 
     - smalltalk: Squeak-trunk
       env: BUILD_NAME=Squeak-trunk

repository/BaselineOfSeaside3.package/.filetree

@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}

repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st

@@ -7,7 +7,7 @@ baselinecommon: spec
         	with: [ 
 				spec
 					loads: #('Grease-Core');
-					repository: 'github://SeasideSt/Grease:v1.6.x/repository' ].
+					repository: 'github://SeasideSt/Grease:v1.7.x/repository' ].
 		spec
 			project: 'Grease Core Tests' copyFrom: 'Grease' with: [ 
 				spec loads: #('Core Tests') ] 
@@ -26,14 +26,6 @@ baselinecommon: spec
 	].
 
 	spec for: #'common' do: [
-
-      spec
-			baseline: 'Parasol'
-        	with: [ 
-				spec
-					loads: #('default');
-					repository: 'github://SeasideSt/Parasol:master/repository' ].
-
 		spec
 			package: 'Seaside-Canvas' with: [
 				spec requires: #('Seaside-Core' ). ];
@@ -94,11 +86,11 @@ baselinecommon: spec
 			package: 'Seaside-Tests-UTF8' with: [
 				spec requires: #('Seaside-Tests-Core' ) ];
 			package: 'Seaside-Tests-Parasol' with: [
-				spec requires: #('Parasol' 'Seaside-Tests-Functional' ) ].
+				spec requires: #('Seaside-Tests-Functional' 'Seaside-Tools-Core') ].
 		spec 
 			group: 'default' with: #('Core' 'JSON' 'Email' 'Javascript' 'JQuery' 'JQueryUI' 'Seaside-Examples' 'Seaside-Welcome');
 			group: 'OneClick' with: #('Tests' 'Development' 'Zinc');
-			group: 'CI' with: #('Tests' 'Development Tests' 'Parasol-Tests');
+			group: 'CI' with: #('Tests' 'Development Tests');
 			group: 'Core' with: #('Seaside-Core' 'Seaside-Continuation' 'Seaside-Canvas' 'Seaside-Session' 'Seaside-Component' 'Seaside-RenderLoop' 'Seaside-Tools-Core' 'Seaside-Flow' 'Seaside-Environment' 'Seaside-Widgets' );
 			group: 'Tests' with: #('Core' 'Seaside-Tests-Core' 'Seaside-Tests-Canvas' 'Seaside-Tests-Session' 'Seaside-Tests-Component' 'Seaside-Tests-RenderLoop' 'Seaside-Tests-Environment' 'Seaside-Tests-Flow' 'Seaside-Tests-UTF8' 'Seaside-Tests-InternetExplorer' 'Seaside-Tests-Email' 'Seaside-Tests-Examples' 'RSS Tests' 'Welcome Tests' 'REST Tests' 'Swagger Tests');
 			group: 'Parasol-Tests' with: #('Seaside-Tests-Parasol');

repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st

@@ -11,13 +11,6 @@ baselinegemstone: spec
                 loads: #('Base');
                 repository: 'github://glassdb/glass:master/repository' ].
 
-      spec
-			  baseline: 'Parasol'
-        	with: [ 
-            spec
-              loads: #('core');
-              repository: 'github://SeasideSt/Parasol:master/repository' ].
-
       spec
         package: 'Seaside-Squeak-Compatibility';
         package: 'Seaside-Core'
@@ -38,11 +31,6 @@ baselinegemstone: spec
                   #('Seaside-GemStone-Environment' 'Seaside-GemStone-Tools-Production') ];
         package: 'Seaside-Session'
           with: [ spec includes: #('Seaside-GemStone-Session') ];
-        package: 'Seaside-Tests-Parasol'
-          with: [
-            spec
-              includes: #('Parasol-Seaside');
-              requires: #('Parasol-Seaside') ];
         package: 'Seaside-Tools-Web'
           with: [ spec includes: #('Seaside-GemStone-Tools-Web') ];
         package: 'Seaside-Tests-Core'
@@ -91,12 +79,6 @@ baselinegemstone: spec
           with: [ spec requires: #('Seaside-Tests-Flow') ];
         package: 'Seaside-Tests-GemStone-Functional'
           with: [ spec requires: #('Seaside-Tests-Functional') ].
-     spec
-			  project: 'Parasol-Seaside'
-					copyFrom: 'Parasol'
-        	with: [ 
-            spec
-              loads: #('Parasol-Seaside') ].
      spec
         group: 'CI' with: #('Seaside-Tools-Core' 'FastCGI' 'Zinc');
         group: 'Development' with: #('Seaside-GemStone-Basic-Development');

repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinerest..st

@@ -38,14 +38,28 @@ baselinerest: spec
 				spec includes: #('Seaside-Pharo-Swagger-Core' 'Seaside-Squeak-Swagger-Core') ]
 	].
 
-	spec for: #pharo do:[
-		spec
-			package: 'Seaside-Pharo20-REST-Core';
-			package: 'Seaside-REST-Core' with:[
-				spec includes: #('Seaside-Pharo20-REST-Core')];
-			package: 'Seaside-Pharo-Swagger-Core';
-			package: 'Seaside-Swagger-Core' with: [ 
-				spec includes: #('Seaside-Pharo-Swagger-Core') ]
+	spec 
+		for: #(#'pharo4.x' #'pharo5.x' #'pharo6.x' #'pharo7.x' #'pharo8.x') 
+		do:[
+			spec
+				package: 'Seaside-Pharo20-REST-Core';
+				package: 'Seaside-REST-Core' with:[
+					spec includes: #('Seaside-Pharo20-REST-Core')];
+				package: 'Seaside-Pharo-Swagger-Core';
+				package: 'Seaside-Swagger-Core' with: [ 
+					spec includes: #('Seaside-Pharo-Swagger-Core') ]
+	].
+
+	spec 
+		for: #(#'pharo9.x') 
+		do:[
+			spec
+				package: 'Seaside-Pharo90-REST-Core';
+				package: 'Seaside-REST-Core' with:[
+					spec includes: #('Seaside-Pharo90-REST-Core')];
+				package: 'Seaside-Pharo-Swagger-Core';
+				package: 'Seaside-Swagger-Core' with: [ 
+					spec includes: #('Seaside-Pharo-Swagger-Core') ]
 	].
 
 	spec for: #gemstone do:[

repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/properties.json

@@ -1,14 +1,11 @@
 {
-	"category" : "BaselineOfSeaside3",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "BaselineOfSeaside3",
-	"pools" : [
-		 ],
 	"super" : "BaselineOf",
-	"type" : "normal" }
+	"category" : "BaselineOfSeaside3",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "BaselineOfSeaside3",
+	"type" : "normal"
+}

repository/BaselineOfSeaside3.package/monticello.meta/categories.st

@@ -1 +1 @@
-SystemOrganization addCategory: #'BaselineOfSeaside3'!
+SystemOrganization addCategory: #BaselineOfSeaside3!

repository/BaselineOfSeaside3.package/properties.json

@@ -1,2 +1 @@
-{
-	 }
+{ }

repository/JQuery-UI.package/JQAutocomplete.class/instance/sourceCallback..st

@@ -7,7 +7,7 @@ sourceCallback: aOneArgumentBlock
 	http://code.google.com/p/glassdb/issues/detail?id=152"
 	term := WAValueHolder new.
 	self source: ((self jQuery getJson
-		text: [ :stream | stream json: (aOneArgumentBlock value: term contents) ];
+		json: [ :stream | stream value: (aOneArgumentBlock value: term contents) ];
 		callback: [ :value | term contents: value ] value: (JSStream on: 'request.term');
 		onSuccess: 'response(arguments[0])'; 
 		dataType: 'jsonp') asFunction: #('request' 'response'))

repository/Seaside-Core.package/GRPlatform.extension/instance/seasideVersion.st

@@ -2,5 +2,5 @@
 seasideVersion
 	"Answer the Seaside version"
 
-	^ (GRVersion major: 3 minor: 4 revision: 3)
+	^ (GRVersion major: 3 minor: 4 revision: 4)
 		yourself

repository/Seaside-Core.package/WAUrl.class/instance/withoutSeasideQueryFields.st

@@ -0,0 +1,10 @@
+copying
+withoutSeasideQueryFields
+
+	"Returns a copy of receiver without Seaside query fields (which are prefixed with `_`)"
+
+	| newUrl |
+	newUrl := self copy.
+	(self queryFields keys select: [ :f | self isSeasideField: f ]) 
+		do: [ :f | newUrl queryFields removeKey: f ifAbsent: [  ] ].
+	^ newUrl

repository/Seaside-GemStone-REST-Core.package/GRGemStonePlatform.extension/instance/selectorOfPragma..st

@@ -0,0 +1,3 @@
+*seaside-gemstone-REST-core
+selectorOfPragma: aPragma
+  ^ aPragma keyword

repository/Seaside-GemStone-REST-Core.package/GRGemStonePlatform.extension/methodProperties.json

@@ -0,0 +1,8 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"argumentNamesOf:" : "topa 04/07/2011 13:32:08",
+		"methodsWithHttpPragmaIn:do:" : "topa 04/07/2011 13:32:08",
+		"mimeTypeMatchesAt:in:" : "topa 04/07/2011 13:32:08",
+		"selectorOfPragma:" : "JohanBrichau 12/20/2020 04:55" } }

repository/Seaside-GemStone-REST-Core.package/monticello.meta/version

@@ -1 +1 @@
-(name 'Seaside-GemStone-REST-Core-topa.2' message 'React to changes in Seaside-REST' id 'c9d32065-78bc-4bc0-ae52-98020aae112c' date '04/07/2011' time '13:32:08' author 'topa' ancestors ((name 'Seaside-GemStone-REST-Core-DaleHenrichs.1' message '- initial version' id 'a18df6d1-02e8-480d-b7fd-31f1c368b546' date '08/24/2010' time '14:01:38' author 'DaleHenrichs' ancestors () stepChildren ())) stepChildren ())
+(name 'Seaside-GemStone-REST-Core-JohanBrichau.3' message 'implement selectorOfPragma in GemStone' id '1cf14264-39d2-4f76-8b6f-8c5557253c18' date '12/20/2020' time '04:56:18' author 'JohanBrichau' ancestors ((name 'Seaside-GemStone-REST-Core-topa.2' message 'React to changes in Seaside-REST' id 'c9d32065-78bc-4bc0-ae52-98020aae112c' date '04/07/2011' time '13:32:08' author 'topa' ancestors ((name 'Seaside-GemStone-REST-Core-DaleHenrichs.1' message '- initial version' id 'a18df6d1-02e8-480d-b7fd-31f1c368b546' date '08/24/2010' time '14:01:38' author 'DaleHenrichs' ancestors () stepChildren ())) stepChildren ())) stepChildren ())

repository/Seaside-Pharo-Tools-Spec2.package/WAPharoControlPanel.class/class/buildToolbarFor..st

@@ -1,6 +1,7 @@
 commands
 buildToolbarFor: presenter
 	^ (CmCommandGroup named: 'Toolbar') asSpecGroup
+		register: (WAAddAdaptorCommand forSpecContext: presenter);
 		register: (WAStartAdaptorCommand forSpecContext: presenter);
 		register: (WAStopAdaptorCommand forSpecContext: presenter);
 		register: (WAInspectAdaptorCommand forSpecContext: presenter);

repository/Seaside-Pharo-Tools-Spec2.package/WAPharoControlPanel.class/instance/initializePresenter.st

@@ -1,5 +1,8 @@
 initialization
 initializePresenter
-	adaptors transmitTo: infos transform: [ :adaptor | adaptor controlPanelInfos ].
+
+	adaptors 
+		transmitTo: infos 
+		transform: [ :adaptor | adaptor ifNil: [ '' ] ifNotNil: [ :a | a controlPanelInfos ] ].
 
 	self updateAdaptorsTable

repository/Seaside-Pharo20-REST-Core.package/.filetree

@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}

repository/Seaside-Pharo20-REST-Core.package/GRPackage.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "GRPackage" }
+	"name" : "GRPackage"
+}

repository/Seaside-Pharo20-REST-Core.package/GRPharoPlatform.extension/instance/selectorOfPragma..st

@@ -0,0 +1,3 @@
+*Seaside-Pharo20-REST-Core
+selectorOfPragma: aPragma
+	^ aPragma keyword

repository/Seaside-Pharo20-REST-Core.package/GRPharoPlatform.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "GRPharoPlatform" }
+	"name" : "GRPharoPlatform"
+}

repository/Seaside-Pharo20-REST-Core.package/properties.json

@@ -1,2 +1 @@
-{
-	 }
+{ }

repository/Seaside-Pharo90-REST-Core.package/.filetree

@@ -0,0 +1,5 @@
+{
+	"separateMethodMetaAndSource" : false,
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}

repository/Seaside-Pharo90-REST-Core.package/GRPackage.extension/class/seasidePharoRestCore.st

@@ -0,0 +1,8 @@
+*Seaside-Pharo90-REST-Core
+seasidePharoRestCore
+	^ self new
+		name: 'Seaside-Pharo90-REST-Core';
+		description: 'Write RESTful web services using Seaside';
+		addDependency: 'Seaside-REST-Core';
+		url: #seasideUrl;
+		yourself

repository/Seaside-Pharo90-REST-Core.package/GRPackage.extension/properties.json

@@ -0,0 +1,3 @@
+{
+	"name" : "GRPackage"
+}

repository/Seaside-Pharo90-REST-Core.package/GRPharoPlatform.extension/instance/argumentNamesOf..st

@@ -0,0 +1,3 @@
+*Seaside-Pharo90-REST-Core
+argumentNamesOf: aCompiledMethod
+	^ aCompiledMethod argumentNames

repository/Seaside-Pharo90-REST-Core.package/GRPharoPlatform.extension/instance/selectorOfPragma..st

@@ -0,0 +1,3 @@
+*Seaside-Pharo90-REST-Core
+selectorOfPragma: aPragma
+	^ aPragma selector

repository/Seaside-Pharo90-REST-Core.package/GRPharoPlatform.extension/properties.json

@@ -0,0 +1,3 @@
+{
+	"name" : "GRPharoPlatform"
+}

repository/Seaside-Pharo90-REST-Core.package/monticello.meta/categories.st

@@ -0,0 +1 @@
+SystemOrganization addCategory: #'Seaside-Pharo90-REST-Core'!

repository/Seaside-Pharo90-REST-Core.package/monticello.meta/package

@@ -0,0 +1 @@
+(name 'Seaside-Pharo90-REST-Core')

repository/Seaside-Pharo90-REST-Core.package/properties.json

@@ -0,0 +1 @@
+{ }

repository/Seaside-REST-Core.package/GRPlatform.extension/instance/selectorOfPragma..st

@@ -0,0 +1,3 @@
+*Seaside-REST-Core
+selectorOfPragma: aPragma
+	^ self subclassResponsibility