From 43807126cb4505e8f6c38faf3adb7d1e6d756e1d Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Wed, 13 Sep 2023 14:36:37 +0300
Subject: [PATCH 01/14] UHF-8946: if user tries to access job listing with
 wrong language, redirect them to the existing translation if one can be found

---
 .../JobListingRedirectSubscriber.php          | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
index 5b917ae6..1032702f 100644
--- a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
+++ b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
@@ -70,4 +70,36 @@ public function on403(ExceptionEvent $event): void {
     $event->setResponse($response);
   }
 
+  /**
+   * If trying to access non-existing translation, redirect to existing one.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\ExceptionEvent $event
+   *   The Event to process.
+   */
+  public function on404(ExceptionEvent $event) {
+    $uri = $event->getRequest()->getRequestUri();
+    $redirectFrom = 'avoimet-tyopaikat/avoimet-tyopaikat/';
+    if (!str_contains($uri, $redirectFrom)) {
+      return;
+    }
+
+    $recruitmentId = array_reverse(explode('/', $uri))[0];
+    $nodes = \Drupal::entityTypeManager()
+      ->getStorage('node')
+      ->loadByProperties(['field_recruitment_id' => $recruitmentId]);
+
+    if (!$nodes || !$node = reset($nodes)) {
+      return;
+    }
+
+    // Since we are listening to 404 exception,
+    // the node loaded is automatically existing translation.
+    // We can just redirect without worrying whether the translation exists.
+    $response = new RedirectResponse(
+      $node->toUrl('canonical', ['language' => $node->language()])->toString(),
+      302
+    );
+    $event->setResponse($response);
+  }
+
 }

From b64c1005823778fea55ef1adf7dc68572b7c5673 Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Wed, 13 Sep 2023 15:20:00 +0300
Subject: [PATCH 02/14] UHF-8946: change redirectresponse to
 trustedredirectresponse

---
 .../src/EventSubscriber/JobListingRedirectSubscriber.php   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
index 1032702f..5349d14e 100644
--- a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
+++ b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
@@ -6,10 +6,10 @@
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\EventSubscriber\HttpExceptionSubscriberBase;
+use Drupal\Core\Routing\TrustedRedirectResponse;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 
 /**
@@ -66,7 +66,7 @@ public function on403(ExceptionEvent $event): void {
     $url = Url::fromRoute('entity.node.canonical', ['node' => $redirectNode])->toString();
 
     // Set temporary redirect.
-    $response = new RedirectResponse($url, 307);
+    $response = new TrustedRedirectResponse($url, 307);
     $event->setResponse($response);
   }
 
@@ -95,9 +95,8 @@ public function on404(ExceptionEvent $event) {
     // Since we are listening to 404 exception,
     // the node loaded is automatically existing translation.
     // We can just redirect without worrying whether the translation exists.
-    $response = new RedirectResponse(
+    $response = new TrustedRedirectResponse(
       $node->toUrl('canonical', ['language' => $node->language()])->toString(),
-      302
     );
     $event->setResponse($response);
   }

From 70b20a4bef79f57c46dba59bc240ca3d6daf9bc1 Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Wed, 13 Sep 2023 15:23:30 +0300
Subject: [PATCH 03/14] UHF-8946: add cacheable dependecy

---
 .../src/EventSubscriber/JobListingRedirectSubscriber.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
index 5349d14e..7d0eecca 100644
--- a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
+++ b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
@@ -95,9 +95,9 @@ public function on404(ExceptionEvent $event) {
     // Since we are listening to 404 exception,
     // the node loaded is automatically existing translation.
     // We can just redirect without worrying whether the translation exists.
-    $response = new TrustedRedirectResponse(
-      $node->toUrl('canonical', ['language' => $node->language()])->toString(),
-    );
+    $url = $node->toUrl('canonical', ['language' => $node->language()])->toString();
+    $response = new TrustedRedirectResponse($url);
+    $response->addCacheableDependency($url);
     $event->setResponse($response);
   }
 

From 5a38830f3f3180835a5a864ac5062c029010c667 Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Wed, 13 Sep 2023 15:47:26 +0300
Subject: [PATCH 04/14] UHF-8946: inject entitytypemanager, code fixes

---
 .../helfi_rekry_content.services.yml                   |  2 +-
 .../EventSubscriber/JobListingRedirectSubscriber.php   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/modules/custom/helfi_rekry_content/helfi_rekry_content.services.yml b/public/modules/custom/helfi_rekry_content/helfi_rekry_content.services.yml
index 174cf26d..3c763898 100644
--- a/public/modules/custom/helfi_rekry_content/helfi_rekry_content.services.yml
+++ b/public/modules/custom/helfi_rekry_content/helfi_rekry_content.services.yml
@@ -15,7 +15,7 @@ services:
       - { name: 'event_subscriber' }
   helfi_rekry_content.job_listing_redirect_subscriber:
     class: Drupal\helfi_rekry_content\EventSubscriber\JobListingRedirectSubscriber
-    arguments: ['@config.factory', '@current_user']
+    arguments: ['@config.factory', '@current_user', '@entity_type.manager']
     tags:
       - { name: 'event_subscriber' }
   logger.channel.helfi_rekry_content:
diff --git a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
index 7d0eecca..2a59e71c 100644
--- a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
+++ b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
@@ -5,6 +5,7 @@
 namespace Drupal\helfi_rekry_content\EventSubscriber;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\EventSubscriber\HttpExceptionSubscriberBase;
 use Drupal\Core\Routing\TrustedRedirectResponse;
 use Drupal\Core\Session\AccountInterface;
@@ -27,7 +28,8 @@ class JobListingRedirectSubscriber extends HttpExceptionSubscriberBase {
    */
   public function __construct(
     protected ConfigFactoryInterface $configFactory,
-    protected AccountInterface $currentUser
+    protected AccountInterface $currentUser,
+    protected EntityTypeManager $entityTypeManager,
   ) {}
 
   /**
@@ -73,10 +75,10 @@ public function on403(ExceptionEvent $event): void {
   /**
    * If trying to access non-existing translation, redirect to existing one.
    *
-   * @param \Symfony\Component\HttpKernel\Event\ExceptionEvent $event
+   * @param ExceptionEvent $event
    *   The Event to process.
    */
-  public function on404(ExceptionEvent $event) {
+  public function on404(ExceptionEvent $event) : void {
     $uri = $event->getRequest()->getRequestUri();
     $redirectFrom = 'avoimet-tyopaikat/avoimet-tyopaikat/';
     if (!str_contains($uri, $redirectFrom)) {
@@ -84,7 +86,7 @@ public function on404(ExceptionEvent $event) {
     }
 
     $recruitmentId = array_reverse(explode('/', $uri))[0];
-    $nodes = \Drupal::entityTypeManager()
+    $nodes = $this->entityTypeManager
       ->getStorage('node')
       ->loadByProperties(['field_recruitment_id' => $recruitmentId]);
 

From 1c0ca9103743f457da8bb78ae4083d3be1a89751 Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 08:27:10 +0300
Subject: [PATCH 05/14] UHF-8946: added all of the job listing pages to the
 redirect logic

---
 .../JobListingRedirectSubscriber.php          | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
index 2a59e71c..0a510f25 100644
--- a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
+++ b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
@@ -80,8 +80,21 @@ public function on403(ExceptionEvent $event): void {
    */
   public function on404(ExceptionEvent $event) : void {
     $uri = $event->getRequest()->getRequestUri();
-    $redirectFrom = 'avoimet-tyopaikat/avoimet-tyopaikat/';
-    if (!str_contains($uri, $redirectFrom)) {
+    $redirectPaths = [
+      'avoimet-tyopaikat/avoimet-tyopaikat/',
+      'lediga-jobb/lediga-jobb/',
+      'open-jobs/open-jobs/',
+    ];
+
+    $redirectFrom = NULL;
+    foreach($redirectPaths as $path) {
+      if (str_contains($uri, $path)) {
+        $redirectFrom = $path;
+        break;
+      }
+    }
+
+    if (!$redirectFrom) {
       return;
     }
 
@@ -94,9 +107,6 @@ public function on404(ExceptionEvent $event) : void {
       return;
     }
 
-    // Since we are listening to 404 exception,
-    // the node loaded is automatically existing translation.
-    // We can just redirect without worrying whether the translation exists.
     $url = $node->toUrl('canonical', ['language' => $node->language()])->toString();
     $response = new TrustedRedirectResponse($url);
     $response->addCacheableDependency($url);

From 4ee5d43a0af90f529f18ff1dd9158c9bc02b1a72 Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 08:43:16 +0300
Subject: [PATCH 06/14] UHF-8946: code fixes

---
 .../EventSubscriber/JobListingRedirectSubscriber.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
index 0a510f25..5dca6072 100644
--- a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
+++ b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
@@ -25,6 +25,8 @@ class JobListingRedirectSubscriber extends HttpExceptionSubscriberBase {
    *   The configuration factory.
    * @param \Drupal\Core\Session\AccountInterface $currentUser
    *   The current user.
+   * @param \Drupal\Core\Entity\EntityTypeManager $entityTypeManager
+   *   The entity type manager.
    */
   public function __construct(
     protected ConfigFactoryInterface $configFactory,
@@ -75,19 +77,19 @@ public function on403(ExceptionEvent $event): void {
   /**
    * If trying to access non-existing translation, redirect to existing one.
    *
-   * @param ExceptionEvent $event
+   * @param \Symfony\Component\HttpKernel\Event\ExceptionEvent $event
    *   The Event to process.
    */
   public function on404(ExceptionEvent $event) : void {
     $uri = $event->getRequest()->getRequestUri();
     $redirectPaths = [
-      'avoimet-tyopaikat/avoimet-tyopaikat/',
-      'lediga-jobb/lediga-jobb/',
-      'open-jobs/open-jobs/',
+      'fi' => 'avoimet-tyopaikat/avoimet-tyopaikat/',
+      'sv' => 'lediga-jobb/lediga-jobb/',
+      'en' => 'open-jobs/open-jobs/',
     ];
 
     $redirectFrom = NULL;
-    foreach($redirectPaths as $path) {
+    foreach ($redirectPaths as $path) {
       if (str_contains($uri, $path)) {
         $redirectFrom = $path;
         break;

From 76ce2318cacb43216fbc2f68383cc772dc50400a Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 09:12:18 +0300
Subject: [PATCH 07/14] UHF-8946: updated comments

---
 .../src/EventSubscriber/JobListingRedirectSubscriber.php  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
index 5dca6072..c7420bc1 100644
--- a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
+++ b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
@@ -14,7 +14,7 @@
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 
 /**
- * Redirect job listing 403s for anonymous users.
+ * Http exception event subscribers for job listings.
  */
 class JobListingRedirectSubscriber extends HttpExceptionSubscriberBase {
 
@@ -75,7 +75,11 @@ public function on403(ExceptionEvent $event): void {
   }
 
   /**
-   * If trying to access non-existing translation, redirect to existing one.
+   * The 404 exception listener.
+   *
+   * #UHF-8946 External service's automation is only capable of creating links to
+   * finnish job listings. If finnish translation doesn't exist the user will be
+   * automatically redirected to existing translation with matching job ID.
    *
    * @param \Symfony\Component\HttpKernel\Event\ExceptionEvent $event
    *   The Event to process.

From aaff2c691379f4082997064ed34ae3930216186f Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 09:15:18 +0300
Subject: [PATCH 08/14] UHF-8946: code fixes

---
 .../src/EventSubscriber/JobListingRedirectSubscriber.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
index c7420bc1..716cd709 100644
--- a/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
+++ b/public/modules/custom/helfi_rekry_content/src/EventSubscriber/JobListingRedirectSubscriber.php
@@ -77,7 +77,7 @@ public function on403(ExceptionEvent $event): void {
   /**
    * The 404 exception listener.
    *
-   * #UHF-8946 External service's automation is only capable of creating links to
+   * #UHF8946 External service's automation is only capable of creating links to
    * finnish job listings. If finnish translation doesn't exist the user will be
    * automatically redirected to existing translation with matching job ID.
    *

From 13e0bcffaf344c6c69b324911756ef56e3c10e5e Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 11:09:41 +0300
Subject: [PATCH 09/14] UHF-8946: redirect test

---
 .../ExistingSite/JoblistingRedirectTest.php   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php

diff --git a/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php b/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
new file mode 100644
index 00000000..21684351
--- /dev/null
+++ b/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\helfi_rekry_content\Tests\dtt\src\ExistingSite;
+
+use weitzman\DrupalTestTraits\ExistingSiteBase;
+
+/**
+ * Test job listing redirect.
+ *
+ * @group dtt
+ */
+class JoblistingRedirectTest extends ExistingSiteBase {
+
+  /**
+   * Test job listing 404 redirect.
+   */
+  public function test404Redirect(): void {
+    $node = $this->createNode([
+      'type' => 'job_listing',
+      'langcode' => 'sv',
+      'title' => 'en jobb',
+      'field_recruitment_id' => 'TESTI-1234-56-7890'
+    ]);
+
+    $path = $node->toUrl()->toString();
+    $recruitmentId = array_reverse(explode('/', $path))[0];
+
+    $this->drupalGet("/fi/avoimet-tyopaikat/avoimet-tyopaikat/$recruitmentId");
+
+    $url = $this->getSession()->getCurrentUrl();
+
+    $this->assertTrue(str_ends_with($url, '/sv/lediga-jobb/lediga-jobb/testi-1234-56-7890'));
+  }
+
+}

From 0cc7bb19b675f35b37137ba834da23638d5be9ab Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 11:11:43 +0300
Subject: [PATCH 10/14] UHF-8946: code fixes

---
 .../tests/dtt/src/ExistingSite/JoblistingRedirectTest.php     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php b/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
index 21684351..c326fb70 100644
--- a/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
+++ b/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
@@ -21,16 +21,14 @@ public function test404Redirect(): void {
       'type' => 'job_listing',
       'langcode' => 'sv',
       'title' => 'en jobb',
-      'field_recruitment_id' => 'TESTI-1234-56-7890'
+      'field_recruitment_id' => 'TESTI-1234-56-7890',
     ]);
 
     $path = $node->toUrl()->toString();
     $recruitmentId = array_reverse(explode('/', $path))[0];
 
     $this->drupalGet("/fi/avoimet-tyopaikat/avoimet-tyopaikat/$recruitmentId");
-
     $url = $this->getSession()->getCurrentUrl();
-
     $this->assertTrue(str_ends_with($url, '/sv/lediga-jobb/lediga-jobb/testi-1234-56-7890'));
   }
 

From 3002caef25b2290e0a1d9ecd52598bd1dbee2fbd Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 12:14:00 +0300
Subject: [PATCH 11/14] UHF-8946: update & fix dtt test

---
 .github/workflows/test.yml                                | 2 +-
 phpunit.xml.dist                                          | 2 +-
 .../tests/dtt/src/ExistingSite/JoblistingRedirectTest.php | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 975c3a4e..0684d88d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -65,4 +65,4 @@ jobs:
       - name: Run PHPUnit tests
         run: |
           composer test-php public/modules/custom
-          [ -d "tests/" ] && composer test-php tests/ || echo "No DTT tests found. Ignoring..."
+          if [ -d "tests/" ]; then composer test-php tests/; else echo "No DTT tests found. Ignoring..."; fi
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 603e6d95..1a56d5be 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,7 +16,7 @@
   <env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"chromeOptions":{"w3c": false }}, "http://127.0.0.1:4444"]'/>
   <env name="DTT_API_OPTIONS" value='{"socketTimeout": 360, "domWaitTimeout": 3600000}' />
   <env name="DTT_API_URL" value="http://127.0.0.1:9222"/>
-  <env name="DTT_BASE_URL" value="http://127.0.0.1:8080"/>
+  <env name="DTT_BASE_URL" value="http://127.0.0.1:8888"/>
 </php>
 <testsuites>
   <testsuite name="unit">
diff --git a/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php b/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
index c326fb70..387224c1 100644
--- a/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
+++ b/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
@@ -4,14 +4,16 @@
 
 namespace Drupal\helfi_rekry_content\Tests\dtt\src\ExistingSite;
 
-use weitzman\DrupalTestTraits\ExistingSiteBase;
+
+
+use Drupal\Tests\helfi_api_base\Functional\ExistingSiteTestBase;
 
 /**
  * Test job listing redirect.
  *
  * @group dtt
  */
-class JoblistingRedirectTest extends ExistingSiteBase {
+class JoblistingRedirectTest extends ExistingSiteTestBase {
 
   /**
    * Test job listing 404 redirect.
@@ -27,7 +29,7 @@ public function test404Redirect(): void {
     $path = $node->toUrl()->toString();
     $recruitmentId = array_reverse(explode('/', $path))[0];
 
-    $this->drupalGet("/fi/avoimet-tyopaikat/avoimet-tyopaikat/$recruitmentId");
+    $this->drupalGetWithLanguage("/fi/avoimet-tyopaikat/avoimet-tyopaikat/$recruitmentId", 'fi');
     $url = $this->getSession()->getCurrentUrl();
     $this->assertTrue(str_ends_with($url, '/sv/lediga-jobb/lediga-jobb/testi-1234-56-7890'));
   }

From 62c439d18ae39f983ef33520e7a004b2977a26e0 Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 12:14:42 +0300
Subject: [PATCH 12/14] UHF-8946: updated api base to have working tests in
 this pr

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 6d6cc1a8..e9acffc9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3931,16 +3931,16 @@
         },
         {
             "name": "drupal/helfi_api_base",
-            "version": "2.5.2",
+            "version": "2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
-                "reference": "10f5700e4c38c403d2cc54d2733cadaff72d67c1"
+                "reference": "2a0a4fb2ea863232dc3eed32a3e8104fdffab178"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/10f5700e4c38c403d2cc54d2733cadaff72d67c1",
-                "reference": "10f5700e4c38c403d2cc54d2733cadaff72d67c1",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/2a0a4fb2ea863232dc3eed32a3e8104fdffab178",
+                "reference": "2a0a4fb2ea863232dc3eed32a3e8104fdffab178",
                 "shasum": ""
             },
             "require": {
@@ -3966,10 +3966,10 @@
             ],
             "description": "Helfi - API Base",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.2",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.4",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
             },
-            "time": "2023-09-08T09:03:20+00:00"
+            "time": "2023-09-14T09:11:02+00:00"
         },
         {
             "name": "drupal/helfi_azure_fs",

From bb823de706431845c2aef38fab137354671bfc91 Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 12:35:04 +0300
Subject: [PATCH 13/14] UHF-8946: conflict merge fix

---
 composer.lock | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index a24be67c..93d642d4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3970,10 +3970,6 @@
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
             },
             "time": "2023-09-14T09:11:02+00:00"
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.3",
-                "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
-            },
-            "time": "2023-09-13T05:29:57+00:00"
         },
         {
             "name": "drupal/helfi_azure_fs",

From b1220351399439d93956c18e75a408cf08d7ba12 Mon Sep 17 00:00:00 2001
From: rpnykanen <risto.nykanen@druid.fi>
Date: Thu, 14 Sep 2023 12:40:59 +0300
Subject: [PATCH 14/14] UHF-8946: code fixes

---
 .../tests/dtt/src/ExistingSite/JoblistingRedirectTest.php       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php b/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
index 387224c1..64aaa966 100644
--- a/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
+++ b/public/modules/custom/helfi_rekry_content/tests/dtt/src/ExistingSite/JoblistingRedirectTest.php
@@ -4,8 +4,6 @@
 
 namespace Drupal\helfi_rekry_content\Tests\dtt\src\ExistingSite;
 
-
-
 use Drupal\Tests\helfi_api_base\Functional\ExistingSiteTestBase;
 
 /**