fixed unit tests

SU-SWS · Oct 3, 2023 · 3ae5ffb · 3ae5ffb
1 parent e219c38
commit 3ae5ffb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/config/sync/core.entity_form_display.config_pages.stanford_basic_site_settings.default.yml b/config/sync/core.entity_form_display.config_pages.stanford_basic_site_settings.default.yml
@@ -61,7 +61,7 @@ third_party_settings:
         classes: ''
         show_empty_fields: false
         id: ''
-        direction: vertical
+        direction: horizontal
         width_breakpoint: 640
     group_site_details:
       children:

diff --git a/src/EventSubscriber/EventSubscriber.php b/src/EventSubscriber/EventSubscriber.php
@@ -98,7 +98,6 @@ public function onEntityInsert(EntityInsertEvent $event) {
   public function onEntityPreSave(EntityPresaveEvent $event) {
     $entity = $event->getEntity();
     if (
-      !getenv('CI') &&
       $entity->getEntityTypeId() == 'config_pages' &&
       $entity->bundle() == 'stanford_basic_site_settings'
     ) {
@@ -117,6 +116,7 @@ public function onKernelRequest(RequestEvent $event) {
     $current_uri = $event->getRequest()->getRequestUri();
 
     if (
+      !getenv('CI') &&
       $current_uri != '/admin/config/system/basic-site-settings' &&
       self::redirectUser()
     ) {

diff --git a/tests/src/Kernel/EventSubscriber/EventSubscriberTest.php b/tests/src/Kernel/EventSubscriber/EventSubscriberTest.php
@@ -14,6 +14,7 @@
 use Drupal\media\Entity\Media;
 use Drupal\media\Entity\MediaType;
 use Drupal\stanford_profile\EventSubscriber\EventSubscriber as StanfordEventSubscriber;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
 /**
  * Class EventSubscriberTest.
@@ -60,11 +61,7 @@ public function setup(): void {
     $this->installEntitySchema('oauth2_token');
     $this->installEntitySchema('media');
 
-
-    $file_system = $this->createMock(FileSystemInterface::class);
-    $logger_factory = $this->createMock(LoggerChannelFactoryInterface::class);
-
-    $this->eventSubscriber = new TestStanfordEventSubscriber($file_system, $logger_factory);
+    $this->eventSubscriber = \Drupal::service('stanford_profile.event_subscriber');
 
     /** @var \Drupal\media\MediaTypeInterface $media_type */
     $media_type = MediaType::create([