Merge pull request #168 from ba-st/pharo-11

Add Pharo 11
ba-st · May 23, 2023 · d5260c0 · d5260c0
2 parents 54a5b1f + b216fb6
commit d5260c0
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 40 deletions.
diff --git a/.github/workflows/loading-groups.yml b/.github/workflows/loading-groups.yml
@@ -8,11 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
+        smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
         load-spec: [ deployment, dependent-sunit-extensions, tests, development, tools, examples, core, healthcheck, metrics, metrics-http, json-rpc, app-control, app-info, app-config, loggers ]
     name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}

diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml
@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: markdownlint
-        uses: reviewdog/action-markdownlint@v0.1
+        uses: reviewdog/action-markdownlint@v0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           fail_on_error: true

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -8,10 +8,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
+        smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
     name: ${{ matrix.smalltalk }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}
@@ -21,7 +21,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         timeout-minutes: 15
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
-          name: ${{matrix.os}}-${{matrix.smalltalk}}
+          name: Unit-Tests-${{matrix.smalltalk}}
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.smalltalkci/.loading.development.ston b/.smalltalkci/.loading.development.ston
@@ -6,11 +6,5 @@ SmalltalkCISpec {
       #load : [ 'Development' ],
       #platforms : [  #pharo ]
     }
-  ],
-  #testing : {
-    #coverage : {
-      #packages : [ 'Stargate*' ],
-      #format: #lcov
-    }
-  }
+  ]
 }
diff --git a/.smalltalkci/.loading.tests.ston b/.smalltalkci/.loading.tests.ston
@@ -6,11 +6,5 @@ SmalltalkCISpec {
       #load : [ 'Tests' ],
       #platforms : [  #pharo ]
     }
-  ],
-  #testing : {
-    #coverage : {
-      #packages : [ 'Stargate*' ],
-      #format: #lcov
-    }
-  }
+  ]
 }
diff --git a/.smalltalkci/.unit-tests.ston b/.smalltalkci/.unit-tests.ston
@@ -8,8 +8,23 @@ SmalltalkCISpec {
     }
   ],
   #testing : {
+    #exclude : {
+      #packages : [ 'Stargate-API-Skeleton*']
+    },
+    #include: {
+      #classes: [ #StargateApplicationTest ]
+    },
     #coverage : {
-      #packages : [ 'Stargate*' ],
+      #packages : [ 
+        'Stargate-Application*',
+        'Stargate-Examples*',
+        'Stargate-HealthCheck*',
+        'Stargate-JSON*',
+        'Stargate-Loggers*',
+        'Stargate-Metrics*',
+        'Stargate-Model*',
+        'Stargate-SUnit-Model*' ],
+      #classes: [ #StargateApplicationTest ],
       #format: #lcov
     }
   }

diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ Stargate is a library supporting the creation of HTTP based RESTful APIs.
 [![Pharo 8.0](https://img.shields.io/badge/Pharo-8.0-informational)](https://pharo.org)
 [![Pharo 9.0](https://img.shields.io/badge/Pharo-9.0-informational)](https://pharo.org)
 [![Pharo 10](https://img.shields.io/badge/Pharo-10-informational)](https://pharo.org)
+[![Pharo 11](https://img.shields.io/badge/Pharo-11-informational)](https://pharo.org)
 
 Quick links
 

diff --git a/source/BaselineOfStargate/BaselineOfStargate.class.st b/source/BaselineOfStargate/BaselineOfStargate.class.st
@@ -44,7 +44,7 @@ BaselineOfStargate >> setUpDependencies: spec [
 		with: [ spec loads: 'Dependent-SUnit-Extensions' ].
 
 	spec
-		baseline: 'Teapot' with: [ spec repository: 'github://zeroflag/Teapot:v2.6.0/source' ];
+		baseline: 'Teapot' with: [ spec repository: 'github://zeroflag/Teapot:v2.7.0/source' ];
 		project: 'Teapot-Deployment' copyFrom: 'Teapot' with: [ spec loads: 'Deployment' ].
 
 	spec

diff --git a/source/Stargate-API-Skeleton-Tests/StargateApplicationStackTraceDumperTest.class.st b/source/Stargate-API-Skeleton-Tests/StargateApplicationStackTraceDumperTest.class.st
@@ -0,0 +1,33 @@
+Class {
+	#name : #StargateApplicationStackTraceDumperTest,
+	#superclass : #TestCase,
+	#category : #'Stargate-API-Skeleton-Tests'
+}
+
+{ #category : #accessing }
+StargateApplicationStackTraceDumperTest class >> defaultTimeLimit [
+
+	^5 minute
+]
+
+{ #category : #running }
+StargateApplicationStackTraceDumperTest >> setUp [
+
+	super setUp.
+	StargateApplication logsDirectory ensureCreateDirectory
+]
+
+{ #category : #'tests - application' }
+StargateApplicationStackTraceDumperTest >> testStackTraceDumper [
+
+	| dumper result |
+
+	dumper := PetStoreApplication new stackTraceDumper.
+
+	result := [ 1 / 0 ] on: ZeroDivide
+		          do: [ :zeroDivide | 
+			          dumper dumpStackTraceFor: zeroDivide.
+			          zeroDivide return: 5
+			          ].
+	self assert: result equals: 5
+]
diff --git a/source/Stargate-API-Skeleton-Tests/StargateApplicationTest.class.st b/source/Stargate-API-Skeleton-Tests/StargateApplicationTest.class.st
@@ -5,7 +5,6 @@ Class {
 	#name : #StargateApplicationTest,
 	#superclass : #TestCase,
 	#instVars : [
-		'logger',
 		'application',
 		'port',
 		'baseUrl'
@@ -62,7 +61,6 @@ StargateApplicationTest >> secret [
 StargateApplicationTest >> setUp [
 
 	super setUp.
-	logger := MemoryLogger new.
 	port := self freeListeningTCPPort.
 	StargateApplication logsDirectory ensureCreateDirectory
 ]
@@ -306,21 +304,6 @@ ENVIRONMENT
 ' expandMacrosWith: PetStoreApplication version)
 ]
 
-{ #category : #'tests - application' }
-StargateApplicationTest >> testStackTraceDumper [
-
-	| dumper result |
-
-	dumper := PetStoreApplication new stackTraceDumper.
-
-	result := [ 1 / 0 ] on: ZeroDivide
-		          do: [ :zeroDivide | 
-			          dumper dumpStackTraceFor: zeroDivide.
-			          zeroDivide return: 5
-			          ].
-	self assert: result equals: 5
-]
-
 { #category : #'tests - api' }
 StargateApplicationTest >> testUnsupportedMediaType [