Merge pull request #221144 from jfarcand
* gh-221144: Update Atmosphere versions used in smoke test Closes gh-221144
This commit is contained in:
@@ -7,9 +7,9 @@ description = "Spring Boot Atmosphere smoke test"
|
||||
|
||||
dependencies {
|
||||
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
|
||||
implementation("org.atmosphere:atmosphere-runtime:2.4.14")
|
||||
implementation("org.atmosphere:atmosphere-runtime:2.6.1")
|
||||
|
||||
runtimeOnly("org.webjars:atmosphere-javascript:2.3.4")
|
||||
runtimeOnly("org.webjars:atmosphere-javascript:3.0.4")
|
||||
|
||||
testImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
|
||||
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
|
||||
|
||||
@@ -44,8 +44,7 @@ $(function() {
|
||||
+ request.reconnectInterval
|
||||
}));
|
||||
subSocket
|
||||
.push(atmosphere.util
|
||||
.stringifyJSON({
|
||||
.push(JSON.stringify({
|
||||
author : author,
|
||||
message : 'is inactive and closed the connection. Will reconnect in '
|
||||
+ request.reconnectInterval
|
||||
@@ -81,7 +80,7 @@ $(function() {
|
||||
|
||||
var message = response.responseBody;
|
||||
try {
|
||||
var json = atmosphere.util.parseJSON(message);
|
||||
var json = JSON.parse(message);
|
||||
} catch (e) {
|
||||
console.log('This doesn\'t look like a valid JSON: ', message);
|
||||
return;
|
||||
@@ -105,7 +104,7 @@ $(function() {
|
||||
text : 'Server closed the connection after a timeout'
|
||||
}));
|
||||
if (subSocket) {
|
||||
subSocket.push(atmosphere.util.stringifyJSON({
|
||||
subSocket.push(JSON.stringify({
|
||||
author : author,
|
||||
message : 'disconnecting'
|
||||
}));
|
||||
@@ -140,7 +139,7 @@ $(function() {
|
||||
author = msg;
|
||||
}
|
||||
|
||||
subSocket.push(atmosphere.util.stringifyJSON({
|
||||
subSocket.push(JSON.stringify({
|
||||
author : author,
|
||||
message : msg
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user