Commit 952e4cba authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/server/user!19
parents a9cfe106 24a99745

deploy/docker-compose.prod.yml

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ services: 
    environment:

      SPRING_PROFILES_ACTIVE: prod

    deploy:

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

src/test/java/es/redmic/user/integration/translations/ExceptionsTranslationTest.java

+2 −19
Original line number Diff line number Diff line
@@ -99,23 +99,6 @@ public class ExceptionsTranslationTest { 
		}

	}



	@Test

	public void getRussianLanguageMessage_returnDefaultI18nMessage_WhenI18nFileNotExist() {



		try {

			repository.findByEmail("prueba@redmic.es");

		} catch (DBNotFoundException e) {



			String code = e.getCode().toString();



			String[] fields = (String[]) e.getFieldErrors().toArray();



			String mess = messageSource.getMessage(code, fields, new Locale("ru", "RU"));



			Assert.assertEquals(getMessage(code, fields, resourcePathSpanish), mess);

		}

	}



	@Test

	public void getMessage_returnCode_WhenCodeNotInI18nFile() {