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.

Author: php-coder

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

@@ -6,19 +6,19 @@
 INSERT INTO users(id, login, role, name, registered_at, activated_at, hash, salt, email) VALUES
 	(4, 'test1', 'USER', 'Series Owner', NOW(), NOW(), '@old_valid_user_password_hash@', '@old_valid_user_password_salt@', '[email protected]');
 
--- Used only in WhenUserAddSeries and src/test/robotframework/series/creation/misc.robot
+-- Used only in src/test/robotframework/series/creation/misc-user.robot
 INSERT INTO images(id, type) VALUES(1, 'PNG');
 INSERT INTO series(id, quantity, perforated, image_url, created_at, created_by, updated_at, updated_by) VALUES
 	(1, 1, TRUE, '/image/1', NOW(), 4, NOW(), 4);
 
-INSERT INTO michel_catalog(id, code) VALUES(1, '@existing_michel_number@');
+INSERT INTO michel_catalog(id, code) VALUES(1, '99');
 INSERT INTO series_michel_catalog(series_id, michel_id) VALUES(1, 1);
 
-INSERT INTO scott_catalog(id, code) VALUES(1, '@existing_scott_number@');
+INSERT INTO scott_catalog(id, code) VALUES(1, '99');
 INSERT INTO series_scott_catalog(series_id, scott_id) VALUES(1, 1);
 
-INSERT INTO yvert_catalog(id, code) VALUES(1, '@existing_yvert_number@');
+INSERT INTO yvert_catalog(id, code) VALUES(1, '99');
 INSERT INTO series_yvert_catalog(series_id, yvert_id) VALUES(1, 1);
 
-INSERT INTO gibbons_catalog(id, code) VALUES(1, '@existing_gibbons_number@');
+INSERT INTO gibbons_catalog(id, code) VALUES(1, '99');
 INSERT INTO series_gibbons_catalog(series_id, gibbons_id) VALUES(1, 1);

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

@@ -1,6 +1,2 @@
---
--- Auto-generated by Maven, based on values from src/main/resources/test/spring/test-data.properties
---
-
-INSERT INTO solovyov_catalog(id, code) VALUES(1, '@existing_solovyov_number@');
+INSERT INTO solovyov_catalog(id, code) VALUES(1, '77');
 INSERT INTO series_solovyov_catalog(series_id, solovyov_id) VALUES(1, 1);

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

@@ -1,6 +1,2 @@
---
--- Auto-generated by Maven, based on values from src/main/resources/test/spring/test-data.properties
---
-
-INSERT INTO zagorski_catalog(id, code) VALUES(1, '@existing_zagorski_number@');
+INSERT INTO zagorski_catalog(id, code) VALUES(1, '83');
 INSERT INTO series_zagorski_catalog(series_id, zagorski_id) VALUES(1, 1);

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

@@ -22,15 +22,6 @@ valid_country_name_en = Italy
 # ATTENTION: must be encoded by native2asscii (MRESOURCES-175)
 valid_country_name_ru = \u0418\u0442\u0430\u043b\u0438\u044f
 
-# these catalogs' numbers should always exist
-# (used only in WhenUserAddSeries and src/test/robotframework/series/creation/misc-admin.robot)
-existing_michel_number = 99
-existing_scott_number = 99
-existing_yvert_number = 99
-existing_gibbons_number = 99
-existing_solovyov_number = 77
-existing_zagorski_number = 83
-
 # this category should always exist
 # (used in WhenUserAddSeries, src/test/robotframework/category/creation/validation.robot and
 # src/test/robotframework/series/creation/misc-admin.robot)

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

@@ -57,24 +57,6 @@ public class WhenUserAddSeries extends WhenAnyUserAtAnyPage<AddSeriesPage> {
 	@Value("${valid_user_password}")
 	private String validUserPassword;
 
-	@Value("${existing_michel_number}")
-	private String existingMichelNumber;
-	
-	@Value("${existing_scott_number}")
-	private String existingScottNumber;
-	
-	@Value("${existing_yvert_number}")
-	private String existingYvertNumber;
-	
-	@Value("${existing_gibbons_number}")
-	private String existingGibbonsNumber;
-	
-	@Value("${existing_solovyov_number}")
-	private String existingSolovyovNumber;
-	
-	@Value("${existing_zagorski_number}")
-	private String existingZagorskiNumber;
-	
 	@Value("${valid_category_name_en}")
 	private String validCategoryName;
 
@@ -194,29 +176,4 @@ public void shouldCreateSeriesWithAllFieldsFilled() {
 		assertThat(nextPage.getZagorskiCatalogInfo()).isEqualTo("#50-52 (150.2 RUB)");
 	}
 
-	@Test(groups = "logic")
-	public void shouldAllowExistingCatalogNumbers() {
-		page.fillCategory(validCategoryName);
-		page.fillQuantity("2");
-		page.fillImage(SAMPLE_IMAGE_PATH);
-		page.showCatalogNumbers();
-		page.fillMichelNumbers(existingMichelNumber);
-		page.fillScottNumbers(existingScottNumber);
-		page.fillYvertNumbers(existingYvertNumber);
-		page.fillGibbonsNumbers(existingGibbonsNumber);
-		page.fillSolovyovNumbers(existingSolovyovNumber);
-		page.fillZagorskiNumbers(existingZagorskiNumber);
-		
-		AbstractPage next = page.submit();
-		assertThat(next).isInstanceOf(InfoSeriesPage.class);
-		
-		InfoSeriesPage nextPage = (InfoSeriesPage)next;
-		assertThat(nextPage.getMichelCatalogInfo()).isEqualTo("#" + existingMichelNumber);
-		assertThat(nextPage.getScottCatalogInfo()).isEqualTo("#" + existingScottNumber);
-		assertThat(nextPage.getYvertCatalogInfo()).isEqualTo("#" + existingYvertNumber);
-		assertThat(nextPage.getGibbonsCatalogInfo()).isEqualTo("#" + existingGibbonsNumber);
-		assertThat(nextPage.getSolovyovCatalogInfo()).isEqualTo("#" + existingSolovyovNumber);
-		assertThat(nextPage.getZagorskiCatalogInfo()).isEqualTo("#" + existingZagorskiNumber);
-	}
-	
 }

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

@@ -7,28 +7,7 @@ Suite Teardown   After Test Suite
 Force Tags       series  misc
 
 *** Test Cases ***
-Catalog numbers should accept existing numbers
-	Go To                      ${SITE_URL}/series/add
-	Select From List By Label  id=category  Sport
-	Input Text                 id=quantity  2
-	Choose File                id=image  ${MAIN_RESOURCE_DIR}${/}test.png
-	Click Element              id=add-catalog-numbers-link
-	Input Text                 id=michelNumbers    99
-	Input Text                 id=scottNumbers     99
-	Input Text                 id=yvertNumbers     99
-	Input Text                 id=gibbonsNumbers   99
-	Input Text                 id=solovyovNumbers  77
-	Input Text                 id=zagorskiNumbers  83
-	Submit Form                id=add-series-form
-	Element Text Should Be     id=michel_catalog_info    \#99
-	Element Text Should Be     id=scott_catalog_info     \#99
-	Element Text Should Be     id=yvert_catalog_info     \#99
-	Element Text Should Be     id=gibbons_catalog_info   \#99
-	Element Text Should Be     id=solovyov_catalog_info  \#77
-	Element Text Should Be     id=zagorski_catalog_info  \#83
-
 Comment should be stripped from leading and trailing spaces
-	Go To                     ${SITE_URL}/series/add
 	Click Element             id=add-comment-link
 	Input Text                id=comment  ${SPACE * 2}example comment${SPACE * 2}
 	Submit Form               id=add-series-form

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

@@ -64,6 +64,26 @@ Catalog numbers should ignore duplicate values
 	Element Text Should Be     id=solovyov_catalog_info  \#144, 145
 	Element Text Should Be     id=zagorski_catalog_info  \#154, 155
 
+Catalog numbers should accept existing numbers
+	Go To                      ${SITE_URL}/series/add
+	Select From List By Label  id=category  Sport
+	Input Text                 id=quantity  2
+	Choose File                id=image  ${MAIN_RESOURCE_DIR}${/}test.png
+	Click Element              id=add-catalog-numbers-link
+	Input Text                 id=michelNumbers    99
+	Input Text                 id=scottNumbers     99
+	Input Text                 id=yvertNumbers     99
+	Input Text                 id=gibbonsNumbers   99
+	Input Text                 id=solovyovNumbers  77
+	Input Text                 id=zagorskiNumbers  83
+	Submit Form                id=add-series-form
+	Element Text Should Be     id=michel_catalog_info    \#99
+	Element Text Should Be     id=scott_catalog_info     \#99
+	Element Text Should Be     id=yvert_catalog_info     \#99
+	Element Text Should Be     id=gibbons_catalog_info   \#99
+	Element Text Should Be     id=solovyov_catalog_info  \#77
+	Element Text Should Be     id=zagorski_catalog_info  \#83
+
 *** Keywords ***
 Before Test Suite
 	Open Browser                        ${SITE_URL}/account/auth  ${BROWSER}