Merge pull request #2118 from Catrobat/release/v3.18.0

Release v3.18.0 into develop
Catrobat · Oct 6, 2021 · 885ca3e · 885ca3e
2 parents c2c1451 + ae9a34c
commit 885ca3e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/.env b/.env
@@ -14,7 +14,7 @@
 # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 
 # Define the App Environment
-APP_VERSION='3.17.8'
+APP_VERSION='3.18.0'
 APP_ENV=dev
 APP_DEBUG=0
 APP_NAME="PocketCode Share"

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -2,7 +2,7 @@
 
 $finder = PhpCsFixer\Finder::create()
   ->in(__DIR__)
-  ->exclude(['var']);
+  ->exclude(['var', 'node_modules', 'vendor']);
 
 $config = new PhpCsFixer\Config();
 $config

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
@@ -110,7 +110,7 @@ services:
   # --- Tests:
 
   chrome.catroweb:
-    image: zenika/alpine-chrome:81
+    image: zenika/alpine-chrome:89
     container_name: chrome.catroweb
     restart: on-failure
     volumes:

diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml
@@ -25,7 +25,7 @@ services:
     # --- Tests:
 
   chrome.catroweb:
-    image: zenika/alpine-chrome:81
+    image: zenika/alpine-chrome:89
     container_name: chrome.catroweb
     restart: on-failure
     volumes:

diff --git a/tests/behat/context/BrowserContext.php b/tests/behat/context/BrowserContext.php
@@ -36,14 +36,6 @@ public function setup(): void
     $this->getSession()->resizeWindow(320 + 15, 1_024);
   }
 
-  /**
-   * @AfterScenario
-   */
-  public function resetSession(): void
-  {
-    $this->getSession()->getDriver()->reset();
-  }
-
   /**
    * @Given I start a new session
    */
@@ -476,8 +468,11 @@ public function iWaitForTheElementToContain($locator, $text): void
    */
   public function makeScreenshot(AfterStepScope $scope): void
   {
-    if (!$scope->getTestResult()->isPassed()) {
-      $this->saveScreenshot(time().'.png', $this->SCREENSHOT_DIR);
+    try {
+      if (!$scope->getTestResult()->isPassed()) {
+        $this->saveScreenshot(time().'.png', $this->SCREENSHOT_DIR);
+      }
+    } catch (Exception $exception) {
     }
   }
 

diff --git a/tests/behat/context/CatrowebBrowserContext.php b/tests/behat/context/CatrowebBrowserContext.php
@@ -97,14 +97,6 @@ public function deactivateRealGeocoderService(): void
     $this->getSymfonyService(StatisticsService::class)->useRealService(false);
   }
 
-  /**
-   * @AfterScenario
-   */
-  public function disableProfiler(): void
-  {
-    $this->getSymfonyService('profiler')->disable();
-  }
-
   //--------------------------------------------------------------------------------------------------------------------
   //  Authentication
   //--------------------------------------------------------------------------------------------------------------------