From 42a10ace6a5d6a6880614544bdf57dc7d9050e98 Mon Sep 17 00:00:00 2001 From: PeopleNTech NY Date: Sun, 26 Jan 2020 10:46:04 -0500 Subject: [PATCH 1/8] TestSerach --- Amazon/src/test/java/search/TestSearch.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Amazon/src/test/java/search/TestSearch.java b/Amazon/src/test/java/search/TestSearch.java index 44a0bcf..4d866f2 100644 --- a/Amazon/src/test/java/search/TestSearch.java +++ b/Amazon/src/test/java/search/TestSearch.java @@ -11,5 +11,6 @@ public class TestSearch extends CommonAPI { public void searchItems(){ SearchPage searchPage = PageFactory.initElements(driver, SearchPage.class); searchPage.clearTypeNClickOnSearch(); + System.out.println("I am potential conflict"); } } From cb99cb9a8e5cbf6e801f511c314349bbfa310e01 Mon Sep 17 00:00:00 2001 From: PeopleNTech NY Date: Sun, 26 Jan 2020 10:59:12 -0500 Subject: [PATCH 2/8] upcoming conflict --- .idea/misc.xml | 4 +- .idea/workspace.xml | 537 ++------------------ Amazon/src/test/java/search/TestSearch.java | 1 + 3 files changed, 40 insertions(+), 502 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index f250cbb..6208563 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,7 @@ - + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0be0cef..7433914 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -12,7 +12,6 @@ - @@ -23,116 +22,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -