From 23a68595167e5b1d0730e8fcdc28aea79e53ee76 Mon Sep 17 00:00:00 2001 From: Dominik Hebeler Date: Fri, 3 May 2019 11:01:59 +0200 Subject: [PATCH] testing ci --- .gitlab-ci.yml | 3 +++ test.sh | 5 +---- tests/Feature/StaticPagesTest.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84f72b3c..eb747e11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,6 +55,9 @@ test metager3: script: - cd ~/MetaGer_neu - sh test.sh + after_script: + - kill $browserstackPid + - kill $servePid deploy metager3: stage: deploy diff --git a/test.sh b/test.sh index 9261b37c..a9ef144b 100644 --- a/test.sh +++ b/test.sh @@ -13,7 +13,4 @@ servePid=$! browserstackPid=$! sleep 5 -./vendor/bin/phpunit - -kill $browserstackPid -kill $servePid \ No newline at end of file +./vendor/bin/phpunit \ No newline at end of file diff --git a/tests/Feature/StaticPagesTest.php b/tests/Feature/StaticPagesTest.php index 11040524..170d06a9 100644 --- a/tests/Feature/StaticPagesTest.php +++ b/tests/Feature/StaticPagesTest.php @@ -41,7 +41,7 @@ class StaticPagesTest extends TestCase private function startPageTest() { - $this->webdriver->get("http://localhost"); + $this->webdriver->get($mgServer); # Test for Page Title $this->assertEquals($this->webdriver->getTitle(), "MetaGer - Mehr als eine Suchmaschine"); @@ -57,7 +57,7 @@ class StaticPagesTest extends TestCase */ private function navigationMenuTest() { - $this->webdriver->get("http://localhost"); + $this->webdriver->get($mgServer); // Check if the Navigation menu expands on click $sidebarToggle = $this->webdriver->findElement(WebDriverBy::cssSelector("label[for=sidebarToggle]")); -- GitLab