From 86f21b4709be9042d8df5272e122e71c86099e00 Mon Sep 17 00:00:00 2001
From: Marcelo Shima <marceloshima@gmail.com>
Date: Sun, 20 Feb 2022 20:25:17 -0300
Subject: [PATCH] Fix UserStepDefs cocumber test

---
 .../cucumber/stepdefs/StepDefs.java.ejs       |  8 ++++++++
 .../cucumber/stepdefs/UserStepDefs.java.ejs   | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs b/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs
index 161e1ea32108..99b8e2337e4a 100644
--- a/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs
+++ b/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs
@@ -18,10 +18,18 @@
 -%>
 package <%= packageName %>.cucumber.stepdefs;
 
+<%_ if (reactive) { _%>
+import org.springframework.test.web.reactive.server.WebTestClient;
+<%_ } else { _%>
 import org.springframework.test.web.servlet.ResultActions;
+<%_ } _%>
 
 public abstract class StepDefs {
 
+<%_ if (reactive) { _%>
+    protected WebTestClient.ResponseSpec actions;
+<%_ } else { _%>
     protected ResultActions actions;
+<%_ } _%>
 
 }
diff --git a/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs b/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs
index 77427e1184f4..9b6f90222250 100644
--- a/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs
+++ b/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs
@@ -72,29 +72,42 @@ public class UserStepDefs extends StepDefs {
         SecurityContext context = SecurityContextHolder.createEmptyContext();
         context.setAuthentication(authentication);
         SecurityContextHolder.setContext(context);
+<%_ if (reactive) { _%>
+        this.userResourceMock = WebTestClient.bindToController(userResource).build();
+<%_ } else { _%>
         this.userResourceMock = MockMvcBuilders.standaloneSetup(userResource).build();
+<%_ } _%>
     }
 
     @When("I search user {string}")
     public void i_search_user(String userId) throws Throwable {
 <%_ if (reactive) { _%>
-        actions = userResourceMock.get().uri("/api/admin/users/" + userId)
+        actions = userResourceMock.get().uri("/api/admin/users/" + userId).accept(MediaType.APPLICATION_JSON).exchange();
 <%_ } else { _%>
-        actions = userResourceMock.perform(get("/api/admin/users/" + userId)
+        actions = userResourceMock.perform(get("/api/admin/users/" + userId).accept(MediaType.APPLICATION_JSON));
 <%_ } _%>
-                    .accept(MediaType.APPLICATION_JSON)<% if (!reactive) { %>)<%_ } _%>;
     }
 
     @Then("the user is found")
     public void the_user_is_found() throws Throwable {
+<%_ if (reactive) { _%>
+        actions
+            .expectStatus().isOk()
+            .expectHeader().contentTypeCompatibleWith(MediaType.APPLICATION_JSON_VALUE);
+<%_ } else { _%>
         actions
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE));
+<%_ } _%>
     }
 
     @Then("his last name is {string}")
     public void his_last_name_is(String lastName) throws Throwable {
+<%_ if (reactive) { _%>
+        actions.expectBody().jsonPath("$.lastName").value(lastName);
+<%_ } else { _%>
         actions.andExpect(jsonPath("$.lastName").value(lastName));
+<%_ } _%>
     }
 
 }