From 31188f303590ef3a5ce32716cf1fbe6897dfbac5 Mon Sep 17 00:00:00 2001 From: Guilherme Andrade Del Cantoni Date: Tue, 11 Apr 2023 10:00:45 -0300 Subject: [PATCH] =?UTF-8?q?fix:=20corre=C3=A7=C3=A3o=20de=20acesso=20?= =?UTF-8?q?=C3=A0=20menu=20nos=20testes=20automatizados=20para=20super?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- tests_sei3/funcional/docker-compose.yml | 15 ++++++++++----- tests_sei4/funcional/docker-compose.yml | 16 ++++++++++------ .../funcional/tests/CenarioBaseTestCase.php | 3 ++- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 84e071092..eafbffd33 100755 --- a/Makefile +++ b/Makefile @@ -170,7 +170,7 @@ down: # make teste=TramiteProcessoComDevolucaoTest test-functional test-functional: $(FILE_VENDOR_FUNCIONAL) - $(CMD_COMPOSE_FUNC) run --rm php-test-functional /tests/vendor/bin/phpunit -c /tests/phpunit.xml /tests/tests/$(addsuffix .php,$(teste)) + $(CMD_COMPOSE_FUNC) run --rm php-test-functional /tests/vendor/bin/phpunit -c /tests/phpunit.xml /tests/tests/$(addsuffix .php,$(teste)) test-functional-parallel: $(FILE_VENDOR_FUNCIONAL) diff --git a/tests_sei3/funcional/docker-compose.yml b/tests_sei3/funcional/docker-compose.yml index 580229631..086af0efb 100644 --- a/tests_sei3/funcional/docker-compose.yml +++ b/tests_sei3/funcional/docker-compose.yml @@ -8,10 +8,15 @@ services: ports: - "1080:1080" - memcached: - image: guilhermeadc/sei3_memcached:7.2 + org1-memcached: + image: processoeletronico/vagrant_super4_memcached:${ENVIRONMENT_VERSION} ports: - - "11211:11211" + - "11211" + + org2-memcached: + image: processoeletronico/vagrant_super4_memcached:${ENVIRONMENT_VERSION} + ports: + - "11211" proxy: image: diouxx/apache-proxy @@ -106,7 +111,7 @@ services: extra_hosts: - "host.docker.internal:host-gateway" links: - - memcached:memcached + - org1-memcached:memcached - smtp:smtp - org1-database:${ORG1_DATABASE_NAME} @@ -143,6 +148,6 @@ services: extra_hosts: - "host.docker.internal:host-gateway" links: - - memcached:memcached + - org2-memcached:memcached - smtp:smtp - org2-database:${ORG2_DATABASE_NAME} diff --git a/tests_sei4/funcional/docker-compose.yml b/tests_sei4/funcional/docker-compose.yml index 1919653e6..601a96dc9 100644 --- a/tests_sei4/funcional/docker-compose.yml +++ b/tests_sei4/funcional/docker-compose.yml @@ -9,11 +9,15 @@ services: ports: - "1080:1080" - memcached: - image: processoeletronico/vagrant_sei4_memcached:${ENVIRONMENT_VERSION} - container_name: memcached + org1-memcached: + image: processoeletronico/vagrant_super4_memcached:${ENVIRONMENT_VERSION} ports: - - "11211:11211" + - "11211" + + org2-memcached: + image: processoeletronico/vagrant_super4_memcached:${ENVIRONMENT_VERSION} + ports: + - "11211" proxy: image: diouxx/apache-proxy @@ -165,7 +169,7 @@ services: extra_hosts: - "host.docker.internal:host-gateway" links: - - memcached:memcached + - org1-memcached:memcached - smtp:smtp - org1-database:${ORG1_DATABASE_HOST} @@ -230,6 +234,6 @@ services: extra_hosts: - "host.docker.internal:host-gateway" links: - - memcached:memcached + - org2-memcached:memcached - smtp:smtp - org2-database:${ORG2_DATABASE_HOST} diff --git a/tests_super/funcional/tests/CenarioBaseTestCase.php b/tests_super/funcional/tests/CenarioBaseTestCase.php index 1f40876c4..8ad9497ea 100755 --- a/tests_super/funcional/tests/CenarioBaseTestCase.php +++ b/tests_super/funcional/tests/CenarioBaseTestCase.php @@ -507,7 +507,8 @@ protected function validarDadosDocumento($nomeDocArvore, $dadosDocumento, $desti protected function validarProcessosTramitados($protocolo, $deveExistir) { $this->frame(null); - $this->byXPath("//div[contains(@class, 'menu-hamburguer')]/button")->click(); + $this->byXPath("//img[contains(@title, 'Controle de Processos')]")->click(); + $this->byLinkText("Processos Tramitados Externamente")->click(); $this->assertEquals($deveExistir, $this->paginaProcessosTramitadosExternamente->contemProcesso($protocolo)); }