Skip to content

Commit 6c7fccf

Browse files
committed
CONTENT match level
1 parent 5786442 commit 6c7fccf

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/test/java/base/BaseTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package base;
22

3+
import com.applitools.eyes.MatchLevel;
34
import com.applitools.eyes.selenium.Eyes;
45
import org.junit.AfterClass;
56
import org.junit.BeforeClass;
67
import org.openqa.selenium.WebDriver;
78
import org.openqa.selenium.chrome.ChromeDriver;
89

9-
1010
import java.io.File;
1111
import java.io.FileInputStream;
1212
import java.util.Properties;
1313

1414
import pages.SearchPage;
15-
import pages.SortableDataTablesPage;
1615

1716
public class BaseTests {
1817

@@ -49,8 +48,8 @@ private static void initiateEyes(){
4948
}
5049

5150
public void validateWindow(){
52-
eyes.open(driver, "Automation Bookstore",
53-
Thread.currentThread().getStackTrace()[2].getMethodName());
51+
eyes.open(driver, "Automation Bookstore", Thread.currentThread().getStackTrace()[2].getMethodName());
52+
eyes.setMatchLevel(MatchLevel.CONTENT);
5453
eyes.checkWindow();
5554
eyes.close();
5655
}

website/css/listview-grid.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@
8484
bottom: auto;
8585
/* Custom styling. */
8686
background: #990099;
87+
<<<<<<< HEAD
8788
background: rgba(153,0,153,.85);
89+
=======
90+
background: /*rgba(153,0,153,.85);*/ #ff0000;
91+
>>>>>>> CONTENT match level
8892
-webkit-border-top-right-radius: inherit;
8993
border-top-right-radius: inherit;
9094
-webkit-border-bottom-left-radius: inherit;

0 commit comments

Comments
 (0)