diff --git a/build.gradle.kts b/build.gradle.kts index 0cdfc10c..30ee1206 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -77,9 +77,9 @@ tasks.test { finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run } -tasks.register("slowTests") { +tasks.register("testAll") { useJUnitPlatform { - includeTags("slow") + includeTags("any()", "none()") } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a563242..442d9132 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ArtStationRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ArtStationRipperTest.java index d7cf6cdf..e29a32ed 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ArtStationRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ArtStationRipperTest.java @@ -7,12 +7,13 @@ import java.util.List; import com.rarchives.ripme.ripper.rippers.ArtStationRipper; -import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; public class ArtStationRipperTest extends RippersTest { @Test + @Tag("flaky") public void testArtStationProjects() throws IOException { List contentURLs = new ArrayList<>(); contentURLs.add(new URL("https://www.artstation.com/artwork/the-dwarf-mortar")); @@ -25,7 +26,7 @@ public class ArtStationRipperTest extends RippersTest { } @Test - @Disabled("Failed with cloudflare protection") + @Tag("flaky") public void testArtStationUserProfiles() throws IOException { List contentURLs = new ArrayList<>(); contentURLs.add(new URL("https://www.artstation.com/heitoramatsu")); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CyberdropRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CyberdropRipperTest.java index 4d077628..847f2abf 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CyberdropRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CyberdropRipperTest.java @@ -4,6 +4,7 @@ import com.rarchives.ripme.ripper.rippers.CyberdropRipper; import com.rarchives.ripme.utils.Http; import org.jsoup.nodes.Document; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -29,6 +30,7 @@ public class CyberdropRipperTest extends RippersTest { } @Test + @Tag("flaky") public void testCyberdropNumberOfFiles() throws IOException { List testURLs = new ArrayList(); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentainexusRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentainexusRipperTest.java index a244276c..00340eba 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentainexusRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentainexusRipperTest.java @@ -8,10 +8,12 @@ import java.util.List; import com.rarchives.ripme.ripper.rippers.HentaiNexusRipper; import org.json.JSONObject; import org.junit.Assert; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; public class HentainexusRipperTest extends RippersTest { @Test + @Tag("flaky") public void testHentaiNexusJson() throws IOException { List testURLs = new ArrayList<>(); testURLs.add(new URL("https://hentainexus.com/view/9202")); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgboxRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgboxRipperTest.java index 3b6bb782..9e3b6b32 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgboxRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgboxRipperTest.java @@ -5,10 +5,12 @@ import java.net.URL; import com.rarchives.ripme.ripper.rippers.ImgboxRipper; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; public class ImgboxRipperTest extends RippersTest { @Test + @Tag("flaky") public void testImgboxRip() throws IOException { ImgboxRipper ripper = new ImgboxRipper(new URL("https://imgbox.com/g/FJPF7t26FD")); testRipper(ripper);