diff --git a/.circleci/config.yml b/.circleci/config.yml index f55c7ec8f..6f91f6b30 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -227,5 +227,7 @@ workflows: requires: - instrumented filters: + branches: + only: master tags: only: /.*/ diff --git a/api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java b/api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java index 81e8f3ae3..936c1533b 100644 --- a/api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java +++ b/api/src/main/java/io/github/wulkanowy/api/grades/GradesList.java @@ -56,7 +56,7 @@ public class GradesList { String descriptions = row.select("td:nth-child(3)").text(); String symbol = descriptions.split(", ")[0]; - String description = descriptions.replaceFirst(symbol, "").replaceFirst(", ", ""); + String description = descriptions.replaceFirst(Pattern.quote(symbol), "").replaceFirst(", ", ""); String color = getColor(row.select("td:nth-child(2) span.ocenaCzastkowa").attr("style")); String date = formatDate(row.select("td:nth-child(5)").text()); diff --git a/api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java b/api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java index c52fbb30c..6eff84c95 100644 --- a/api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java +++ b/api/src/test/java/io/github/wulkanowy/api/grades/GradesListTest.java @@ -19,7 +19,7 @@ public class GradesListTest extends StudentAndParentTestCase { @Test public void getAllTest() throws Exception { - Assert.assertEquals(6, filled.getAll().size()); // 2 items are skipped + Assert.assertEquals(7, filled.getAll().size()); // 2 items are skipped } @Test @@ -60,6 +60,7 @@ public class GradesListTest extends StudentAndParentTestCase { Assert.assertEquals("BW3", list.get(3).getSymbol()); Assert.assertEquals("STR", list.get(4).getSymbol()); Assert.assertEquals("K", list.get(5).getSymbol()); + Assert.assertEquals("+Odp", list.get(6).getSymbol()); } @Test @@ -70,6 +71,7 @@ public class GradesListTest extends StudentAndParentTestCase { Assert.assertEquals("Writing", list.get(3).getDescription()); Assert.assertEquals("", list.get(4).getDescription()); Assert.assertEquals("Kordian", list.get(5).getDescription()); + Assert.assertEquals("Kordian", list.get(6).getDescription()); } @Test diff --git a/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html b/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html index a229d1d53..d0cdb6643 100644 --- a/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html +++ b/api/src/test/resources/io/github/wulkanowy/api/grades/OcenyWszystkie-filled.html @@ -100,6 +100,14 @@ 06.02.2017 Amelia Stępień + + Język polski + 5 + +Odp, Kordian + 5,00 + 11.05.2017 + Amelia Stępień +