Skip to content

Commit bf5609e

Browse files
committed
refactor(WhenUserAddSeries): port shouldAllowExistingCatalogNumbers() 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 8506bf3 commit bf5609e

File tree

7 files changed

+27
-88
lines changed

7 files changed

+27
-88
lines changed

src/main/resources/liquibase/sql/test-series-with-catalogs-numbers.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
INSERT INTO users(id, login, role, name, registered_at, activated_at, hash, salt, email) VALUES
77
(4, 'test1', 'USER', 'Series Owner', NOW(), NOW(), '@old_valid_user_password_hash@', '@old_valid_user_password_salt@', '[email protected]');
88

9-
-- Used only in WhenUserAddSeries and src/test/robotframework/series/creation/misc.robot
9+
-- Used only in src/test/robotframework/series/creation/misc-user.robot
1010
INSERT INTO images(id, type) VALUES(1, 'PNG');
1111
INSERT INTO series(id, quantity, perforated, image_url, created_at, created_by, updated_at, updated_by) VALUES
1212
(1, 1, TRUE, '/image/1', NOW(), 4, NOW(), 4);
1313

14-
INSERT INTO michel_catalog(id, code) VALUES(1, '@existing_michel_number@');
14+
INSERT INTO michel_catalog(id, code) VALUES(1, '99');
1515
INSERT INTO series_michel_catalog(series_id, michel_id) VALUES(1, 1);
1616

17-
INSERT INTO scott_catalog(id, code) VALUES(1, '@existing_scott_number@');
17+
INSERT INTO scott_catalog(id, code) VALUES(1, '99');
1818
INSERT INTO series_scott_catalog(series_id, scott_id) VALUES(1, 1);
1919

20-
INSERT INTO yvert_catalog(id, code) VALUES(1, '@existing_yvert_number@');
20+
INSERT INTO yvert_catalog(id, code) VALUES(1, '99');
2121
INSERT INTO series_yvert_catalog(series_id, yvert_id) VALUES(1, 1);
2222

23-
INSERT INTO gibbons_catalog(id, code) VALUES(1, '@existing_gibbons_number@');
23+
INSERT INTO gibbons_catalog(id, code) VALUES(1, '99');
2424
INSERT INTO series_gibbons_catalog(series_id, gibbons_id) VALUES(1, 1);
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
--
2-
-- Auto-generated by Maven, based on values from src/main/resources/test/spring/test-data.properties
3-
--
4-
5-
INSERT INTO solovyov_catalog(id, code) VALUES(1, '@existing_solovyov_number@');
1+
INSERT INTO solovyov_catalog(id, code) VALUES(1, '77');
62
INSERT INTO series_solovyov_catalog(series_id, solovyov_id) VALUES(1, 1);
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
--
2-
-- Auto-generated by Maven, based on values from src/main/resources/test/spring/test-data.properties
3-
--
4-
5-
INSERT INTO zagorski_catalog(id, code) VALUES(1, '@existing_zagorski_number@');
1+
INSERT INTO zagorski_catalog(id, code) VALUES(1, '83');
62
INSERT INTO series_zagorski_catalog(series_id, zagorski_id) VALUES(1, 1);

src/main/resources/test/spring/test-data.properties

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ valid_country_name_en = Italy
2222
# ATTENTION: must be encoded by native2asscii (MRESOURCES-175)
2323
valid_country_name_ru = \u0418\u0442\u0430\u043b\u0438\u044f
2424

25-
# these catalogs' numbers should always exist
26-
# (used only in WhenUserAddSeries and src/test/robotframework/series/creation/misc-admin.robot)
27-
existing_michel_number = 99
28-
existing_scott_number = 99
29-
existing_yvert_number = 99
30-
existing_gibbons_number = 99
31-
existing_solovyov_number = 77
32-
existing_zagorski_number = 83
33-
3425
# this category should always exist
3526
# (used in WhenUserAddSeries, src/test/robotframework/category/creation/validation.robot and
3627
# src/test/robotframework/series/creation/misc-admin.robot)

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

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,6 @@ public class WhenUserAddSeries extends WhenAnyUserAtAnyPage<AddSeriesPage> {
5757
@Value("${valid_user_password}")
5858
private String validUserPassword;
5959

60-
@Value("${existing_michel_number}")
61-
private String existingMichelNumber;
62-
63-
@Value("${existing_scott_number}")
64-
private String existingScottNumber;
65-
66-
@Value("${existing_yvert_number}")
67-
private String existingYvertNumber;
68-
69-
@Value("${existing_gibbons_number}")
70-
private String existingGibbonsNumber;
71-
72-
@Value("${existing_solovyov_number}")
73-
private String existingSolovyovNumber;
74-
75-
@Value("${existing_zagorski_number}")
76-
private String existingZagorskiNumber;
77-
7860
@Value("${valid_category_name_en}")
7961
private String validCategoryName;
8062

@@ -194,29 +176,4 @@ public void shouldCreateSeriesWithAllFieldsFilled() {
194176
assertThat(nextPage.getZagorskiCatalogInfo()).isEqualTo("#50-52 (150.2 RUB)");
195177
}
196178

197-
@Test(groups = "logic")
198-
public void shouldAllowExistingCatalogNumbers() {
199-
page.fillCategory(validCategoryName);
200-
page.fillQuantity("2");
201-
page.fillImage(SAMPLE_IMAGE_PATH);
202-
page.showCatalogNumbers();
203-
page.fillMichelNumbers(existingMichelNumber);
204-
page.fillScottNumbers(existingScottNumber);
205-
page.fillYvertNumbers(existingYvertNumber);
206-
page.fillGibbonsNumbers(existingGibbonsNumber);
207-
page.fillSolovyovNumbers(existingSolovyovNumber);
208-
page.fillZagorskiNumbers(existingZagorskiNumber);
209-
210-
AbstractPage next = page.submit();
211-
assertThat(next).isInstanceOf(InfoSeriesPage.class);
212-
213-
InfoSeriesPage nextPage = (InfoSeriesPage)next;
214-
assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("#" + existingMichelNumber);
215-
assertThat(nextPage.getScottCatalogInfo()).isEqualTo("#" + existingScottNumber);
216-
assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("#" + existingYvertNumber);
217-
assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("#" + existingGibbonsNumber);
218-
assertThat(nextPage.getSolovyovCatalogInfo()).isEqualTo("#" + existingSolovyovNumber);
219-
assertThat(nextPage.getZagorskiCatalogInfo()).isEqualTo("#" + existingZagorskiNumber);
220-
}
221-
222179
}

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

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

99
*** Test Cases ***
10-
Catalog numbers should accept existing numbers
11-
Go To ${SITE_URL}/series/add
12-
Select From List By Label id=category Sport
13-
Input Text id=quantity 2
14-
Choose File id=image ${MAIN_RESOURCE_DIR}${/}test.png
15-
Click Element id=add-catalog-numbers-link
16-
Input Text id=michelNumbers 99
17-
Input Text id=scottNumbers 99
18-
Input Text id=yvertNumbers 99
19-
Input Text id=gibbonsNumbers 99
20-
Input Text id=solovyovNumbers 77
21-
Input Text id=zagorskiNumbers 83
22-
Submit Form id=add-series-form
23-
Element Text Should Be id=michel_catalog_info \#99
24-
Element Text Should Be id=scott_catalog_info \#99
25-
Element Text Should Be id=yvert_catalog_info \#99
26-
Element Text Should Be id=gibbons_catalog_info \#99
27-
Element Text Should Be id=solovyov_catalog_info \#77
28-
Element Text Should Be id=zagorski_catalog_info \#83
29-
3010
Comment should be stripped from leading and trailing spaces
31-
Go To ${SITE_URL}/series/add
3211
Click Element id=add-comment-link
3312
Input Text id=comment ${SPACE * 2}example comment${SPACE * 2}
3413
Submit Form id=add-series-form

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,26 @@ Catalog numbers should ignore duplicate values
6464
Element Text Should Be id=solovyov_catalog_info \#144, 145
6565
Element Text Should Be id=zagorski_catalog_info \#154, 155
6666

67+
Catalog numbers should accept existing numbers
68+
Go To ${SITE_URL}/series/add
69+
Select From List By Label id=category Sport
70+
Input Text id=quantity 2
71+
Choose File id=image ${MAIN_RESOURCE_DIR}${/}test.png
72+
Click Element id=add-catalog-numbers-link
73+
Input Text id=michelNumbers 99
74+
Input Text id=scottNumbers 99
75+
Input Text id=yvertNumbers 99
76+
Input Text id=gibbonsNumbers 99
77+
Input Text id=solovyovNumbers 77
78+
Input Text id=zagorskiNumbers 83
79+
Submit Form id=add-series-form
80+
Element Text Should Be id=michel_catalog_info \#99
81+
Element Text Should Be id=scott_catalog_info \#99
82+
Element Text Should Be id=yvert_catalog_info \#99
83+
Element Text Should Be id=gibbons_catalog_info \#99
84+
Element Text Should Be id=solovyov_catalog_info \#77
85+
Element Text Should Be id=zagorski_catalog_info \#83
86+
6787
*** Keywords ***
6888
Before Test Suite
6989
Open Browser ${SITE_URL}/account/auth ${BROWSER}

0 commit comments

Comments
 (0)