Merge pull request 'david' (#1) from david into main

Reviewed-on: akagundu/rock-paper-scissors#1

README.md

@@ -7,8 +7,6 @@ Se rendre sur : https://grond.iut-fbleau.fr/pierront/rock-paper-scissors
 
 Faire un fork
 
-`/!\ ATTENTION NE PRENDRE QUE LA BRANCHE MAIN /!\`
-
 ## Créer la VM pour jenkins
 ### Créer la règle pare-feu pour accéder aux ports 8080 et 8081
 Aller dans la section Pare-Feu
@@ -119,7 +117,7 @@ Vous devriez voir la page d'accueil de Jenkins
 ---
 
 ## Création d'un pipeline
-* Aller sur l'accueil Jenkins -> New Item
+* Aller dans la section Manage Jenkins -> New Item
 * Nommer le projet : rock-paper-scissors
 * Choisir le type de projet : Multibranch Pipeline
 * Cliquer sur OK
@@ -128,6 +126,7 @@ Vous devriez voir la page d'accueil de Jenkins
   * utiliser le jeton gitea-token
   * owner : _<votre nom d'utilisateur gitea>_
   * Choisir le projet : rock-paper-scissors
+* Choisir le provider : Git
 * Choisir le repository : https://grond.iut-fbleau.fr/pierront/rock-paper-scissors.git
 * Cliquer sur Save
 

src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/Move.java

@@ -3,13 +3,15 @@ package fr.iut_fbleau.info.but3.automation.rock_paper_scissors.play.domain;
 public enum Move {
     ROCK,
     PAPER,
-    SCISSORS;
+    SCISSORS,
+    PUIT;
 
     public boolean beats(Move other) {
         return switch (this) {
             case ROCK -> other == SCISSORS;
-            case PAPER -> other == ROCK;
+            case PAPER -> other == ROCK || other == PUIT;
             case SCISSORS -> other == PAPER;
+            case PUIT -> other == SCISSORS || other == ROCK;
         };
     }
 }

src/main/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/web/PlayController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/play")
-@Tag(name = "Play", description = "Rock Paper Scissors game endpoints")
+@Tag(name = "Play", description = "Rock Paper Scissors Puit game endpoints")
 public class PlayController {
 
     private final RockPaperScissorsPlay rockPaperScissorsPlay;
@@ -26,7 +26,7 @@ public class PlayController {
 
     @Operation(
             summary = "Play a round",
-            description = "Play a round of Rock Paper Scissors against the CPU",
+            description = "Play a round of Rock Paper Scissors PUIT against the CPU",
             responses = {
                     @ApiResponse(
                             responseCode = "200",

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/PlayControllerTest.java

@@ -46,7 +46,9 @@ public class PlayControllerTest {
     public static Stream<Arguments> scenario() {
         return Stream.of(
                 Arguments.of(Move.ROCK, Move.SCISSORS, WIN),
-                Arguments.of(Move.ROCK, Move.PAPER, LOOSE)
+                Arguments.of(Move.ROCK, Move.PAPER, LOOSE),
+                Arguments.of(Move.ROCK, Move.PUIT, LOOSE)
+
         );
     }
 

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/domain/MoveTest.java

@@ -14,7 +14,7 @@ class MoveTest {
 
     @Test
     void should_check_move_size(){
-        Assertions.assertEquals(3, Move.values().length);
+        Assertions.assertEquals(4, Move.values().length);
     }
 
     @ParameterizedTest(name = "{0} should beat {1}")
@@ -33,7 +33,12 @@ class MoveTest {
         return Stream.of(
                 Arguments.of(Move.ROCK,Move.SCISSORS),
                 Arguments.of(Move.PAPER,Move.ROCK),
-                Arguments.of(Move.SCISSORS,Move.PAPER)
+                Arguments.of(Move.PAPER,Move.PUIT),
+                Arguments.of(Move.SCISSORS,Move.PAPER),
+                Arguments.of(Move.PUIT,Move.ROCK),
+                Arguments.of(Move.PUIT,Move.SCISSORS)
+
+
         );
     }
 }

src/test/java/fr/iut_fbleau/info/but3/automation/rock_paper_scissors/play/spi/RandomCpuPickerTest.java

@@ -20,9 +20,11 @@ class RandomCpuPickerTest {
             obtainedMoves.add(picker.pick());
         }
 
-        assertEquals(3, obtainedMoves.size());
+        assertEquals(4, obtainedMoves.size());
         assertTrue(obtainedMoves.contains(Move.ROCK));
         assertTrue(obtainedMoves.contains(Move.PAPER));
         assertTrue(obtainedMoves.contains(Move.SCISSORS));
+        assertTrue(obtainedMoves.contains(Move.PUIT));
+
     }
 }