fix(mergeDevelopintoBranch):

.gitignore

@@ -14,4 +14,5 @@ packages/**/api/**/
 .config/
 .npm/
 .idea
-.DS_Store
+.DS_Store
\ No newline at end of file
+Automation/target
\ No newline at end of file

Automation/pom.xml

@@ -18,6 +18,14 @@
             <artifactId>json-simple</artifactId>
             <version>1.1.1</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/de.sven-jacobs/loremipsum -->
+        <dependency>
+            <groupId>de.sven-jacobs</groupId>
+            <artifactId>loremipsum</artifactId>
+            <version>1.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
+
 </project>
\ No newline at end of file

Automation/selenium.iml

@@ -9,6 +9,25 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../../../rest-assured-3.1.0-dist/rest-assured-3.1.0-deps" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/../../../../rest-assured-3.1.0-dist/rest-assured-3.1.0-deps" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../rest-assured-3.1.0-dist/rest-assured-3.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-server:3.4.0" level="project" />
     <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:3.4.0" level="project" />
     <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:3.4.0" level="project" />
@@ -59,24 +78,6 @@
     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../../rest-assured-3.1.0-dist/rest-assured-3.1.0-deps" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/../../../../rest-assured-3.1.0-dist/rest-assured-3.1.0-deps" recursive="false" />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../rest-assured-3.1.0-dist/rest-assured-3.1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" scope="TEST" name="Maven: de.sven-jacobs:loremipsum:1.0" level="project" />
   </component>
 </module>
\ No newline at end of file

Automation/src/test/java/Constants.java

 import org.apache.commons.lang3.RandomStringUtils;
+import de.svenjacobs.loremipsum.LoremIpsum;
 
 public class Constants {
-    public static final String URL = "http://qa.review.hindawi.com";
+
+    static LoremIpsum loremIpsum = new LoremIpsum();
+
+    public static final String URL = "https://qa.review.hindawi.com/";
     public static final String jurnalID = "4b0eb00f-37cb-4fad-bd0d-7ba8ee600123";
     public static final String customManuscriptID = RandomStringUtils.randomNumeric(7);
     public static final String email = "adrian.onofrei+";
@@ -15,13 +19,17 @@ public class Constants {
     public static final String firstnameHE = "Test HE";
     public static final String lastnameHE = "Test HE";
     public static final String passwordHE = "Testing123";
-    public static final String emailHE = "adrian.onofrei+HE";
+    public static final String emailHE = "adrian.onofrei+he";
+    public static final String emailRev = "adrian.onofrei+rev";
     public static final String affiliationHE = "TS HE affiliation";
-    public static final String manusName = RandomStringUtils.randomAlphabetic(16);
-    public static final String manusAbstract = RandomStringUtils.randomAlphanumeric(50);
+    public static final String manusName = "This is test manuscript from ";
+    public static final String manusAbstract = loremIpsum.getWords( 75 );
     public static final String fileManuscript = "/Users/adionofrei/Documents/Manuscript.pdf";
+    public static final String fileManuscriptName = "Manuscript (1).pdf";
     public static final String fileSupplementary = "/Users/adionofrei/Documents/Manuscript.pdf";
     public static final String fileCoverLetter = "/Users/adionofrei/Documents/Manuscript.pdf";
+    public static final String loremIpsumReport = loremIpsum.getParagraphs( 2 );
+    public static final String loremIpsumEditorialNote = loremIpsum.getWords( 75, 2 );
 
 
     public static String uidAuth = null;
@@ -29,3 +37,4 @@ public class Constants {
 
 
 }
+

Automation/src/test/java/CreateAccounts.java

+import io.restassured.RestAssured;
 import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+import org.json.simple.JSONObject;
 import org.junit.*;
 import org.openqa.selenium.*;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
-import static org.junit.Assert.*;
-import io.restassured.RestAssured;
-import io.restassured.response.Response;
-import io.restassured.specification.RequestSpecification;
-import org.json.simple.JSONObject;
+
 import java.net.URL;
 
+import static org.junit.Assert.assertEquals;
+
 
 public class CreateAccounts {
 

Automation/src/test/java/LoginTest.java

@@ -48,12 +48,12 @@ public class LoginTest {
         WebElement validLogin = null;
 
         try {
-          validLogin = wait.until(ExpectedConditions.presenceOfElementLocated(By.cssSelector("button[data-test='new-manuscript']")));
+          validLogin = wait.until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector("button[data-test='new-manuscript']")));
         } catch (NoSuchElementException e) {
 
         }
         assertNotNull(validLogin);
-        assertEquals("Admin", driver.findElement(By.xpath("//*[@id=\"root\"]/div/div/div[1]/div/div[2]/div/span[2]")).getAttribute("innerText"));
+        assertEquals("Admin", driver.findElement(By.xpath("//*[@id=\"root\"]/div/div/div[1]/div[2]/div[2]/div[1]/span[1]")).getAttribute("innerText"));
 
     }
 }

Automation/src/test/java/Utils.java

@@ -40,7 +40,7 @@ public class Utils {
         pass.sendKeys(password);
         pass.sendKeys(Keys.ENTER);
         try {
-            wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(By.cssSelector("[data-test='new-manuscript']")));
+            wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(By.cssSelector("[data-test-id='new-manuscript']")));
         } catch (NoSuchElementException e) {
             System.out.println(e.toString());
         }
@@ -58,7 +58,7 @@ public class Utils {
         driver.findElement(By.linkText("Sign up")).click();
 
         try {
-            wait.until(ExpectedConditions.presenceOfElementLocated(By.xpath(".//button[contains(text(),'"+"CONFIRM & PROCEED TO SET PASSWORD"+"')]")));
+            wait.until(ExpectedConditions.presenceOfElementLocated(By.xpath(".//button[contains(text(),'"+"PROCEED TO SET "+"')]")));
         } catch (NoSuchElementException e) {
             System.out.println(e.toString());
         }
@@ -100,22 +100,27 @@ public class Utils {
 
         String fragmentID = txt.split("/versions/")[1].split("/")[0];
 
-//        String re1=".*?";	// Non-greedy match on filler
-//        String re2="[A-Z0-9]{8}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{12}";	// Uninteresting: guid
-//        String re3=".*?";	// Non-greedy match on filler
-//        String re4="([A-Z0-9]{8}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{12})";	// SQL GUID 1
-//
-//        Pattern p = Pattern.compile(re1+re2+re3+re4,Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
-//        Matcher m = p.matcher(txt);
-//        if (m.find())
-//        {
-//            String guid1=m.group(1);
-//            System.out.print(guid1+"\n");
-//
-//        }
-//        String guid=m.group(1);
-
         return fragmentID;
     }
+
+    public static String pID(String url)
+    {
+        String txt=url;
+
+        String projectID = txt.split("/projects/")[1].split("/")[0];
+
+        return projectID;
+    }
+
+    public static void filterLatest(WebDriver driver){
+
+        driver.findElement(By.cssSelector("[data-test-id='dashboard-filters'] [data-test-id='item']:nth-of-type(2) button")).click();
+        driver.findElement(By.cssSelector("[data-test-id='dashboard-filters'] [data-test-id='item']:nth-of-type(1) div[role=\"option\"]:nth-child(1)")).click();
+
+        driver.findElement(By.cssSelector("[data-test-id='dashboard-filters'] [data-test-id='item']:nth-of-type(2) button")).click();
+        driver.findElement(By.cssSelector("[data-test-id='dashboard-filters'] [data-test-id='item']:nth-of-type(2) div[role=\"option\"]:nth-child(1)")).click();
+
+    }
+
 }