Merge pull request #447 from edeandrea/clear-narration-new-fighters

Clear narration when requesting new fighters
quarkusio · Dec 8, 2023 · 3180659 · 3180659
2 parents c51724c + ff31c69
commit 3180659
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...-workshop-super-heroes/super-heroes/ui-super-heroes/src/main/webui/src/app/fight/Fight.js b/...-workshop-super-heroes/super-heroes/ui-super-heroes/src/main/webui/src/app/fight/Fight.js
@@ -13,13 +13,21 @@ function Fight({onFight}) {
 
 
   const newFighters = () => {
-    getRandomFighters().then(answer => setFighters(answer))
+    getRandomFighters().then(answer => {
+      setFighters(answer)
+      clearPreviousFight()
+    })
   }
 
   const narrate = () => {
     narrateFight(fightResult).then(answer => setNarration(answer))
   }
 
+  const clearPreviousFight = () => {
+    setNarration(undefined)
+    setFightResult(undefined)
+  }
+
   const fight = () => {
     startFight(fighters).then(response => {
       setFightResult(response)

diff --git a/...shop-super-heroes/super-heroes/ui-super-heroes/src/main/webui/src/app/fight/Fight.test.js b/...shop-super-heroes/super-heroes/ui-super-heroes/src/main/webui/src/app/fight/Fight.test.js
@@ -79,6 +79,7 @@ describe("the fight visualisation", () => {
       })
       expect(screen.getByText("Fake hero")).toBeInTheDocument()
       expect(screen.getByText("Fake villain")).toBeInTheDocument()
+      expect(screen.queryByText(/NARRATE THE FIGHT/i)).not.toBeInTheDocument()
     })
 
     it("renders a fight button", async () => {
@@ -103,6 +104,7 @@ describe("the fight visualisation", () => {
       expect(screen.getByText(/Winner is/i)).toBeInTheDocument()
       // The winner name is in a span by itself but there should be more occurrences of the name count
       expect(screen.getAllByText("Fake villain")).toHaveLength(nameCount + 1)
+      expect(screen.queryByText(/NARRATE THE FIGHT/i)).toBeInTheDocument()
     })
 
     it("renders narration when the narrate button is clicked", async () => {