Skip to content

Commit 38401ed

Browse files
mtabacmanmtabacman
authored
Merge pull request #16 from ba-st/update-launchpad-hyperspace
Update launchpad hyperspace
2 parents fb81d3d + 4800c05 commit 38401ed

File tree

13 files changed

+106
-101
lines changed

13 files changed

+106
-101
lines changed

‎.github/workflows/loading-groups.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
11+
smalltalk: [ Pharo64-12, Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
1212
load-spec: [ demo, deployment, dependent-sunit-extensions, tests, tools, development ]
1313
name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }}
1414
steps:

‎.github/workflows/unit-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
10+
smalltalk: [ Pharo64-12, Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
1111
name: ${{ matrix.smalltalk }}
1212
steps:
1313
- uses: actions/checkout@v3

‎.project‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{
2-
'srcDirectory' : 'source'
2+
'srcDirectory' : 'source',
3+
'tags': [ 'Buenos Aires Smalltalk' ]
4+
35
}

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Integration between [Willow](https://github.com/ba-st/Willow/) and
1515
[![Pharo 9.0](https://img.shields.io/badge/Pharo-9.0-informational)](https://pharo.org)
1616
[![Pharo 10](https://img.shields.io/badge/Pharo-10-informational)](https://pharo.org)
1717
[![Pharo 11](https://img.shields.io/badge/Pharo-11-informational)](https://pharo.org)
18+
[![Pharo 12](https://img.shields.io/badge/Pharo-12-informational)](https://pharo.org)
1819

1920
## Quick links
2021

‎docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN pharo metacello install gitlocal://./source \
77
BaselineOfWillowAuth0 --groups=Demo
88

99
# Stage 2: Copy the Pharo image into the base
10-
FROM ghcr.io/ba-st/launchpad:v4
10+
FROM ghcr.io/ba-st/launchpad:v7
1111

1212
COPY --from=loader /opt/pharo/Pharo.image ./
1313
COPY --from=loader /opt/pharo/Pharo*.sources ./

‎source/BaselineOfWillowAuth0/BaselineOfWillowAuth0.class.st‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
Metacello Baseline definition for Willow-Auth0
33
"
44
Class {
5-
#name : #BaselineOfWillowAuth0,
6-
#superclass : #BaselineOf,
7-
#category : #BaselineOfWillowAuth0
5+
#name : 'BaselineOfWillowAuth0',
6+
#superclass : 'BaselineOf',
7+
#category : 'BaselineOfWillowAuth0',
8+
#package : 'BaselineOfWillowAuth0'
89
}
910

10-
{ #category : #baselines }
11+
{ #category : 'baselines' }
1112
BaselineOfWillowAuth0 >> baseline: spec [
1213

1314
<baseline>
@@ -23,13 +24,13 @@ BaselineOfWillowAuth0 >> baseline: spec [
2324
]
2425
]
2526

26-
{ #category : #accessing }
27+
{ #category : 'accessing' }
2728
BaselineOfWillowAuth0 >> projectClass [
2829

2930
^ MetacelloCypressBaselineProject
3031
]
3132

32-
{ #category : #initialization }
33+
{ #category : 'initialization' }
3334
BaselineOfWillowAuth0 >> setUpDependencies: spec [
3435

3536
spec
@@ -39,21 +40,21 @@ BaselineOfWillowAuth0 >> setUpDependencies: spec [
3940
project: 'Willow-Tools' copyFrom: 'Willow' with: [ spec loads: 'Tools' ].
4041

4142
spec
42-
baseline: 'JSONWebToken' with: [ spec repository: 'github://noha/JSONWebToken:0.3/source' ];
43+
baseline: 'JSONWebToken' with: [ spec repository: 'github://ba-st-dependencies/JSONWebToken:v3' ];
4344
project: 'JSONWebToken-Deployment' copyFrom: 'JSONWebToken' with: [ spec loads: 'Core' ].
4445

4546
spec
46-
baseline: 'Launchpad' with: [ spec repository: 'github://ba-st/Launchpad:v4' ];
47+
baseline: 'Launchpad' with: [ spec repository: 'github://ba-st/Launchpad:v7' ];
4748
project: 'Launchpad-Deployment' copyFrom: 'Launchpad' with: [ spec loads: 'Deployment' ].
4849

4950
spec
50-
baseline: 'Hyperspace' with: [ spec repository: 'github://ba-st/Hyperspace:v4' ];
51+
baseline: 'Hyperspace' with: [ spec repository: 'github://ba-st/Hyperspace:v7' ];
5152
project: 'Hyperspace-SUnit'
5253
copyFrom: 'Hyperspace'
5354
with: [ spec loads: 'Dependent-SUnit-Extensions' ]
5455
]
5556

56-
{ #category : #initialization }
57+
{ #category : 'initialization' }
5758
BaselineOfWillowAuth0 >> setUpPackages: spec [
5859

5960
spec

‎source/BaselineOfWillowAuth0/package.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Package { #name : #BaselineOfWillowAuth0 }
1+
Package { #name : 'BaselineOfWillowAuth0' }

‎source/Willow-Auth0-Demo-Tests/WillowAuth0Demo.extension.st‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Extension { #name : #WillowAuth0Demo }
1+
Extension { #name : 'WillowAuth0Demo' }
22

3-
{ #category : #'*Willow-Auth0-Demo-Tests' }
3+
{ #category : '*Willow-Auth0-Demo-Tests' }
44
WillowAuth0Demo class >> start [
55

66
<ignoreForCoverage>
@@ -10,7 +10,7 @@ WillowAuth0Demo class >> start [
1010
start
1111
]
1212

13-
{ #category : #'*Willow-Auth0-Demo-Tests' }
13+
{ #category : '*Willow-Auth0-Demo-Tests' }
1414
WillowAuth0Demo class >> stop [
1515

1616
<ignoreForCoverage>

‎source/Willow-Auth0-Demo-Tests/WillowAuth0DemoApplicationTest.class.st‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,55 @@
22
A WillowAuth0DemoApplicationTest is a test class for testing the behavior of WillowAuth0DemoApplication
33
"
44
Class {
5-
#name : #WillowAuth0DemoApplicationTest,
6-
#superclass : #TestCase,
5+
#name : 'WillowAuth0DemoApplicationTest',
6+
#superclass : 'TestCase',
77
#instVars : [
88
'application',
99
'port'
1010
],
11-
#category : #'Willow-Auth0-Demo-Tests'
11+
#category : 'Willow-Auth0-Demo-Tests',
12+
#package : 'Willow-Auth0-Demo-Tests'
1213
}
1314

14-
{ #category : #running }
15+
{ #category : 'running' }
1516
WillowAuth0DemoApplicationTest >> runCase [
1617

1718
self shouldnt: [ super runCase ] raise: Exit
1819
]
1920

20-
{ #category : #running }
21+
{ #category : 'running' }
2122
WillowAuth0DemoApplicationTest >> setUp [
2223

2324
super setUp.
2425
port := self freeListeningTCPPort
2526
]
2627

27-
{ #category : #running }
28+
{ #category : 'running' }
2829
WillowAuth0DemoApplicationTest >> start: aLaunchpadApplication withAll: arguments [
2930

30-
String streamContents: [ :stream |
31-
| context rootCommand |
32-
33-
rootCommand := LaunchpadRootCommand new.
34-
context := LaunchpadCommandLineProcessingContext
35-
handling: ( CommandLineArguments withArguments: {
36-
'launchpad'.
37-
'start'.
38-
'--debug-mode'.
39-
aLaunchpadApplication commandName } , arguments )
40-
writingTo: stream.
41-
self assert: ( rootCommand canHandle: ( context nextCommandLineArgumentIfNone: [ self fail ] ) ).
42-
rootCommand evaluateWithin: context.
43-
application := LaunchpadApplication currentlyRunning
31+
String streamContents: [ :stream |
32+
| context rootCommand |
33+
34+
rootCommand := LaunchpadRootCommand new.
35+
context := LaunchpadApplicationStartingContext
36+
handling: ( CommandLineArguments withArguments:
37+
{ 'launchpad' . 'start' . '--debug-mode' . aLaunchpadApplication commandName }
38+
, arguments )
39+
writingTo: stream.
40+
self assert: ( rootCommand canHandle: ( context nextCommandLineArgumentIfNone: [ self fail ] ) ).
41+
rootCommand evaluateWithin: context.
42+
application := LaunchpadApplication currentlyRunning
4443
]
4544
]
4645

47-
{ #category : #running }
46+
{ #category : 'running' }
4847
WillowAuth0DemoApplicationTest >> tearDown [
4948

5049
application ifNotNil: #stop.
5150
super tearDown
5251
]
5352

54-
{ #category : #running }
53+
{ #category : 'running' }
5554
WillowAuth0DemoApplicationTest >> testActivationWithAllArguments [
5655

5756
self
@@ -77,7 +76,7 @@ WillowAuth0DemoApplicationTest >> testActivationWithAllArguments [
7776
do: [ :error | application stackTraceDumper dumpStackTraceFor: error ]
7877
]
7978

80-
{ #category : #tests }
79+
{ #category : 'tests' }
8180
WillowAuth0DemoApplicationTest >> testPrintHelpOn [
8281

8382
| help |

‎source/Willow-Auth0-Demo-Tests/WillowAuth0DemoTest.class.st‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
A WillowAuth0DemoTest is a test class for testing the behavior of WillowAuth0Demo
33
"
44
Class {
5-
#name : #WillowAuth0DemoTest,
6-
#superclass : #BWRenderingTest,
5+
#name : 'WillowAuth0DemoTest',
6+
#superclass : 'BWRenderingTest',
77
#instVars : [
88
'session'
99
],
10-
#category : #'Willow-Auth0-Demo-Tests'
10+
#category : 'Willow-Auth0-Demo-Tests',
11+
#package : 'Willow-Auth0-Demo-Tests'
1112
}
1213

13-
{ #category : #running }
14+
{ #category : 'running' }
1415
WillowAuth0DemoTest >> configuration [
1516

1617
^ NeoJSONObject new
@@ -24,7 +25,7 @@ WillowAuth0DemoTest >> configuration [
2425
yourself
2526
]
2627

27-
{ #category : #running }
28+
{ #category : 'running' }
2829
WillowAuth0DemoTest >> createHandlers [
2930

3031
| registry |
@@ -43,19 +44,19 @@ WillowAuth0DemoTest >> createHandlers [
4344
^ Array with: registry with: session
4445
]
4546

46-
{ #category : #running }
47+
{ #category : 'running' }
4748
WillowAuth0DemoTest >> performTest [
4849

4950
CurrentApplicationConfiguration value: self configuration during: [ super performTest ]
5051
]
5152

52-
{ #category : #tests }
53+
{ #category : 'tests' }
5354
WillowAuth0DemoTest >> testApplicationTitle [
5455

5556
self assert: WillowAuth0Demo applicationTitle equals: 'Willow Auth0 - Demo Application'
5657
]
5758

58-
{ #category : #tests }
59+
{ #category : 'tests' }
5960
WillowAuth0DemoTest >> testInitialRequest [
6061

6162
| response |
@@ -65,21 +66,21 @@ WillowAuth0DemoTest >> testInitialRequest [
6566
self assert: response status equals: 403
6667
]
6768

68-
{ #category : #tests }
69+
{ #category : 'tests' }
6970
WillowAuth0DemoTest >> testJQueryLibrary [
7071

7172
self assert: ( WillowAuth0Demo new jQueryLibrary isA: JQuery3OnlineLibrary )
7273
]
7374

74-
{ #category : #tests }
75+
{ #category : 'tests' }
7576
WillowAuth0DemoTest >> testJsonWebTokenSignatureAlgorithm [
7677

7778
self
7879
assert: WillowAuth0Demo jsonWebTokenSignatureAlgorithm
7980
equals: ( JsonWebAlgorithm named: 'HS256' )
8081
]
8182

82-
{ #category : #tests }
83+
{ #category : 'tests' }
8384
WillowAuth0DemoTest >> testLogoutFromAuth0 [
8485

8586
| response redirectLocation |
@@ -102,7 +103,7 @@ WillowAuth0DemoTest >> testLogoutFromAuth0 [
102103
assert: ( redirectLocation queryFields at: 'returnTo' ) equals: WillowAuth0Demo logoutReturnUrl
103104
]
104105

105-
{ #category : #tests }
106+
{ #category : 'tests' }
106107
WillowAuth0DemoTest >> testMaterializeAndCheckSignatureOfJsonWebToken [
107108

108109
| token |
@@ -113,23 +114,23 @@ WillowAuth0DemoTest >> testMaterializeAndCheckSignatureOfJsonWebToken [
113114
( JWTClaimsSet new
114115
sub: 'auth0|123456789';
115116
yourself );
116-
key: 'secret';
117+
privateKey: 'secret';
117118
compactSerialized.
118119

119120
self
120121
assert: ( WillowAuth0Demo materializeAndCheckSignatureOfJsonWebToken: token ) payload subject
121122
equals: 'auth0|123456789'
122123
]
123124

124-
{ #category : #tests }
125+
{ #category : 'tests' }
125126
WillowAuth0DemoTest >> testMaterializeAndCheckSignatureOfJsonWebTokenWithInvalidKey [
126127

127128
| token |
128129

129130
token := JsonWebSignature new
130131
algorithmName: 'HS256';
131132
payload: JWTClaimsSet new;
132-
key: 'fake-secret';
133+
privateKey: 'fake-secret';
133134
compactSerialized.
134135

135136
self
@@ -138,7 +139,7 @@ WillowAuth0DemoTest >> testMaterializeAndCheckSignatureOfJsonWebTokenWithInvalid
138139
withMessageText: 'signature does not match'
139140
]
140141

141-
{ #category : #tests }
142+
{ #category : 'tests' }
142143
WillowAuth0DemoTest >> testRegistration [
143144

144145
self should: [ WADispatcher default handlerAt: WillowAuth0Demo handlerName ] raise: WAError.
@@ -149,7 +150,7 @@ WillowAuth0DemoTest >> testRegistration [
149150
ensure: [ WillowAuth0Demo unregisterFromApplications ]
150151
]
151152

152-
{ #category : #tests }
153+
{ #category : 'tests' }
153154
WillowAuth0DemoTest >> testRenderContentOn [
154155

155156
| application html |

0 commit comments

Comments
 (0)