diff --git a/.travis.yml b/.travis.yml index fc0df0fdfd..800bb994c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: java # @todo #1034 Travis CI: run tests on PostgreSQL env: matrix: - - SPRING_PROFILES_ACTIVE=test + #- SPRING_PROFILES_ACTIVE=test - SPRING_PROFILES_ACTIVE=travis global: - MAVEN_OPTS='-Xss256k' diff --git a/expected-rflint.log b/expected-rflint.log new file mode 100644 index 0000000000..2b0e710998 --- /dev/null +++ b/expected-rflint.log @@ -0,0 +1,2 @@ ++ src/test/robotframework/selenium.utils.robot +E: 65, 0: Line has trailing whitespace (TrailingWhitespace) diff --git a/expected-shellcheck.log b/expected-shellcheck.log new file mode 100644 index 0000000000..9ecc5bc9b7 --- /dev/null +++ b/expected-shellcheck.log @@ -0,0 +1 @@ +src/main/scripts/ci/deploy.sh:28:9: note: Double quote to prevent globbing and word splitting. [SC2086] diff --git a/expected-validator.log b/expected-validator.log new file mode 100644 index 0000000000..0a9aefb876 --- /dev/null +++ b/expected-validator.log @@ -0,0 +1,3 @@ +ERROR:html5validator.validator:"file:src/main/webapp/WEB-INF/views/participant/add.html":172.3-172.12: info warning: Element name "th:block" cannot be represented as XML 1.0. +"file:src/main/webapp/WEB-INF/views/participant/add.html":172.3-172.12: error: Element "th:block" not allowed as child of element "body" in this context. (Suppressing further errors from this subtree.) +"file:src/main/webapp/WEB-INF/views/site/events.html":15.2-15.8: error: Element "head" is missing a required instance of child element "title". diff --git a/pom.xml b/pom.xml index eea930e68f..d9211eeca3 100644 --- a/pom.xml +++ b/pom.xml @@ -10,12 +10,6 @@ - - com.github.heneke.thymeleaf - thymeleaf-extras-togglz - ${thymeleaf.togglz.version} - - com.sun.mail @@ -35,6 +29,12 @@ ${thumbnailator.version} + + com.github.heneke.thymeleaf + thymeleaf-extras-togglz + ${thymeleaf.togglz.version} + + org.apache.commons commons-lang3 @@ -415,6 +415,12 @@ test + + junit + junit + 4.12 + + org.togglz togglz-testing diff --git a/src/main/config/spotbugs-filter.xml b/src/main/config/spotbugs-filter.xml index 70631b9b22..e67d68f519 100644 --- a/src/main/config/spotbugs-filter.xml +++ b/src/main/config/spotbugs-filter.xml @@ -147,13 +147,6 @@ - - - - - + + diff --git a/src/main/webapp/WEB-INF/views/series/add.html b/src/main/webapp/WEB-INF/views/series/add.html index 64d514944c..e4422f992a 100644 --- a/src/main/webapp/WEB-INF/views/series/add.html +++ b/src/main/webapp/WEB-INF/views/series/add.html @@ -249,6 +249,7 @@

- My stamps: suspicious activities @@ -158,38 +157,36 @@

-
- -
+
diff --git a/src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy index d19c4c1f47..99a54f6f95 100644 --- a/src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy @@ -109,7 +109,7 @@ class CollectionServiceImplTest extends Specification { @SuppressWarnings(['ClosureAsLastMethodParameter', 'FactoryMethodName', 'UnnecessaryReturnKeyword']) def 'createCollection() should assign updated at to current date'() { when: - service.createCollection(Random.userId(), 'any-login') + service.createCollection(Random.userId(), "any-login") then: 1 * collectionDao.add({ AddCollectionDbDto collection -> assert DateUtils.roughlyEqual(collection?.updatedAt, new Date()) diff --git a/src/test/javascript/CatalogUtilsSpec.js b/src/test/javascript/CatalogUtilsSpec.js index 5d275c9ba9..c1dfc5ecf0 100644 --- a/src/test/javascript/CatalogUtilsSpec.js +++ b/src/test/javascript/CatalogUtilsSpec.js @@ -13,11 +13,11 @@ describe("CatalogUtils.expandNumbers()", function() { }); it("should return string without hyphen as is", function() { - expect(CatalogUtils.expandNumbers("test")).toEqual("test"); + expect(CatalogUtils.expandNumbers("test")).toEqual("2test"); }); it("should return 'one-two' for 'one-two'", function() { - expect(CatalogUtils.expandNumbers("one-two")).toEqual("one-two"); + expect(CatalogUtils.expandNumbers("one-two")).toEqual("one two"); }); it("should return '1,2' for '1-2'", function() { @@ -81,7 +81,7 @@ describe("CatalogUtils.expandNumbers()", function() { }); it("should return '1,2,3' for '1/3'", function() { - expect(CatalogUtils.expandNumbers("1/3")).toEqual("1,2,3"); + expect(CatalogUtils.expandNumbers("1/3")).toEqual("1,2"); }); it("should return '1,2,3,4,5,6' for '1/3, 4-6'", function() { diff --git a/src/test/robotframework/category/creation/logic.robot b/src/test/robotframework/category/creation/logic.robot index 19bf7269ed..e340f3a84b 100644 --- a/src/test/robotframework/category/creation/logic.robot +++ b/src/test/robotframework/category/creation/logic.robot @@ -26,7 +26,7 @@ Create category with name in English and Russian Input Text id:nameRu Космос Submit Form id:add-category-form Location Should Be ${SITE_URL}/category/space - Element Text Should Be id:page-header Space + Element Text Should Be id:page-header Space! Go To ${SITE_URL}/category/space?lang=ru Element Text Should Be id:page-header Космос diff --git a/src/test/robotframework/selenium.utils.robot b/src/test/robotframework/selenium.utils.robot index 58825b6f77..5e20d7e074 100644 --- a/src/test/robotframework/selenium.utils.robot +++ b/src/test/robotframework/selenium.utils.robot @@ -62,7 +62,7 @@ Wait Until Element Value Is Select Random Option From List [Documentation] Choose a random option from a select element - [Arguments] ${locator} + [Arguments] ${locator} ${options}= Get List Items ${locator} ${size}= Get Length ${options} ${randomIndex}= Evaluate random.randint(0, ${size}-1) modules=random diff --git a/src/test/robotframework/series/access.robot b/src/test/robotframework/series/access.robot index 01f94f4775..08d06ad53d 100644 --- a/src/test/robotframework/series/access.robot +++ b/src/test/robotframework/series/access.robot @@ -13,7 +13,7 @@ Anonymous user cannot create series Element Text Should Be id:error-msg Forbidden Opening a page of non-existing series show an error - Go To ${SITE_URL}/series/999 + Go To ${SITE_URL}/series/1 Element Text Should Be id:error-code 404 Element Text Should Match Regexp id:error-msg Requested page[\\n\\r]+not found diff --git a/src/test/robotframework/series/search/logic-anonymous.robot b/src/test/robotframework/series/search/logic-anonymous.robot index e7b24bca58..643a353986 100644 --- a/src/test/robotframework/series/search/logic-anonymous.robot +++ b/src/test/robotframework/series/search/logic-anonymous.robot @@ -7,7 +7,7 @@ Suite Teardown Close Browser Force Tags series search logic *** Test Cases *** -Search series by non-existing catalog number +Search series by non-existing catalog number Input Text id:catalogNumber 888 Select Random Option From List id:catalogName Submit Form id:search-series-form