From 95125582ba03a586fe2c220f9ccd2ad830598b86 Mon Sep 17 00:00:00 2001
From: Vlad <stegaru.vlad@gmail.com>
Date: Mon, 26 Mar 2018 17:29:33 +0300
Subject: [PATCH] test:automation test cases fixes
---
.../Libs/TempTestCase1522072709057.groovy | 25 ++++++++
.../Libs/TempTestCase1522072851120.groovy | 25 ++++++++
.../Libs/TempTestCase1522072933853.groovy | 25 ++++++++
.../Libs/TempTestCase1522073064337.groovy | 25 ++++++++
.../Libs/TempTestCase1522073772044.groovy | 25 ++++++++
.../Libs/TempTestCase1522074225509.groovy | 25 ++++++++
.../Object Repository/EditUser/Professor.rs | 19 ++++++
.../{NewUser => EditUser}/a_Edit.rs | 8 ++-
.../Object Repository/EditUser/admin.rs | 23 +++++++
.../Object Repository/EditUser/affiliation.rs | 19 ++++++
.../Object Repository/EditUser/author.rs | 19 ++++++
automation/Object Repository/EditUser/back.rs | 19 ++++++
.../EditUser/editorInChief.rs | 23 +++++++
.../Object Repository/EditUser/firstName.rs | 19 ++++++
.../Object Repository/EditUser/lastName.rs | 19 ++++++
automation/Object Repository/EditUser/save.rs | 19 ++++++
.../td_admin.rs} | 8 +--
.../EditUser/titleDropDown.rs | 19 ++++++
.../{review.rs => Research.rs} | 7 ++-
.../manuscriptAuthorsDetails/addAuthor.rs | 8 ++-
.../manuscriptAuthorsDetails/countryOption.rs | 6 +-
.../manuscriptAuthorsDetails/no.rs | 2 +-
.../submittingAuthor.rs | 23 +++++++
.../manuscriptAuthorsDetails/yes.rs | 2 +-
.../manuscriptFilesUpload/Back.rs | 19 ++++++
.../{attachFile.rs => attachManuscript.rs} | 8 +--
.../preSubmissionChecklist/hasManuscript.rs | 5 +-
.../preSubmissionChecklist/hasOrcid.rs | 6 +-
.../Object Repository/NewUser/EditUser/.meta | 7 ---
.../Object Repository/NewUser/addUser.rs | 9 +--
.../Object Repository/NewUser/roleAdmin.rs | 9 ++-
automation/Object Repository/NewUser/users.rs | 8 +--
.../Object Repository/SignIn/LoginButton.rs | 50 ----------------
.../{NewUser => SignIn}/login.rs | 6 +-
.../SignIn/{passwordField.rs => password.rs} | 2 +-
.../SignIn/{usernameField.rs => username.rs} | 11 ++--
.../Add a new user/Script1521123804636.groovy | 34 ++---------
.../Script1520433593112.groovy | 60 +++++--------------
.../Edit new user/Script1521147575383.groovy | 31 +++++-----
.../Script1521714001455.groovy | 6 +-
.../Script1520866853834.groovy | 7 +--
.../Script1520866853834.groovy | 46 --------------
.../Sign In flow/Script1520414607328.groovy | 10 ++--
.../Edit new user.tc | 0
.../Test Cases/Resume submission Redirect.tc | 8 ---
automation/Test Suites/firstTS.ts | 18 ------
46 files changed, 487 insertions(+), 285 deletions(-)
create mode 100644 automation/Libs/TempTestCase1522072709057.groovy
create mode 100644 automation/Libs/TempTestCase1522072851120.groovy
create mode 100644 automation/Libs/TempTestCase1522072933853.groovy
create mode 100644 automation/Libs/TempTestCase1522073064337.groovy
create mode 100644 automation/Libs/TempTestCase1522073772044.groovy
create mode 100644 automation/Libs/TempTestCase1522074225509.groovy
create mode 100644 automation/Object Repository/EditUser/Professor.rs
rename automation/Object Repository/{NewUser => EditUser}/a_Edit.rs (90%)
create mode 100644 automation/Object Repository/EditUser/admin.rs
create mode 100644 automation/Object Repository/EditUser/affiliation.rs
create mode 100644 automation/Object Repository/EditUser/author.rs
create mode 100644 automation/Object Repository/EditUser/back.rs
create mode 100644 automation/Object Repository/EditUser/editorInChief.rs
create mode 100644 automation/Object Repository/EditUser/firstName.rs
create mode 100644 automation/Object Repository/EditUser/lastName.rs
create mode 100644 automation/Object Repository/EditUser/save.rs
rename automation/Object Repository/{NewUser/td_vlad.stegarunewuserthinslic.rs => EditUser/td_admin.rs} (87%)
create mode 100644 automation/Object Repository/EditUser/titleDropDown.rs
rename automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/{review.rs => Research.rs} (92%)
create mode 100644 automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/submittingAuthor.rs
create mode 100644 automation/Object Repository/NewManuscript/manuscriptFilesUpload/Back.rs
rename automation/Object Repository/NewManuscript/manuscriptFilesUpload/{attachFile.rs => attachManuscript.rs} (94%)
delete mode 100644 automation/Object Repository/NewUser/EditUser/.meta
delete mode 100644 automation/Object Repository/SignIn/LoginButton.rs
rename automation/Object Repository/{NewUser => SignIn}/login.rs (76%)
rename automation/Object Repository/SignIn/{passwordField.rs => password.rs} (98%)
rename automation/Object Repository/SignIn/{usernameField.rs => username.rs} (97%)
rename automation/Scripts/{Add a new user => Edit a new user}/Edit new user/Script1521147575383.groovy (75%)
delete mode 100644 automation/Scripts/Resume submission Redirect/Script1520866853834.groovy
rename automation/Test Cases/{Add a new user => Edit a new user}/Edit new user.tc (100%)
delete mode 100644 automation/Test Cases/Resume submission Redirect.tc
diff --git a/automation/Libs/TempTestCase1522072709057.groovy b/automation/Libs/TempTestCase1522072709057.groovy
new file mode 100644
index 000000000..8f3f2ad60
--- /dev/null
+++ b/automation/Libs/TempTestCase1522072709057.groovy
@@ -0,0 +1,25 @@
+import com.kms.katalon.core.main.TestCaseMain
+import com.kms.katalon.core.logging.KeywordLogger
+import groovy.lang.MissingPropertyException
+import com.kms.katalon.core.testcase.TestCaseBinding
+import com.kms.katalon.core.driver.internal.DriverCleanerCollector
+import com.kms.katalon.core.model.FailureHandling
+import com.kms.katalon.core.configuration.RunConfiguration
+import com.kms.katalon.core.webui.contribution.WebUiDriverCleaner
+import com.kms.katalon.core.mobile.contribution.MobileDriverCleaner
+
+
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner())
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner())
+
+
+RunConfiguration.setExecutionSettingFile('/var/folders/3h/5jvs258x4lng1yz2s32ryr4r0000gn/T/Katalon/Test Cases/Add new manuscript/Add a new manuscript/20180326_165829/execution.properties')
+
+TestCaseMain.beforeStart()
+try {
+
+ TestCaseMain.runTestCase('Test Cases/Add new manuscript/Add a new manuscript', new TestCaseBinding('Test Cases/Add new manuscript/Add a new manuscript', [:]), FailureHandling.STOP_ON_FAILURE )
+
+} catch (Exception e) {
+ TestCaseMain.logError(e, 'Test Cases/Add new manuscript/Add a new manuscript')
+}
diff --git a/automation/Libs/TempTestCase1522072851120.groovy b/automation/Libs/TempTestCase1522072851120.groovy
new file mode 100644
index 000000000..5ffd33fd1
--- /dev/null
+++ b/automation/Libs/TempTestCase1522072851120.groovy
@@ -0,0 +1,25 @@
+import com.kms.katalon.core.main.TestCaseMain
+import com.kms.katalon.core.logging.KeywordLogger
+import groovy.lang.MissingPropertyException
+import com.kms.katalon.core.testcase.TestCaseBinding
+import com.kms.katalon.core.driver.internal.DriverCleanerCollector
+import com.kms.katalon.core.model.FailureHandling
+import com.kms.katalon.core.configuration.RunConfiguration
+import com.kms.katalon.core.webui.contribution.WebUiDriverCleaner
+import com.kms.katalon.core.mobile.contribution.MobileDriverCleaner
+
+
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner())
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner())
+
+
+RunConfiguration.setExecutionSettingFile('/var/folders/3h/5jvs258x4lng1yz2s32ryr4r0000gn/T/Katalon/Test Cases/Add new manuscript/Add a new manuscript/20180326_170051/execution.properties')
+
+TestCaseMain.beforeStart()
+try {
+
+ TestCaseMain.runTestCase('Test Cases/Add new manuscript/Add a new manuscript', new TestCaseBinding('Test Cases/Add new manuscript/Add a new manuscript', [:]), FailureHandling.STOP_ON_FAILURE )
+
+} catch (Exception e) {
+ TestCaseMain.logError(e, 'Test Cases/Add new manuscript/Add a new manuscript')
+}
diff --git a/automation/Libs/TempTestCase1522072933853.groovy b/automation/Libs/TempTestCase1522072933853.groovy
new file mode 100644
index 000000000..2261a70c8
--- /dev/null
+++ b/automation/Libs/TempTestCase1522072933853.groovy
@@ -0,0 +1,25 @@
+import com.kms.katalon.core.main.TestCaseMain
+import com.kms.katalon.core.logging.KeywordLogger
+import groovy.lang.MissingPropertyException
+import com.kms.katalon.core.testcase.TestCaseBinding
+import com.kms.katalon.core.driver.internal.DriverCleanerCollector
+import com.kms.katalon.core.model.FailureHandling
+import com.kms.katalon.core.configuration.RunConfiguration
+import com.kms.katalon.core.webui.contribution.WebUiDriverCleaner
+import com.kms.katalon.core.mobile.contribution.MobileDriverCleaner
+
+
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner())
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner())
+
+
+RunConfiguration.setExecutionSettingFile('/var/folders/3h/5jvs258x4lng1yz2s32ryr4r0000gn/T/Katalon/Test Cases/Add new manuscript/Add a new manuscript/20180326_170213/execution.properties')
+
+TestCaseMain.beforeStart()
+try {
+
+ TestCaseMain.runTestCase('Test Cases/Add new manuscript/Add a new manuscript', new TestCaseBinding('Test Cases/Add new manuscript/Add a new manuscript', [:]), FailureHandling.STOP_ON_FAILURE )
+
+} catch (Exception e) {
+ TestCaseMain.logError(e, 'Test Cases/Add new manuscript/Add a new manuscript')
+}
diff --git a/automation/Libs/TempTestCase1522073064337.groovy b/automation/Libs/TempTestCase1522073064337.groovy
new file mode 100644
index 000000000..bb374d11a
--- /dev/null
+++ b/automation/Libs/TempTestCase1522073064337.groovy
@@ -0,0 +1,25 @@
+import com.kms.katalon.core.main.TestCaseMain
+import com.kms.katalon.core.logging.KeywordLogger
+import groovy.lang.MissingPropertyException
+import com.kms.katalon.core.testcase.TestCaseBinding
+import com.kms.katalon.core.driver.internal.DriverCleanerCollector
+import com.kms.katalon.core.model.FailureHandling
+import com.kms.katalon.core.configuration.RunConfiguration
+import com.kms.katalon.core.webui.contribution.WebUiDriverCleaner
+import com.kms.katalon.core.mobile.contribution.MobileDriverCleaner
+
+
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner())
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner())
+
+
+RunConfiguration.setExecutionSettingFile('/var/folders/3h/5jvs258x4lng1yz2s32ryr4r0000gn/T/Katalon/Test Cases/Add new manuscript/Add a new manuscript/20180326_170424/execution.properties')
+
+TestCaseMain.beforeStart()
+try {
+
+ TestCaseMain.runTestCase('Test Cases/Add new manuscript/Add a new manuscript', new TestCaseBinding('Test Cases/Add new manuscript/Add a new manuscript', [:]), FailureHandling.STOP_ON_FAILURE )
+
+} catch (Exception e) {
+ TestCaseMain.logError(e, 'Test Cases/Add new manuscript/Add a new manuscript')
+}
diff --git a/automation/Libs/TempTestCase1522073772044.groovy b/automation/Libs/TempTestCase1522073772044.groovy
new file mode 100644
index 000000000..9db3b751d
--- /dev/null
+++ b/automation/Libs/TempTestCase1522073772044.groovy
@@ -0,0 +1,25 @@
+import com.kms.katalon.core.main.TestCaseMain
+import com.kms.katalon.core.logging.KeywordLogger
+import groovy.lang.MissingPropertyException
+import com.kms.katalon.core.testcase.TestCaseBinding
+import com.kms.katalon.core.driver.internal.DriverCleanerCollector
+import com.kms.katalon.core.model.FailureHandling
+import com.kms.katalon.core.configuration.RunConfiguration
+import com.kms.katalon.core.webui.contribution.WebUiDriverCleaner
+import com.kms.katalon.core.mobile.contribution.MobileDriverCleaner
+
+
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner())
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner())
+
+
+RunConfiguration.setExecutionSettingFile('/var/folders/3h/5jvs258x4lng1yz2s32ryr4r0000gn/T/Katalon/Test Cases/Add new manuscript/Add a new manuscript/20180326_171612/execution.properties')
+
+TestCaseMain.beforeStart()
+try {
+
+ TestCaseMain.runTestCase('Test Cases/Add new manuscript/Add a new manuscript', new TestCaseBinding('Test Cases/Add new manuscript/Add a new manuscript', [:]), FailureHandling.STOP_ON_FAILURE )
+
+} catch (Exception e) {
+ TestCaseMain.logError(e, 'Test Cases/Add new manuscript/Add a new manuscript')
+}
diff --git a/automation/Libs/TempTestCase1522074225509.groovy b/automation/Libs/TempTestCase1522074225509.groovy
new file mode 100644
index 000000000..44d5a45be
--- /dev/null
+++ b/automation/Libs/TempTestCase1522074225509.groovy
@@ -0,0 +1,25 @@
+import com.kms.katalon.core.main.TestCaseMain
+import com.kms.katalon.core.logging.KeywordLogger
+import groovy.lang.MissingPropertyException
+import com.kms.katalon.core.testcase.TestCaseBinding
+import com.kms.katalon.core.driver.internal.DriverCleanerCollector
+import com.kms.katalon.core.model.FailureHandling
+import com.kms.katalon.core.configuration.RunConfiguration
+import com.kms.katalon.core.webui.contribution.WebUiDriverCleaner
+import com.kms.katalon.core.mobile.contribution.MobileDriverCleaner
+
+
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner())
+DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner())
+
+
+RunConfiguration.setExecutionSettingFile('/var/folders/3h/5jvs258x4lng1yz2s32ryr4r0000gn/T/Katalon/Test Cases/Add new manuscript/Add a new manuscript/20180326_172345/execution.properties')
+
+TestCaseMain.beforeStart()
+try {
+
+ TestCaseMain.runTestCase('Test Cases/Add new manuscript/Add a new manuscript', new TestCaseBinding('Test Cases/Add new manuscript/Add a new manuscript', [:]), FailureHandling.STOP_ON_FAILURE )
+
+} catch (Exception e) {
+ TestCaseMain.logError(e, 'Test Cases/Add new manuscript/Add a new manuscript')
+}
diff --git a/automation/Object Repository/EditUser/Professor.rs b/automation/Object Repository/EditUser/Professor.rs
new file mode 100644
index 000000000..d973c2fa8
--- /dev/null
+++ b/automation/Object Repository/EditUser/Professor.rs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>Professor</name>
+ <tag></tag>
+ <elementGuidId>eba9b5bd-3de2-4ba0-87a2-6de8cb955713</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>XPATH</key>
+ <value>//div[contains(text(),"Professor")]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/a_Edit.rs b/automation/Object Repository/EditUser/a_Edit.rs
similarity index 90%
rename from automation/Object Repository/NewUser/a_Edit.rs
rename to automation/Object Repository/EditUser/a_Edit.rs
index e17c1daea..ca57d84e7 100644
--- a/automation/Object Repository/NewUser/a_Edit.rs
+++ b/automation/Object Repository/EditUser/a_Edit.rs
@@ -7,10 +7,14 @@
<selectorCollection>
<entry>
<key>CSS</key>
- <value>#root > div > div > div.sc-drKuOJ.fmUpkt > div > table > tbody > tr:nth-child(1) > td:nth-child(7) > a</value>
+ <value></value>
+ </entry>
+ <entry>
+ <key>XPATH</key>
+ <value>//a[contains(text(),"Edit")]</value>
</entry>
</selectorCollection>
- <selectorMethod>CSS</selectorMethod>
+ <selectorMethod>XPATH</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/EditUser/admin.rs b/automation/Object Repository/EditUser/admin.rs
new file mode 100644
index 000000000..82a0afcaa
--- /dev/null
+++ b/automation/Object Repository/EditUser/admin.rs
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>admin</name>
+ <tag></tag>
+ <elementGuidId>f8d9253b-e777-4c8e-a9f9-c9853441ccf3</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>XPATH</key>
+ <value>//span[contains(text(),"Admin")]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value></value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/EditUser/affiliation.rs b/automation/Object Repository/EditUser/affiliation.rs
new file mode 100644
index 000000000..12d8913a2
--- /dev/null
+++ b/automation/Object Repository/EditUser/affiliation.rs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>affiliation</name>
+ <tag></tag>
+ <elementGuidId>4291041c-0bce-4713-af17-89c652ba2531</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="affiliation"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/EditUser/author.rs b/automation/Object Repository/EditUser/author.rs
new file mode 100644
index 000000000..45e78c619
--- /dev/null
+++ b/automation/Object Repository/EditUser/author.rs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>author</name>
+ <tag></tag>
+ <elementGuidId>201e73e0-b947-4620-bf6d-2596ed72498c</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="author"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/EditUser/back.rs b/automation/Object Repository/EditUser/back.rs
new file mode 100644
index 000000000..4c859ed95
--- /dev/null
+++ b/automation/Object Repository/EditUser/back.rs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>back</name>
+ <tag></tag>
+ <elementGuidId>67040fc1-b9eb-4a70-8d63-2ef93cdf0b28</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>XPATH</key>
+ <value>//button[contains(text(),"Back")]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/EditUser/editorInChief.rs b/automation/Object Repository/EditUser/editorInChief.rs
new file mode 100644
index 000000000..2328672ff
--- /dev/null
+++ b/automation/Object Repository/EditUser/editorInChief.rs
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>editorInChief</name>
+ <tag></tag>
+ <elementGuidId>d868d422-04b5-4c62-b4a8-901287c62d0d</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>XPATH</key>
+ <value>//span[contains(text(),"Editor")]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value></value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/EditUser/firstName.rs b/automation/Object Repository/EditUser/firstName.rs
new file mode 100644
index 000000000..214760844
--- /dev/null
+++ b/automation/Object Repository/EditUser/firstName.rs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>firstName</name>
+ <tag></tag>
+ <elementGuidId>6a96a983-234f-41e9-ae31-2049b21d0559</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="firstName"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/EditUser/lastName.rs b/automation/Object Repository/EditUser/lastName.rs
new file mode 100644
index 000000000..41e8f510f
--- /dev/null
+++ b/automation/Object Repository/EditUser/lastName.rs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>lastName</name>
+ <tag></tag>
+ <elementGuidId>9fdd634e-efe0-41a9-bd7e-e3dabdab2c42</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="lastName"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/EditUser/save.rs b/automation/Object Repository/EditUser/save.rs
new file mode 100644
index 000000000..1fe9d20d5
--- /dev/null
+++ b/automation/Object Repository/EditUser/save.rs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>save</name>
+ <tag></tag>
+ <elementGuidId>5459e992-448c-44a0-9afc-90c27303e61d</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>button[type="submit"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/td_vlad.stegarunewuserthinslic.rs b/automation/Object Repository/EditUser/td_admin.rs
similarity index 87%
rename from automation/Object Repository/NewUser/td_vlad.stegarunewuserthinslic.rs
rename to automation/Object Repository/EditUser/td_admin.rs
index f4ef7825b..e5cf0c4e6 100644
--- a/automation/Object Repository/NewUser/td_vlad.stegarunewuserthinslic.rs
+++ b/automation/Object Repository/EditUser/td_admin.rs
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<WebElementEntity>
<description></description>
- <name>td_vlad.stegarunewuserthinslic</name>
+ <name>td_admin</name>
<tag></tag>
<elementGuidId>1ee7b131-9b37-44ca-a75a-e710f5aa3d91</elementGuidId>
<selectorCollection>
<entry>
<key>CSS</key>
- <value>#root > div > div > div.sc-drKuOJ.fmUpkt > div > table > tbody > tr:nth-child(1)</value>
+ <value></value>
</entry>
<entry>
<key>XPATH</key>
- <value></value>
+ <value>//td[contains(text(),"admin@mailinator.com")]</value>
</entry>
</selectorCollection>
- <selectorMethod>CSS</selectorMethod>
+ <selectorMethod>XPATH</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/EditUser/titleDropDown.rs b/automation/Object Repository/EditUser/titleDropDown.rs
new file mode 100644
index 000000000..5294e6e15
--- /dev/null
+++ b/automation/Object Repository/EditUser/titleDropDown.rs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>titleDropDown</name>
+ <tag></tag>
+ <elementGuidId>81a68a81-b445-4092-96fe-b97761eb9fda</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>div[role="listbox"] button</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/review.rs b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/Research.rs
similarity index 92%
rename from automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/review.rs
rename to automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/Research.rs
index e66280690..68e88ae9f 100644
--- a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/review.rs
+++ b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/Research.rs
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<WebElementEntity>
<description></description>
- <name>review</name>
+ <name>Research</name>
<tag></tag>
<elementGuidId>073d58c9-eab0-4bda-b090-aa974ebc3bd3</elementGuidId>
<selectorCollection>
<entry>
<key>CSS</key>
- <value>div[data-test="metadata.type"] div[role="listbox"] div div:nth-child(2)</value>
+ <value></value>
</entry>
<entry>
<key>XPATH</key>
+ <value>//div[contains(text(),"Research")]</value>
</entry>
</selectorCollection>
- <selectorMethod>CSS</selectorMethod>
+ <selectorMethod>XPATH</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/addAuthor.rs b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/addAuthor.rs
index ec2b83eba..feea6a717 100644
--- a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/addAuthor.rs
+++ b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/addAuthor.rs
@@ -5,12 +5,16 @@
<tag></tag>
<elementGuidId>e12e5c46-5ca1-4e4f-96cb-467b1aa9be59</elementGuidId>
<selectorCollection>
+ <entry>
+ <key>CSS</key>
+ <value>button[data-test="button-add-author"]</value>
+ </entry>
<entry>
<key>XPATH</key>
- <value>//div[@data-test="authors"]/div/div/button</value>
+ <value></value>
</entry>
</selectorCollection>
- <selectorMethod>XPATH</selectorMethod>
+ <selectorMethod>CSS</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/countryOption.rs b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/countryOption.rs
index 3b738783d..332357bff 100644
--- a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/countryOption.rs
+++ b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/countryOption.rs
@@ -7,14 +7,14 @@
<selectorCollection>
<entry>
<key>CSS</key>
- <value>div[data-test="authors"] div[role="listbox"] div div:nth-child(46)</value>
+ <value></value>
</entry>
<entry>
<key>XPATH</key>
- <value></value>
+ <value>//div[contains(text(),"Japan")]</value>
</entry>
</selectorCollection>
- <selectorMethod>CSS</selectorMethod>
+ <selectorMethod>XPATH</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/no.rs b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/no.rs
index 34f6b7c3f..b66aa5cad 100644
--- a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/no.rs
+++ b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/no.rs
@@ -7,7 +7,7 @@
<selectorCollection>
<entry>
<key>CSS</key>
- <value>div[data-test="conflicts.hasConflicts"] div div label:nth-child(2)</value>
+ <value>input[type="radio"][value="no"]+ span</value>
</entry>
<entry>
<key>XPATH</key>
diff --git a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/submittingAuthor.rs b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/submittingAuthor.rs
new file mode 100644
index 000000000..7f1f43993
--- /dev/null
+++ b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/submittingAuthor.rs
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>submittingAuthor</name>
+ <tag></tag>
+ <elementGuidId>7b2fcac6-fd34-438e-90f8-d4d3824e6f2d</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>XPATH</key>
+ <value>//span[contains(text(),"#")]</value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value></value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>XPATH</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/yes.rs b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/yes.rs
index b7023f937..0c6f6ffdd 100644
--- a/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/yes.rs
+++ b/automation/Object Repository/NewManuscript/manuscriptAuthorsDetails/yes.rs
@@ -7,7 +7,7 @@
<selectorCollection>
<entry>
<key>CSS</key>
- <value></value>
+ <value>input[type="radio"][value="yes"]+ span</value>
</entry>
</selectorCollection>
<selectorMethod>CSS</selectorMethod>
diff --git a/automation/Object Repository/NewManuscript/manuscriptFilesUpload/Back.rs b/automation/Object Repository/NewManuscript/manuscriptFilesUpload/Back.rs
new file mode 100644
index 000000000..1dda5f6dc
--- /dev/null
+++ b/automation/Object Repository/NewManuscript/manuscriptFilesUpload/Back.rs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<WebElementEntity>
+ <description></description>
+ <name>Back</name>
+ <tag></tag>
+ <elementGuidId>8b3ed9c6-1888-48f9-99e2-45a08d149de1</elementGuidId>
+ <selectorCollection>
+ <entry>
+ <key>BASIC</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>CSS</key>
+ <value>button[data-test="button-prev"]</value>
+ </entry>
+ </selectorCollection>
+ <selectorMethod>CSS</selectorMethod>
+ <useRalativeImagePath>false</useRalativeImagePath>
+</WebElementEntity>
diff --git a/automation/Object Repository/NewManuscript/manuscriptFilesUpload/attachFile.rs b/automation/Object Repository/NewManuscript/manuscriptFilesUpload/attachManuscript.rs
similarity index 94%
rename from automation/Object Repository/NewManuscript/manuscriptFilesUpload/attachFile.rs
rename to automation/Object Repository/NewManuscript/manuscriptFilesUpload/attachManuscript.rs
index f25d661ba..16ece3ecb 100644
--- a/automation/Object Repository/NewManuscript/manuscriptFilesUpload/attachFile.rs
+++ b/automation/Object Repository/NewManuscript/manuscriptFilesUpload/attachManuscript.rs
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<WebElementEntity>
<description></description>
- <name>attachFile</name>
+ <name>attachManuscript</name>
<tag></tag>
<elementGuidId>c3eed726-7b7f-4e93-8d4a-baddc5a31314</elementGuidId>
<selectorCollection>
<entry>
<key>CSS</key>
- <value></value>
+ <value>div[data-test="button-upload-manuscripts"]</value>
</entry>
<entry>
<key>XPATH</key>
- <value>//*[@id="root"]/div/div[2]/div/div[2]/form/div[1]/div/div/div[2]/div[1]/div/div</value>
+ <value></value>
</entry>
</selectorCollection>
- <selectorMethod>XPATH</selectorMethod>
+ <selectorMethod>CSS</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/NewManuscript/preSubmissionChecklist/hasManuscript.rs b/automation/Object Repository/NewManuscript/preSubmissionChecklist/hasManuscript.rs
index c89323060..d1b0bb852 100644
--- a/automation/Object Repository/NewManuscript/preSubmissionChecklist/hasManuscript.rs
+++ b/automation/Object Repository/NewManuscript/preSubmissionChecklist/hasManuscript.rs
@@ -7,13 +7,14 @@
<selectorCollection>
<entry>
<key>CSS</key>
- <value>div[data-test="declarations"] div label:nth-child(2)</value>
+ <value></value>
</entry>
<entry>
<key>XPATH</key>
+ <value>//div[@data-test="declarations"]/div/label/span[contains(text(),'Microsoft')]</value>
</entry>
</selectorCollection>
- <selectorMethod>CSS</selectorMethod>
+ <selectorMethod>XPATH</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/NewManuscript/preSubmissionChecklist/hasOrcid.rs b/automation/Object Repository/NewManuscript/preSubmissionChecklist/hasOrcid.rs
index aa3c40048..252614d4b 100644
--- a/automation/Object Repository/NewManuscript/preSubmissionChecklist/hasOrcid.rs
+++ b/automation/Object Repository/NewManuscript/preSubmissionChecklist/hasOrcid.rs
@@ -7,14 +7,14 @@
<selectorCollection>
<entry>
<key>CSS</key>
- <value>div[data-test="declarations"] div label:nth-child(5)</value>
+ <value></value>
</entry>
<entry>
<key>XPATH</key>
- <value></value>
+ <value>//div[@data-test="declarations"]/div/label/span[contains(text(),'ORCID')]</value>
</entry>
</selectorCollection>
- <selectorMethod>CSS</selectorMethod>
+ <selectorMethod>XPATH</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/NewUser/EditUser/.meta b/automation/Object Repository/NewUser/EditUser/.meta
deleted file mode 100644
index 19883ad9e..000000000
--- a/automation/Object Repository/NewUser/EditUser/.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FolderEntity>
- <description>folder</description>
- <name>EditUser</name>
- <tag></tag>
- <folderType>WEBELEMENT</folderType>
-</FolderEntity>
diff --git a/automation/Object Repository/NewUser/addUser.rs b/automation/Object Repository/NewUser/addUser.rs
index a33b23499..bf00b8e81 100644
--- a/automation/Object Repository/NewUser/addUser.rs
+++ b/automation/Object Repository/NewUser/addUser.rs
@@ -11,15 +11,10 @@
</entry>
<entry>
<key>XPATH</key>
- <key>XPATH</key>
- <value>//button/*[1]</value>
- </entry>
- <entry>
- <key>CSS</key>
- <value>button:first-child</value>
+ <value></value>
</entry>
</selectorCollection>
- <selectorMethod>XPATH</selectorMethod>
+ <selectorMethod>CSS</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/NewUser/roleAdmin.rs b/automation/Object Repository/NewUser/roleAdmin.rs
index 55581d2b1..e03002762 100644
--- a/automation/Object Repository/NewUser/roleAdmin.rs
+++ b/automation/Object Repository/NewUser/roleAdmin.rs
@@ -6,13 +6,12 @@
<elementGuidId>e32a2bfe-254a-42d6-b533-255570389045</elementGuidId>
<selectorCollection>
<entry>
- <key>XPATH</key>
- <value>div[data-test="role-selector"] button</value>
- <value>//div[contains(text(),'Editor in Chief')]</value>
+ <key>CSS</key>
+ <value>//div[contains(text(),"Admin")]</value>
</entry>
<entry>
- <key>CSS</key>
- <value>div[data-test="role-selector"] div[role="option"]:last-child</value>
+ <key>XPATH</key>
+ <value>//div[contains(text(),'Editor in Chief')]</value>
</entry>
</selectorCollection>
<selectorMethod>CSS</selectorMethod>
diff --git a/automation/Object Repository/NewUser/users.rs b/automation/Object Repository/NewUser/users.rs
index bd2c23d47..d15f67c2f 100644
--- a/automation/Object Repository/NewUser/users.rs
+++ b/automation/Object Repository/NewUser/users.rs
@@ -8,15 +8,13 @@
<entry>
<key>CSS</key>
<value>div[data-test="card-users"]</value>
- <key>XPATH</key>
- <value>//span[contains(text(),'Users')]</value>
</entry>
<entry>
- <key>CSS</key>
- <value>//span[contains(text(),'Users')]</value>
+ <key>XPATH</key>
+ <value></value>
</entry>
</selectorCollection>
- <selectorMethod>XPATH</selectorMethod>
+ <selectorMethod>CSS</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
<webElementProperties>
<isSelected>true</isSelected>
diff --git a/automation/Object Repository/SignIn/LoginButton.rs b/automation/Object Repository/SignIn/LoginButton.rs
deleted file mode 100644
index 9685dc059..000000000
--- a/automation/Object Repository/SignIn/LoginButton.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<WebElementEntity>
- <description></description>
- <name>LoginButton</name>
- <tag></tag>
- <elementGuidId>4bf556e3-9a8c-4577-ac69-f0ba05bf79a6</elementGuidId>
- <selectorCollection>
- <entry>
- <key>CSS</key>
- <value>button[type="submit"]</value>
- </entry>
- </selectorCollection>
- <selectorMethod>CSS</selectorMethod>
- <useRalativeImagePath>false</useRalativeImagePath>
- <webElementProperties>
- <isSelected>true</isSelected>
- <matchCondition>equals</matchCondition>
- <name>tag</name>
- <type>Main</type>
- <value>button</value>
- </webElementProperties>
- <webElementProperties>
- <isSelected>true</isSelected>
- <matchCondition>equals</matchCondition>
- <name>type</name>
- <type>Main</type>
- <value>submit</value>
- </webElementProperties>
- <webElementProperties>
- <isSelected>false</isSelected>
- <matchCondition>equals</matchCondition>
- <name>class</name>
- <type>Main</type>
- <value>Login-local_button-2V-wyVs0 sc-kgoBCf jJDfiI</value>
- </webElementProperties>
- <webElementProperties>
- <isSelected>true</isSelected>
- <matchCondition>equals</matchCondition>
- <name>text</name>
- <type>Main</type>
- <value>Login</value>
- </webElementProperties>
- <webElementProperties>
- <isSelected>false</isSelected>
- <matchCondition>equals</matchCondition>
- <name>xpath</name>
- <type>Main</type>
- <value>id("root")/div[@class="sc-fyjhYU bulmcW"]/div[@class="sc-ugnQR hguLEQ"]/div[@class="Login-local_root-28yxoK4a"]/form[@class="Login-local_form-N-RCy5To"]/button[@class="Login-local_button-2V-wyVs0 sc-kgoBCf jJDfiI"]</value>
- </webElementProperties>
-</WebElementEntity>
diff --git a/automation/Object Repository/NewUser/login.rs b/automation/Object Repository/SignIn/login.rs
similarity index 76%
rename from automation/Object Repository/NewUser/login.rs
rename to automation/Object Repository/SignIn/login.rs
index 43a596efe..26e8a4bdc 100644
--- a/automation/Object Repository/NewUser/login.rs
+++ b/automation/Object Repository/SignIn/login.rs
@@ -3,7 +3,7 @@
<description></description>
<name>login</name>
<tag></tag>
- <elementGuidId>13c40cbc-2634-4147-b93b-717f7ea9cc2b</elementGuidId>
+ <elementGuidId>4bf556e3-9a8c-4577-ac69-f0ba05bf79a6</elementGuidId>
<selectorCollection>
<entry>
<key>CSS</key>
@@ -31,7 +31,7 @@
<matchCondition>equals</matchCondition>
<name>class</name>
<type>Main</type>
- <value>sc-jTzLTM jwsELq</value>
+ <value>Login-local_button-2V-wyVs0 sc-kgoBCf jJDfiI</value>
</webElementProperties>
<webElementProperties>
<isSelected>true</isSelected>
@@ -45,6 +45,6 @@
<matchCondition>equals</matchCondition>
<name>xpath</name>
<type>Main</type>
- <value>id("root")/div[@class="sc-cmTdod hZxvxw"]/div[@class="sc-dyGzUR bQYZEl"]/div[@class="sc-drKuOJ fmUpkt"]/div[@class="sc-TOsTZ beQaWr"]/form[1]/button[@class="sc-jTzLTM jwsELq"]</value>
+ <value>id("root")/div[@class="sc-fyjhYU bulmcW"]/div[@class="sc-ugnQR hguLEQ"]/div[@class="Login-local_root-28yxoK4a"]/form[@class="Login-local_form-N-RCy5To"]/button[@class="Login-local_button-2V-wyVs0 sc-kgoBCf jJDfiI"]</value>
</webElementProperties>
</WebElementEntity>
diff --git a/automation/Object Repository/SignIn/passwordField.rs b/automation/Object Repository/SignIn/password.rs
similarity index 98%
rename from automation/Object Repository/SignIn/passwordField.rs
rename to automation/Object Repository/SignIn/password.rs
index 915da5924..3a943369d 100644
--- a/automation/Object Repository/SignIn/passwordField.rs
+++ b/automation/Object Repository/SignIn/password.rs
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<WebElementEntity>
<description></description>
- <name>passwordField</name>
+ <name>password</name>
<tag></tag>
<elementGuidId>4f096b22-ebe7-4747-99f7-50595df00fae</elementGuidId>
<selectorCollection>
diff --git a/automation/Object Repository/SignIn/usernameField.rs b/automation/Object Repository/SignIn/username.rs
similarity index 97%
rename from automation/Object Repository/SignIn/usernameField.rs
rename to automation/Object Repository/SignIn/username.rs
index 33f5eee37..767d40783 100644
--- a/automation/Object Repository/SignIn/usernameField.rs
+++ b/automation/Object Repository/SignIn/username.rs
@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<WebElementEntity>
<description></description>
- <name>usernameField</name>
+ <name>username</name>
<tag></tag>
<elementGuidId>c24bfa98-382a-45ef-9e36-671d6c2276bb</elementGuidId>
<selectorCollection>
- <entry>
- <key>CSS</key>
- <value>input[name="username"]</value>
- </entry>
<entry>
<key>XPATH</key>
- <value></value>
</entry>
<entry>
<key>BASIC</key>
<value>//input[@type = 'text' and @name = 'username']</value>
</entry>
+ <entry>
+ <key>CSS</key>
+ <value>input[name="username"]</value>
+ </entry>
</selectorCollection>
<selectorMethod>CSS</selectorMethod>
<useRalativeImagePath>false</useRalativeImagePath>
diff --git a/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy b/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy
index 6ef2f77f0..1c0835fc4 100644
--- a/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy
+++ b/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy
@@ -20,87 +20,61 @@ import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
import internal.GlobalVariable as GlobalVariable
WebUI.openBrowser(null)
-
WebUI.navigateToUrl('https://xpub-faraday.now.sh')
-username = findTestObject('NewUser/username')
-
+username = findTestObject('SignIn/username')
WebUI.click(username)
-
WebUI.setText(username, 'admin')
-password = findTestObject('NewUser/password')
-
+password = findTestObject('SignIn/password')
WebUI.click(password)
-
WebUI.setText(password, 'admin123')
-login = findTestObject('NewUser/login')
-
+login = findTestObject('SignIn/login')
WebUI.click(login)
admin = findTestObject("NewUser/adminButton")
WebUI.click(admin)
adminDashboard = findTestObject('NewUser/adminDashboard')
-
WebUI.click(adminDashboard)
users = findTestObject('NewUser/users')
-
WebUI.waitForElementVisible(users, 2)
-
WebUI.click(users)
addUser = findTestObject('NewUser/addUser')
-
WebUI.click(addUser)
email = findTestObject('NewUser/email')
-
WebUI.click(email)
-<<<<<<< HEAD
-WebUI.setText(email, 'vlad.stegaru+newestUser@thinslices.com')
-=======
->>>>>>> e85cabdf8bb80ea1284bf832b47b990be81d0c03
-
+//WebUI.setText(email, 'vlad.stegaru+newestUser@thinslices.com')
WebUI.setText(email, 'bogdan.cochior+author@thinslices.com')
roleDropDown = findTestObject('NewUser/roleDropDown')
-
WebUI.click(roleDropDown)
author = findTestObject('NewUser/author')
-
WebUI.click(author)
firstName = findTestObject('NewUser/firstName')
-
WebUI.click(firstName)
-
WebUI.setText(firstName, 'Bogdan Author')
lastName = findTestObject('NewUser/lastName')
-
WebUI.click(lastName)
-
WebUI.setText(lastName, 'Test')
affiliation = findTestObject('NewUser/affiliation')
-
WebUI.click(affiliation)
-
WebUI.setText(affiliation, 'College')
title = findTestObject('NewUser/titleDropDown')
-
WebUI.click(title)
dr = findTestObject('NewUser/Dr')
-
WebUI.click(dr)
save = findTestObject('NewUser/save')
-
WebUI.click(save)
diff --git a/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy b/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy
index ed89330b1..c8edce52e 100644
--- a/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy
+++ b/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy
@@ -21,39 +21,24 @@ import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
import internal.GlobalVariable as GlobalVariable
import org.junit.After as After
import org.openqa.selenium.Keys as Keys
-import java.util.*
-WebUI.openBrowser(null)
+WebUI.openBrowser(null)
WebUI.navigateToUrl('https://xpub-faraday.now.sh')
-username = findTestObject('SignIn/usernameField')
-
+username = findTestObject('SignIn/username')
WebUI.click(username)
-
WebUI.setText(username, 'admin')
-password = findTestObject('SignIn/passwordField')
-
+password = findTestObject('SignIn/password')
WebUI.click(password)
-
WebUI.setText(password, 'admin123')
-loginButton = findTestObject('SignIn/LoginButton')
-
+loginButton = findTestObject('SignIn/login')
WebUI.click(loginButton)
-/*manuscriptBoard = findTestObject("Resume/manuscriptBoard")
-
-def manuscriptIds = []
-for(i= 0; i=manuscriptIds.size(); i++){
-
- manuscriptIds << newButton = findTestObject('NewManuscript/journalfFieldSelection/New')
-
- WebUI.click(newButton)
-}*/
-
-//GlobalVariable.G_manuscriptID = '1231234'
+New = findTestObject("NewManuscript/journalfFieldSelection/New")
+WebUI.click(New)
journal = findTestObject('NewManuscript/journalfFieldSelection/Journal')
WebUI.click(journal)
@@ -61,17 +46,13 @@ WebUI.click(journal)
hindawiFaraday = findTestObject('NewManuscript/journalfFieldSelection/HindawiFaraday')
WebUI.click(hindawiFaraday)
-
issue = findTestObject('NewManuscript/journalfFieldSelection/Issue')
-
WebUI.click(issue)
regularIssues = findTestObject('NewManuscript/journalfFieldSelection/RegularIssues')
-
WebUI.click(regularIssues)
nextButton = findTestObject('NewManuscript/journalfFieldSelection/Next')
-
WebUI.click(nextButton)
hasEmail = findTestObject('NewManuscript/preSubmissionChecklist/hasEmail')
@@ -97,72 +78,59 @@ WebUI.click(Next)
manuscriptTitle = findTestObject('NewManuscript/manuscriptAuthorsDetails/manuscriptTitle')
WebUI.click(manuscriptTitle)
-
WebUI.sendKeys(manuscriptTitle, 'A new random title')
manuscriptType = findTestObject('NewManuscript/manuscriptAuthorsDetails/manuscriptType')
WebUI.click(manuscriptType)
-research = findTestObject('NewManuscript/manuscriptAuthorsDetails/review')
-
+research = findTestObject('NewManuscript/manuscriptAuthorsDetails/Research')
WebUI.click(research)
abstractField = findTestObject('NewManuscript/manuscriptAuthorsDetails/abstractField')
-
WebUI.click(abstractField)
-
WebUI.sendKeys(abstractField, 'A new random abstract text')
addAuthor = findTestObject('NewManuscript/manuscriptAuthorsDetails/addAuthor')
-
WebUI.click(addAuthor)
firstName = findTestObject('NewManuscript/manuscriptAuthorsDetails/firstName')
-
WebUI.setText(firstName, 'Vlad')
lastName = findTestObject('NewManuscript/manuscriptAuthorsDetails/lastName')
-
WebUI.setText(lastName, 'Stegaru')
email = findTestObject('NewManuscript/manuscriptAuthorsDetails/email')
-
WebUI.setText(email, 'vlad.stegaru+newuser1@thinslices.com')
affiliation = findTestObject('NewManuscript/manuscriptAuthorsDetails/affiliation')
-
WebUI.setText(affiliation, 'University')
country = findTestObject('NewManuscript/manuscriptAuthorsDetails/country')
-
WebUI.click(country)
-Canada = findTestObject('NewManuscript/manuscriptAuthorsDetails/countryOption')
-
-WebUI.click(Canada)
+countryOption = findTestObject('NewManuscript/manuscriptAuthorsDetails/countryOption')
+WebUI.click(countryOption)
SaveButton = findTestObject('NewManuscript/manuscriptAuthorsDetails/Save')
-
WebUI.click(SaveButton)
-noButton = findTestObject('NewManuscript/manuscriptAuthorsDetails/no')
+submittingAuthor = findTestObject("NewManuscript/manuscriptAuthorsDetails/submittingAuthor")
+WebUI.waitForElementPresent(submittingAuthor, 10)
+noButton = findTestObject('NewManuscript/manuscriptAuthorsDetails/no')
WebUI.click(noButton)
NextButton = findTestObject('NewManuscript/manuscriptAuthorsDetails/Next')
-
WebUI.click(NextButton)
-//attachFile = findTestObject('NewManuscript/manuscriptFilesUpload/attachManuscript')
+attachFile = findTestObject('NewManuscript/manuscriptFilesUpload/attachManuscript')
-//WebUI.uploadFile(attachFile, '/Users/vladstegaru/Documents/Hindawi/attachements/document.pdf')
+WebUI.uploadFile(attachFile, '/Users/vladstegaru/Documents/Hindawi/attachements/document.pdf')
submitManuscript = findTestObject('NewManuscript/manuscriptFilesUpload/submitManuscript')
-
WebUI.click(submitManuscript)
goToDashboard = findTestObject('Resume/goToDashboard')
-
WebUI.click(goToDashboard)
WebUI.closeBrowser()
diff --git a/automation/Scripts/Add a new user/Edit new user/Script1521147575383.groovy b/automation/Scripts/Edit a new user/Edit new user/Script1521147575383.groovy
similarity index 75%
rename from automation/Scripts/Add a new user/Edit new user/Script1521147575383.groovy
rename to automation/Scripts/Edit a new user/Edit new user/Script1521147575383.groovy
index 8302d316f..2842d6e3a 100644
--- a/automation/Scripts/Add a new user/Edit new user/Script1521147575383.groovy
+++ b/automation/Scripts/Edit a new user/Edit new user/Script1521147575383.groovy
@@ -22,15 +22,15 @@ import internal.GlobalVariable as GlobalVariable
WebUI.openBrowser(null)
WebUI.navigateToUrl('https://xpub-faraday.now.sh')
-username = findTestObject("NewUser/username")
+username = findTestObject("SignIn/username")
WebUI.click(username)
WebUI.setText(username, 'admin')
-password = findTestObject("NewUser/password")
+password = findTestObject("SignIn/password")
WebUI.click(password)
WebUI.setText(password, 'admin123')
-login = findTestObject("NewUser/login")
+login = findTestObject("SignIn/login")
WebUI.click(login)
admin = findTestObject("NewUser/adminButton")
@@ -40,38 +40,37 @@ adminDashboard = findTestObject("NewUser/adminDashboard")
WebUI.click(adminDashboard)
users = findTestObject("NewUser/users")
-WebUI.waitForElementVisible(users, 2)
WebUI.click(users)
-editUserVlad = findTestObject("NuewUser/td_vlad.stegarunewuserthinslic")
-WebUI.mouseOver(editUserVlad)
-WebUI.waitForElementVisible(edit, 2)
+admin = findTestObject("EditUser/td_admin")
+WebUI.mouseOver(admin)
+WebUI.waitForElementVisible(admin, 2)
-edit = findTestObject("NewUSer/a_Edit")
+edit = findTestObject("EditUser/a_Edit")
WebUI.click(edit)
-firstName = findTestObject("NewUser/firstName")
+firstName = findTestObject("EditUser/firstName")
WebUI.click(firstName)
WebUI.setText(firstName, 'John')
-lastName = findTestObject("NewUser/lastName")
+lastName = findTestObject("EditUser/lastName")
WebUI.click(lastName)
WebUI.setText(lastName, 'Smith')
-affiliation = findTestObject("NewUser/affiliation")
+affiliation = findTestObject("EditUser/affiliation")
WebUI.click(affiliation)
WebUI.setText(affiliation, 'University')
-title = findTestObject("NewUser/titleDropDown")
+title = findTestObject("EditUser/titleDropDown")
WebUI.click(title)
-dr = findTestObject("NewUser/dr")
-WebUI.click(dr)
+professor = findTestObject("EditUser/Professor")
+WebUI.click(professor)
-editorInChief = findTestObject("NewUser/editorInChief")
+editorInChief = findTestObject("EditUser/editorInChief")
WebUI.click(editorInChief)
-save = findTestObject("NewUser/save")
+save = findTestObject("EditUser/save")
WebUI.click(save)
diff --git a/automation/Scripts/Filter Manuscripts/Filter the manuscripts/Script1521714001455.groovy b/automation/Scripts/Filter Manuscripts/Filter the manuscripts/Script1521714001455.groovy
index 63b91bc13..2f5c694df 100644
--- a/automation/Scripts/Filter Manuscripts/Filter the manuscripts/Script1521714001455.groovy
+++ b/automation/Scripts/Filter Manuscripts/Filter the manuscripts/Script1521714001455.groovy
@@ -23,19 +23,19 @@ WebUI.openBrowser(null)
WebUI.navigateToUrl('xpub-faraday.now.sh')
-username = findTestObject('SignIn/usernameField')
+username = findTestObject('SignIn/username')
WebUI.click(username)
WebUI.setText(username, 'admin')
-password = findTestObject('SignIn/passwordField')
+password = findTestObject('SignIn/password')
WebUI.click(password)
WebUI.setText(password, 'admin123')
-loginButton = findTestObject('SignIn/LoginButton')
+loginButton = findTestObject('SignIn/login')
WebUI.click(loginButton)
diff --git a/automation/Scripts/Resume Manuscript/Resume submission Redirect/Script1520866853834.groovy b/automation/Scripts/Resume Manuscript/Resume submission Redirect/Script1520866853834.groovy
index 323746b8a..d2563a44f 100644
--- a/automation/Scripts/Resume Manuscript/Resume submission Redirect/Script1520866853834.groovy
+++ b/automation/Scripts/Resume Manuscript/Resume submission Redirect/Script1520866853834.groovy
@@ -25,20 +25,19 @@ WebUI.openBrowser(null)
WebUI.navigateToUrl('https://xpub-faraday.now.sh')
-username = findTestObject('SignIn/usernameField')
+username = findTestObject('SignIn/username')
WebUI.click(username)
WebUI.setText(username, 'admin')
-password = findTestObject('SignIn/passwordField')
+password = findTestObject('SignIn/password')
WebUI.click(password)
WebUI.setText(password, 'admin123')
-loginButton = findTestObject('SignIn/LoginButton')
+loginButton = findTestObject('SignIn/login')
WebUI.click(loginButton)
resumeSubmission = findTestObject('Resume/resumeSubmission')
WebUI.click(resumeSubmission)
-WebUI.waitForPageLoad(2, FailureHandling.STOP_ON_FAILURE)
cancel = findTestObject("NewManuscript/journalAndFieldSelection/Cancel")
WebUI.waitForElementVisible(cancel, 2)
diff --git a/automation/Scripts/Resume submission Redirect/Script1520866853834.groovy b/automation/Scripts/Resume submission Redirect/Script1520866853834.groovy
deleted file mode 100644
index 1f5ad7619..000000000
--- a/automation/Scripts/Resume submission Redirect/Script1520866853834.groovy
+++ /dev/null
@@ -1,46 +0,0 @@
-import static com.kms.katalon.core.checkpoint.CheckpointFactory.findCheckpoint
-import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase
-import static com.kms.katalon.core.testdata.TestDataFactory.findTestData
-import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject
-import java.util.concurrent.CancellationException as CancellationException
-import org.junit.After as After
-import com.kms.katalon.core.checkpoint.Checkpoint as Checkpoint
-import com.kms.katalon.core.checkpoint.CheckpointFactory as CheckpointFactory
-import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as MobileBuiltInKeywords
-import com.kms.katalon.core.mobile.keyword.MobileBuiltInKeywords as Mobile
-import com.kms.katalon.core.model.FailureHandling as FailureHandling
-import com.kms.katalon.core.testcase.TestCase as TestCase
-import com.kms.katalon.core.testcase.TestCaseFactory as TestCaseFactory
-import com.kms.katalon.core.testdata.TestData as TestData
-import com.kms.katalon.core.testdata.TestDataFactory as TestDataFactory
-import com.kms.katalon.core.testobject.ObjectRepository as ObjectRepository
-import com.kms.katalon.core.testobject.TestObject as TestObject
-import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WSBuiltInKeywords
-import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS
-import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUiBuiltInKeywords
-import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
-import internal.GlobalVariable as GlobalVariable
-
-WebUI.openBrowser(null)
-
-WebUI.navigateToUrl('http://localhost:3000')
-
-username = findTestObject('SignIn/usernameField')
-WebUI.click(username)
-WebUI.setText(username, 'vlad')
-
-password = findTestObject('SignIn/passwordField')
-WebUI.click(password)
-WebUI.setText(password, '123123123')
-
-loginButton = findTestObject('SignIn/LoginButton')
-WebUI.click(loginButton)
-
-New = findTestObject("NewManuscript/journalFieldSelection/New")
-WebUI.click(New)
-
-resumeSubmission = findTestObject('Resume/resumeSubmission')
-WebUI.click(resumeSubmission)
-
-cancel = findTestObject("NewManuscript/journalFieldSelection/Cancel")
-WebUI.click(cancel)
diff --git a/automation/Scripts/Sign In/Sign In flow/Script1520414607328.groovy b/automation/Scripts/Sign In/Sign In flow/Script1520414607328.groovy
index 4d3266de8..e07efc4c3 100644
--- a/automation/Scripts/Sign In/Sign In flow/Script1520414607328.groovy
+++ b/automation/Scripts/Sign In/Sign In flow/Script1520414607328.groovy
@@ -29,15 +29,15 @@ WebUI.openBrowser(null)
WebUI.navigateToUrl('http://localhost:3000')
-WebUI.click(findTestObject('SignIn/usernameField'))
+WebUI.click(findTestObject('SignIn/username'))
-WebUI.setText(findTestObject('SignIn/usernameField'), "vlad")
+WebUI.setText(findTestObject('SignIn/username'), "vlad")
-WebUI.click(findTestObject('SignIn/passwordField'))
+WebUI.click(findTestObject('SignIn/password'))
-WebUI.setText(findTestObject('SignIn/passwordField'), "123123123")
+WebUI.setText(findTestObject('SignIn/password'), "123123123")
-WebUI.click(findTestObject('SignIn/LoginButton'))
+WebUI.click(findTestObject('SignIn/login'))
diff --git a/automation/Test Cases/Add a new user/Edit new user.tc b/automation/Test Cases/Edit a new user/Edit new user.tc
similarity index 100%
rename from automation/Test Cases/Add a new user/Edit new user.tc
rename to automation/Test Cases/Edit a new user/Edit new user.tc
diff --git a/automation/Test Cases/Resume submission Redirect.tc b/automation/Test Cases/Resume submission Redirect.tc
deleted file mode 100644
index 8b49244b5..000000000
--- a/automation/Test Cases/Resume submission Redirect.tc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCaseEntity>
- <description></description>
- <name>Resume submission Redirect</name>
- <tag></tag>
- <comment></comment>
- <testCaseGuid>b1e8c453-0030-4896-9e4a-770f07525309</testCaseGuid>
-</TestCaseEntity>
diff --git a/automation/Test Suites/firstTS.ts b/automation/Test Suites/firstTS.ts
index b314efc6d..854f47459 100644
--- a/automation/Test Suites/firstTS.ts
+++ b/automation/Test Suites/firstTS.ts
@@ -10,22 +10,4 @@
<pageLoadTimeoutDefault>true</pageLoadTimeoutDefault>
<rerunFailedTestCasesOnly>false</rerunFailedTestCasesOnly>
<testSuiteGuid>f13b4374-3272-420a-8e20-e8751334e62d</testSuiteGuid>
- <testCaseLink>
- <guid>03b92392-1421-4db8-b800-d82f1d688a71</guid>
- <isReuseDriver>false</isReuseDriver>
- <isRun>true</isRun>
- <testCaseId>Test Cases/Add new manuscript/Add a new manuscript</testCaseId>
- <variableLink>
- <testDataLinkId></testDataLinkId>
- <type>SCRIPT_VARIABLE</type>
- <value>null</value>
- <variableId>30a84231-84ba-44cb-9eec-26ad7d97acd5</variableId>
- </variableLink>
- </testCaseLink>
- <testCaseLink>
- <guid>99bf045f-3219-4350-8823-3217d4676eb9</guid>
- <isReuseDriver>false</isReuseDriver>
- <isRun>true</isRun>
- <testCaseId>Test Cases/Resume submission Redirect</testCaseId>
- </testCaseLink>
</TestSuiteEntity>
--
GitLab