Skip to content

Commit 802928a

Browse files
Merge pull request #24 from aquality-automation/add-empty-email-check
Add empty email check
2 parents 9bf4b0a + c533b33 commit 802928a

File tree

6 files changed

+43
-10
lines changed

6 files changed

+43
-10
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2022 Aquality Automation
189+
Copyright 2023 Aquality Automation
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

aquality-selenium-template-cucumber/src/test/java/aquality/selenium/template/cucumber/features/Demo.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Feature: Demo
88
When I fill contact form using following data:
99
| Name | Peter Parker |
1010
| Company | Aquality Automation |
11-
| Email | aquality-auto@a1qa.com |
1211
| Phone | +44 208 816 7320 |
1312
| Comment | I'd like to contact you! |
1413
And I accept Privacy and Cookies Policy

aquality-selenium-template-cucumber/src/test/java/aquality/selenium/template/cucumber/stepdefinitions/ui/ContactUsPageSteps.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public void fillContactUsPage(@Transpose ContactUsInfo contactUsInfo) {
2626
contactUsPage.setName(contactUsInfo.getName())
2727
.setCompany(contactUsInfo.getCompany())
2828
.setPhone(contactUsInfo.getPhone())
29-
.setEmail(contactUsInfo.getEmail())
3029
.setComment(contactUsInfo.getComment());
3130
}
3231

aquality-selenium-template/src/main/java/aquality/selenium/template/forms/pages/ContactUsPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ContactUsPage extends BaseAppForm {
1717
private final ITextBox txbComment = getElementFactory().getTextBox(By.id("your-message"), "Comment");
1818
private final ICheckBox cmbPrivacy = getElementFactory().getCheckBox(By.name("privacy"), "Privacy", ElementState.EXISTS_IN_ANY_STATE);
1919
private final IButton btnSend = getElementFactory().getButton(By.xpath("//*[contains(@class,'contactsForm__submit')]//button"), "Send");
20-
private final ILabel lblEmailAlert = getElementFactory().getLabel(By.id("modal-contacts-thanks"), "Email validating message");
20+
private final ILabel lblEmailAlert = getElementFactory().getLabel(By.xpath("//div[contains(@class,'error')]//input[@id='your-email']"), "Email validating message");
2121

2222
public ContactUsPage(){
2323
super(By.xpath("//section[contains(@class,'contactsForm')]"), "Contact Us");

aquality-selenium-template/src/main/resources/settings.json

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@
99
"chrome": {
1010
"webDriverVersion": "latest",
1111
"capabilities": {
12-
"enableVNC": true
1312
},
1413
"options": {
1514
"intl.accept_languages": "en",
1615
"safebrowsing.enabled": "true",
1716
"profile.default_content_settings.popups": "0",
1817
"disable-popup-blocking": "true",
1918
"download.prompt_for_download": "false",
20-
"download.default_directory": "//home//selenium//downloads"
19+
"download.default_directory": "./downloads"
20+
},
21+
"loggingPreferences": {
22+
"Performance": "All"
2123
},
2224
"startArguments": [
2325
"window-size=1920,1080",
@@ -28,14 +30,31 @@
2830
"--headless"
2931
]
3032
},
33+
"edge": {
34+
"webDriverVersion": "latest",
35+
"capabilities": {
36+
},
37+
"options": {
38+
"intl.accept_languages": "en",
39+
"safebrowsing.enabled": "true",
40+
"profile.default_content_settings.popups": "0",
41+
"disable-popup-blocking": "true",
42+
"download.prompt_for_download": "false",
43+
"download.default_directory": "./downloads"
44+
},
45+
"loggingPreferences": {
46+
"Performance": "All"
47+
},
48+
"startArguments": []
49+
},
3150
"firefox": {
3251
"webDriverVersion": "latest",
3352
"capabilities": {
3453
"enableVNC": true
3554
},
3655
"options": {
3756
"intl.accept_languages": "en",
38-
"browser.download.dir": "//home//selenium//downloads",
57+
"browser.download.dir": "./downloads",
3958
"browser.download.folderList": 2,
4059
"browser.helperApps.neverAsk.saveToDisk": "application/octet-stream, application/x-debian-package, application/x-www-form-urlencod, application/json, application/x-compressed, application/x-zip-compressed, application/zip, multipart/x-zip, text/plain, text/csv",
4160
"browser.helperApps.alwaysAsk.force": false,
@@ -57,6 +76,21 @@
5776
"ignoreProtectedModeSettings": true
5877
}
5978
},
79+
"opera": {
80+
"webDriverVersion": "latest",
81+
"binaryLocation": "%USERPROFILE%\\AppData\\Local\\Programs\\Opera\\launcher.exe",
82+
"capabilities": {
83+
},
84+
"options": {
85+
"intl.accept_languages": "en",
86+
"safebrowsing.enabled": "true",
87+
"profile.default_content_settings.popups": "0",
88+
"disable-popup-blocking": "true",
89+
"download.prompt_for_download": "false",
90+
"download.default_directory": "./downloads"
91+
},
92+
"startArguments": ["--remote-debugging-port=9222", "--no-sandbox", "--disable-dev-shm-usage"]
93+
},
6094
"safari": {
6195
"downloadDir": "/Users/username/Downloads"
6296
}
@@ -74,7 +108,8 @@
74108
"pollingInterval": 300
75109
},
76110
"logger": {
77-
"language": "en"
111+
"language": "en",
112+
"logPageSource": true
78113
},
79114
"elementCache": {
80115
"isEnabled": false

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424

2525
<properties>
2626
<aspectj.version>1.8.10</aspectj.version>
27-
<restassured.version>5.2.0</restassured.version>
27+
<restassured.version>5.3.0</restassured.version>
2828
<data.provider.thread.count>4</data.provider.thread.count>
2929
</properties>
3030

3131
<dependencies>
3232
<dependency>
3333
<groupId>com.github.aquality-automation</groupId>
3434
<artifactId>aquality-selenium</artifactId>
35-
<version>3.1.0</version>
35+
<version>3.2.0</version>
3636
</dependency>
3737

3838
<dependency>

0 commit comments

Comments
 (0)