Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
4.0.2 -> 4.0.6 Jakarta Faces
4.0.0 -> 4.0.2 Apache MyFaces
3.1.0 -> 3.1.1 Jakarta Servlet JSP

Closes gh-1817, gh 1818
  • Loading branch information
rstoyanchev committed Nov 1, 2024
1 parent 9352f0e commit 85565a0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ allprojects {
dependencies {
dependency "jakarta.servlet:jakarta.servlet-api:6.0.0"
dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0"
dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.0"
dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.1"
dependency "jakarta.el:jakarta.el-api:5.0.1"

dependency "org.glassfish:jakarta.faces:4.0.2"
dependency "org.apache.myfaces.core:myfaces-impl:4.0.0"
dependency "org.apache.myfaces.core:myfaces-test:4.0.0"
dependency "org.glassfish:jakarta.faces:4.0.6"
dependency "org.apache.myfaces.core:myfaces-impl:4.0.2"
dependency "org.apache.myfaces.core:myfaces-test:4.0.2"
dependency "jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1"

dependency "jakarta.validation:jakarta.validation-api:3.0.2"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.springframework.faces.webflow;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import org.springframework.web.context.support.StaticWebApplicationContext;

import static org.junit.jupiter.api.Assertions.assertEquals;

public class JsfAjaxHandlerTests {

private final JSFMockHelper jsfMock = new JSFMockHelper();
Expand All @@ -30,7 +30,11 @@ public void tearDown() throws Exception {
@Test
public void testSendAjaxRedirect() throws Exception {
this.ajaxHandler.sendAjaxRedirectInternal("/target", this.jsfMock.request(), this.jsfMock.response(), false);
assertTrue(this.jsfMock.contentAsString().matches("<\\?xml version='1.0' encoding='utf-8'\\?>\n<partial-response.*><redirect url=\"/target\"/></partial-response>"));

assertEquals(this.jsfMock.contentAsString(), """
<?xml version='1.0' encoding='UTF-8'?>
<partial-response><redirect url="/target"/></partial-response>""");

assertEquals("application/xml", this.jsfMock.response().getContentType());
}

Expand Down

0 comments on commit 85565a0

Please sign in to comment.