consolidation has to happen before card status gets updated in TurnCo…

…ntroller
MatagTheGame · May 9, 2020 · 7b85bab · 7b85bab
1 parent ee44573
commit 7b85bab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/matag/game/turn/TurnController.java b/src/main/java/com/matag/game/turn/TurnController.java
@@ -58,9 +58,9 @@ public void turn(SimpMessageHeaderAccessor headerAccessor, TurnRequest request)
       turnService.declareBlockers(gameStatus, toMapListInteger(request.getTargetsIdsForCardIds()));
     }
 
-    consolidateStatusService.consolidate(gameStatus);
     attachmentsService.updateGameStatus(gameStatus);
     abilitiesFromOtherPermanentsService.updateGameStatus(gameStatus);
+    consolidateStatusService.consolidate(gameStatus);
     gameStatusUpdaterService.sendUpdateGameStatus(gameStatus);
   }
 

diff --git a/src/test/java/application/browser/MatagBrowser.java b/src/test/java/application/browser/MatagBrowser.java
@@ -141,7 +141,7 @@ WebElement findElement(By element) {
   }
 
   void wait(ExpectedCondition<?> condition) {
-    new WebDriverWait(webDriver, 5).until(condition);
+    new WebDriverWait(webDriver, 10).until(condition);
   }
 
   public void dumpContent() {