Release 4.13.1

otto-de · Aug 23, 2024 · 55435bd · 55435bd
1 parent 4a8ccf5
commit 55435bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ plugins {
 //\
 ///\
 ////\
-def jlineup_version = "4.13.1-SNAPSHOT"
+def jlineup_version = "4.13.1"
 /////
 ////
 ///

diff --git a/cli/src/test/java/de/otto/jlineup/cli/acceptance/JLineupCLIAcceptanceTest.java b/cli/src/test/java/de/otto/jlineup/cli/acceptance/JLineupCLIAcceptanceTest.java
@@ -349,12 +349,13 @@ public void shouldRunJLineupWithTestPageThatDoesntChange_DefaultReportFormat() t
 
     @Test
     public void shouldRunJLineupWithMergedConfig() throws Exception {
+
         Main.main(new String[]{"--chrome-parameter", "--force-device-scale-factor=1", "--working-dir", tempDirectory.toString(), "--config", "src/test/resources/acceptance/acceptance.lineup.json", "--merge-config", "src/test/resources/acceptance/acceptance-merge.lineup.json", "--replace-in-url=###CWD###=" + CWD, "--step", "before"});
         Main.main(new String[]{"--chrome-parameter", "--force-device-scale-factor=1", "--working-dir", tempDirectory.toString(), "--config", "src/test/resources/acceptance/acceptance.lineup.json", "--merge-config", "src/test/resources/acceptance/acceptance-merge.lineup.json", "--replace-in-url=###CWD###=" + CWD, "--step", "after"});
 
         assertThat(systemOutCaptor.toString(), containsString("test.html"));
         assertThat(systemOutCaptor.toString(), containsString("test_remove1.html"));
-        assertThat(systemOutCaptor.toString(), containsString("678x456"));
+        assertThat(systemOutCaptor.toString(), containsString("1234x999"));
         assertThat(systemOutCaptor.toString(), not(containsString("800x800")));
         assertThat(systemOutCaptor.toString(), containsString("Sum of overall screenshot differences: 0.0 (0 %)"));
     }

diff --git a/cli/src/test/resources/acceptance/acceptance-merge.lineup.json b/cli/src/test/resources/acceptance/acceptance-merge.lineup.json
@@ -7,8 +7,8 @@
       "devices": [
         {
           "device-name": "DESKTOP",
-          "width": 678,
-          "height": 456
+          "width": 1234,
+          "height": 999
         }
       ]
     }