Skip to content

Commit f8178d3

Browse files
php-coderphp-coder
committed
refactor(WhenUserAddSeries): port catalogNumbersShouldAcceptValidValues() to Robot Framework.
Also remove a similar test from misc-admin.robot: one test for that case is enough. If this will be broken only for admin it won't be so critical as when it's broken for users. Addressed to #530 No functional changes.
1 parent 93b087f commit f8178d3

File tree

3 files changed

+29
-61
lines changed

3 files changed

+29
-61
lines changed

‎src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.testng.annotations.AfterClass;
2222
import org.testng.annotations.BeforeClass;
2323
import org.testng.annotations.BeforeMethod;
24-
import org.testng.annotations.DataProvider;
2524
import org.testng.annotations.Test;
2625
import ru.mystamps.web.Url;
2726
import ru.mystamps.web.tests.page.AbstractPage;
@@ -98,27 +97,6 @@ public void tearDown() {
9897
page.logout();
9998
}
10099

101-
@Test(groups = "valid", dataProvider = "validCatalogNumbers")
102-
public void catalogNumbersShouldAcceptValidValues(String numbers, Object whatever) {
103-
page.showCatalogNumbers();
104-
105-
page.fillMichelNumbers(numbers);
106-
page.fillScottNumbers(numbers);
107-
page.fillYvertNumbers(numbers);
108-
page.fillGibbonsNumbers(numbers);
109-
page.fillSolovyovNumbers(numbers);
110-
page.fillZagorskiNumbers(numbers);
111-
112-
page.submit();
113-
114-
assertThat(page).field("michelNumbers").hasNoError();
115-
assertThat(page).field("scottNumbers").hasNoError();
116-
assertThat(page).field("yvertNumbers").hasNoError();
117-
assertThat(page).field("gibbonsNumbers").hasNoError();
118-
assertThat(page).field("solovyovNumbers").hasNoError();
119-
assertThat(page).field("zagorskiNumbers").hasNoError();
120-
}
121-
122100
@Test(groups = "misc")
123101
public void catalogNumbersShouldBeStripedFromSpaces() {
124102
page.showCatalogNumbers();
@@ -140,7 +118,7 @@ public void catalogNumbersShouldBeStripedFromSpaces() {
140118
assertThat(page).field("zagorskiNumbers").hasValue("11,12");
141119
}
142120

143-
@Test(groups = "logic", dependsOnGroups = { "valid", "misc" })
121+
@Test(groups = "logic", dependsOnGroups = { "misc" })
144122
public void shouldCreateSeriesWithOnlyRequiredFieldsFilled() {
145123
String expectedCategoryName = validCategoryName;
146124
String expectedQuantity = "2";
@@ -167,7 +145,7 @@ public void shouldCreateSeriesWithOnlyRequiredFieldsFilled() {
167145
assertThat(nextPage.getPerforated()).isEqualTo(tr("t_yes"));
168146
}
169147

170-
@Test(groups = "logic", dependsOnGroups = { "valid", "misc" })
148+
@Test(groups = "logic", dependsOnGroups = { "misc" })
171149
public void shouldCreateSeriesWithAllFieldsFilled() {
172150
String expectedPageUrl = Url.INFO_SERIES_PAGE.replace("{id}", "\\d+");
173151
String expectedImageUrl = Url.SITE + Url.GET_IMAGE_PREVIEW_PAGE.replace("{id}", "\\d+");
@@ -237,7 +215,7 @@ public void shouldCreateSeriesWithAllFieldsFilled() {
237215
assertThat(nextPage.getZagorskiCatalogInfo()).isEqualTo("#50-52 (150.2 RUB)");
238216
}
239217

240-
@Test(groups = "logic", dependsOnGroups = { "valid", "misc" })
218+
@Test(groups = "logic", dependsOnGroups = { "misc" })
241219
public void shouldIgnoreDuplicatedCatalogNumbers() {
242220
page.fillCategory(validCategoryName);
243221
page.fillQuantity("2");
@@ -263,7 +241,7 @@ public void shouldIgnoreDuplicatedCatalogNumbers() {
263241
assertThat(nextPage.getZagorskiCatalogInfo()).isEqualTo("#54, 55");
264242
}
265243

266-
@Test(groups = "logic", dependsOnGroups = { "valid", "misc" })
244+
@Test(groups = "logic", dependsOnGroups = { "misc" })
267245
public void shouldAllowExistingCatalogNumbers() {
268246
page.fillCategory(validCategoryName);
269247
page.fillQuantity("2");
@@ -288,14 +266,4 @@ public void shouldAllowExistingCatalogNumbers() {
288266
assertThat(nextPage.getZagorskiCatalogInfo()).isEqualTo("#" + existingZagorskiNumber);
289267
}
290268

291-
@DataProvider(name = "validCatalogNumbers")
292-
public Object[][] getValidCatalogNumbers() {
293-
return new Object[][] {
294-
{"7", null},
295-
{"7,8", null},
296-
{"71, 81, 91", null},
297-
{"1000", null}
298-
};
299-
}
300-
301269
}

‎src/test/robotframework/series/creation/misc-admin.robot

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ Suite Teardown After Test Suite
77
Force Tags series misc
88

99
*** Test Cases ***
10-
Catalog numbers should accept valid values
11-
[Tags] unstable
12-
[Template] Valid Catalog Numbers Should Be Accepted
13-
7
14-
7,8
15-
71, 81, 91
16-
1000
17-
1810
Catalog numbers should be stripped from leading and trailing spaces
1911
[Tags] unstable
2012
Click Element id=add-catalog-numbers-link
@@ -89,20 +81,3 @@ Before Test Suite
8981
After Test Suite
9082
Log Out
9183
Close Browser
92-
93-
Valid Catalog Numbers Should Be Accepted
94-
[Arguments] ${catalogNumbers}
95-
Click Element id=add-catalog-numbers-link
96-
Input Text id=michelNumbers ${catalogNumbers}
97-
Input Text id=scottNumbers ${catalogNumbers}
98-
Input Text id=yvertNumbers ${catalogNumbers}
99-
Input Text id=gibbonsNumbers ${catalogNumbers}
100-
Input Text id=solovyovNumbers ${catalogNumbers}
101-
Input Text id=zagorskiNumbers ${catalogNumbers}
102-
Submit Form id=add-series-form
103-
Page Should Not Contain Element id=michelNumbers.errors
104-
Page Should Not Contain Element id=scottNumbers.errors
105-
Page Should Not Contain Element id=yvertNumbers.errors
106-
Page Should Not Contain Element id=gibbonsNumbers.errors
107-
Page Should Not Contain Element id=solovyovNumbers.errors
108-
Page Should Not Contain Element id=zagorskiNumbers.errors

‎src/test/robotframework/series/creation/misc-user.robot

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ Issue year should have options for range from 1840 to the current year
1919
List Should Contain Value ${availableYears} ${currentYear}
2020
Should Be Equal As Integers ${numberOfYears} ${expectedNumberOfYears}
2121

22+
Catalog numbers should accept valid values
23+
[Tags] unstable
24+
[Template] Valid Catalog Numbers Should Be Accepted
25+
7
26+
7,8
27+
71, 81, 91
28+
1000
29+
2230
*** Keywords ***
2331
Before Test Suite
2432
Open Browser ${SITE_URL}/account/auth ${BROWSER}
@@ -29,3 +37,20 @@ Before Test Suite
2937
After Test Suite
3038
Log Out
3139
Close Browser
40+
41+
Valid Catalog Numbers Should Be Accepted
42+
[Arguments] ${catalogNumbers}
43+
Click Element id=add-catalog-numbers-link
44+
Input Text id=michelNumbers ${catalogNumbers}
45+
Input Text id=scottNumbers ${catalogNumbers}
46+
Input Text id=yvertNumbers ${catalogNumbers}
47+
Input Text id=gibbonsNumbers ${catalogNumbers}
48+
Input Text id=solovyovNumbers ${catalogNumbers}
49+
Input Text id=zagorskiNumbers ${catalogNumbers}
50+
Submit Form id=add-series-form
51+
Page Should Not Contain Element id=michelNumbers.errors
52+
Page Should Not Contain Element id=scottNumbers.errors
53+
Page Should Not Contain Element id=yvertNumbers.errors
54+
Page Should Not Contain Element id=gibbonsNumbers.errors
55+
Page Should Not Contain Element id=solovyovNumbers.errors
56+
Page Should Not Contain Element id=zagorskiNumbers.errors

0 commit comments

Comments
 (0)