From 7d4744115456dced77deb56c8f8ab1da6f16e8a1 Mon Sep 17 00:00:00 2001 From: Julien WITTOUCK Date: Fri, 1 Mar 2024 15:52:16 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20:=20correct=20GitLab=20group?= =?UTF-8?q?=20id=20parameter=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classrooms/ClassroomController.java | 4 ++-- .../ClassroomControllerMVCTest.java | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomController.java b/src/main/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomController.java index 00a87b4..b4f7a9c 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomController.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomController.java @@ -38,8 +38,8 @@ class ClassroomController { } @PostMapping("/new") - String newClassroom(@RequestParam String classroomName, @RequestParam(required = false) Long parentGitlabGroupId, @ModelAttribute("user") ClassroomUser teacher) throws GitLabApiException { - this.classroomService.createClassroom(classroomName, parentGitlabGroupId, teacher); + String newClassroom(@RequestParam String classroomName, @RequestParam(required = false) Long parentGitLabGroupId, @ModelAttribute("user") ClassroomUser teacher) throws GitLabApiException { + this.classroomService.createClassroom(classroomName, parentGitLabGroupId, teacher); return "redirect:/"; } diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomControllerMVCTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomControllerMVCTest.java index 8280423..bea48bd 100644 --- a/src/test/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomControllerMVCTest.java +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomControllerMVCTest.java @@ -116,6 +116,26 @@ class ClassroomControllerMVCTest { verify(classroomService).createClassroom(eq("ClassroomControllerMVCTest newClassroom"), isNull(), any()); } + @Test + @WithMockTeacher + void createClassroom_shouldUseTheParentGitLabGroup() throws Exception { + mockMvc.perform( + post("/classrooms/new") + .with(csrf()) + .param("classroomName", "ClassroomControllerMVCTest newClassroom") + .param("parentGitLabGroupId", "12")) + .andExpect(status().is3xxRedirection()) + .andExpect(redirectedUrl("/")); + + var captor = ArgumentCaptor.forClass(ClassroomUser.class); + + verify(classroomService).createClassroom(eq("ClassroomControllerMVCTest newClassroom"), eq(12L), captor.capture()); + + assertThat(captor.getValue()) + .isNotNull() + .extracting("name").isEqualTo("obiwan.kenobi"); + } + @Test @WithMockTeacher void createClassroom_shouldSaveTheAssociatedTeacher() throws Exception { -- 2.51.2 From 35433dc91ae73f42d88384d30a89e9cab1f408b5 Mon Sep 17 00:00:00 2001 From: Julien WITTOUCK Date: Fri, 1 Mar 2024 15:56:40 +0100 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=96=20:=20version=200.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 8 ++++++++ pom.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f8733c..56a6fad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog + +## 0.3.2 (2024-03-01) + +### Fixed + +- 🐛 : correct GitLab group id parameter name [7d47441] + + ## 0.3.1 (2023-12-13) diff --git a/pom.xml b/pom.xml index 4ad0733..6d8ae6d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ fr.univ-lille gitlab-classrooms - 0.3.1 + 0.3.2 gitlab-classrooms GitLab Classroom is a modest clone of GitHub Classroom, aimed at GitLab. -- 2.51.2