diff --git a/src/test/java/base/BaseTests.java b/src/test/java/base/BaseTests.java index 682a27b..015d7d3 100644 --- a/src/test/java/base/BaseTests.java +++ b/src/test/java/base/BaseTests.java @@ -1,18 +1,17 @@ package base; +import com.applitools.eyes.MatchLevel; import com.applitools.eyes.selenium.Eyes; import org.junit.AfterClass; import org.junit.BeforeClass; import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; - import java.io.File; import java.io.FileInputStream; import java.util.Properties; import pages.SearchPage; -import pages.SortableDataTablesPage; public class BaseTests { @@ -49,8 +48,8 @@ private static void initiateEyes(){ } public void validateWindow(){ - eyes.open(driver, "Automation Bookstore", - Thread.currentThread().getStackTrace()[2].getMethodName()); + eyes.open(driver, "Automation Bookstore", Thread.currentThread().getStackTrace()[2].getMethodName()); + eyes.setMatchLevel(MatchLevel.CONTENT); eyes.checkWindow(); eyes.close(); } diff --git a/website/css/listview-grid.css b/website/css/listview-grid.css index fd775af..207babe 100755 --- a/website/css/listview-grid.css +++ b/website/css/listview-grid.css @@ -84,7 +84,11 @@ bottom: auto; /* Custom styling. */ background: #990099; +<<<<<<< HEAD background: rgba(153,0,153,.85); +======= + background: /*rgba(153,0,153,.85);*/ #ff0000; +>>>>>>> CONTENT match level -webkit-border-top-right-radius: inherit; border-top-right-radius: inherit; -webkit-border-bottom-left-radius: inherit;