From 5c656fd90a402992387b659cd8225c359a813457 Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Fri, 22 May 2020 09:22:22 +0200 Subject: [PATCH 1/4] Add todo to stop selenium server process --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eededb4c7..3247fe942 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ behat-js: ## to run behat JS tests vendor/bin/selenium-server-standalone >/dev/null 2>&1 & sleep 2s vendor/bin/behat --tags=javascript - # kill -9 $(lsof -t -i:4444) + # @todo: stop selenium server behat-js-quiet: ## to run behat JS tests quietly make server @@ -92,7 +92,7 @@ behat-js-quiet: ## to run behat JS tests quietly vendor/bin/selenium-server-standalone >/dev/null 2>&1 & sleep 2s vendor/bin/behat --tags=javascript --format=progress - # kill -9 $(lsof -t -i:4444) + # @todo: stop selenium server behat: make behat-api From 992f089894ed124890b4ddd6e7340256c62b9c53 Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Fri, 22 May 2020 10:18:43 +0200 Subject: [PATCH 2/4] Update Makefile --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3247fe942..2a5c761db 100644 --- a/Makefile +++ b/Makefile @@ -76,13 +76,12 @@ behat-api-quiet: ## to run behat API tests quietly behat-js: ## to run behat JS tests make server echo "Running Behat e2e tests. Make sure you have the latest version of Google Chrome installed" - ## If not already in path, add vendor/bin/ to it, where chromedriver executable can be found. - [ ":${PATH}:" != *":$(pwd)/vendor/bin:"* ] && PATH="$(pwd)/vendor/bin:${PATH}" - ## run the selenium server. chromedriver executable must be in $PATH - vendor/bin/selenium-server-standalone >/dev/null 2>&1 & - sleep 2s + ./run_behat_tests.sh + ## run the selenium server. chromedriver executable must be in $PATH + vendor/bin/selenium-server-standalone >/dev/null 2>&1 & + sleep 2s vendor/bin/behat --tags=javascript - # @todo: stop selenium server + ## @todo: stop selenium server behat-js-quiet: ## to run behat JS tests quietly make server @@ -92,7 +91,7 @@ behat-js-quiet: ## to run behat JS tests quietly vendor/bin/selenium-server-standalone >/dev/null 2>&1 & sleep 2s vendor/bin/behat --tags=javascript --format=progress - # @todo: stop selenium server + ## @todo: stop selenium server behat: make behat-api From fe705cbe3e4d4c247e9b81f74e5787f186ac3cb4 Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Fri, 22 May 2020 10:42:53 +0200 Subject: [PATCH 3/4] Fix indentation --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2a5c761db..e5c862f79 100644 --- a/Makefile +++ b/Makefile @@ -76,10 +76,10 @@ behat-api-quiet: ## to run behat API tests quietly behat-js: ## to run behat JS tests make server echo "Running Behat e2e tests. Make sure you have the latest version of Google Chrome installed" - ./run_behat_tests.sh - ## run the selenium server. chromedriver executable must be in $PATH - vendor/bin/selenium-server-standalone >/dev/null 2>&1 & - sleep 2s + ./run_behat_tests.sh + ## run the selenium server. chromedriver executable must be in $PATH + vendor/bin/selenium-server-standalone >/dev/null 2>&1 & + sleep 2s vendor/bin/behat --tags=javascript ## @todo: stop selenium server From fe8143cc7422f863b52c0db960f1c8c5fb2c9d9c Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Fri, 22 May 2020 11:40:00 +0200 Subject: [PATCH 4/4] Make sure PATH stays --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e5c862f79..e5af9e0d4 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ behat-api-quiet: ## to run behat API tests quietly behat-js: ## to run behat JS tests make server echo "Running Behat e2e tests. Make sure you have the latest version of Google Chrome installed" - ./run_behat_tests.sh + . ./run_behat_tests.sh ## run the selenium server. chromedriver executable must be in $PATH vendor/bin/selenium-server-standalone >/dev/null 2>&1 & sleep 2s @@ -86,7 +86,7 @@ behat-js: ## to run behat JS tests behat-js-quiet: ## to run behat JS tests quietly make server echo "Running Behat e2e tests. Make sure you have the latest version of Google Chrome installed" - ./run_behat_tests.sh + . ./run_behat_tests.sh ## run the selenium server. chromedriver executable must be in $PATH vendor/bin/selenium-server-standalone >/dev/null 2>&1 & sleep 2s