From 33aec90a780fe8e6031d918c8a0f66098091af0f Mon Sep 17 00:00:00 2001
From: naomi <naomi@happycatsin.space>
Date: Fri, 3 Jun 2022 10:41:39 +0100
Subject: [PATCH] fixed revision reverting error for activities

---
 .../src/Form/OCActivityRevisionRevertForm.php |  2 +-
 .../Unit/OCActivityRevisionRevertFormTest.php | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 tests/src/Unit/OCActivityRevisionRevertFormTest.php

diff --git a/modules/opencase_entities/src/Form/OCActivityRevisionRevertForm.php b/modules/opencase_entities/src/Form/OCActivityRevisionRevertForm.php
index 4421559..45a4b1d 100644
--- a/modules/opencase_entities/src/Form/OCActivityRevisionRevertForm.php
+++ b/modules/opencase_entities/src/Form/OCActivityRevisionRevertForm.php
@@ -57,7 +57,7 @@ class OCActivityRevisionRevertForm extends ConfirmFormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('oc_activity'),
+      $container->get('entity_type.manager')->getStorage('oc_activity'),
       $container->get('date.formatter')
     );
   }
diff --git a/tests/src/Unit/OCActivityRevisionRevertFormTest.php b/tests/src/Unit/OCActivityRevisionRevertFormTest.php
new file mode 100644
index 0000000..c75887e
--- /dev/null
+++ b/tests/src/Unit/OCActivityRevisionRevertFormTest.php
@@ -0,0 +1,40 @@
+<?php declare(strict_types = 1);
+
+namespace Drupal\Tests\opencase\Unit;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Form\FormState;
+use Drupal\opencase_entities\Form\OCActivityRevisionRevertForm;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class OCActivityRevisionRevertFormTest extends UnitTestCase{
+    public function setUp(): void {
+        $container = new ContainerBuilder();
+        $entityTypeManager = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityTypeManager')->disableOriginalConstructor()->getMock();
+        $dateFormatter = $this->getMockBuilder('\\Drupal\\Core\\Datetime\\DateFormatterInterface')->disableOriginalConstructor()->getMock();
+        $storage = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityStorageInterface')->disableOriginalConstructor()->getMock();
+        $revision = $this->getMockBuilder('\\Drupal\\opencase_entities\\Entity\OCActivity')->disableOriginalConstructor()->getMock();
+        $request = new Request([], [], [], [], [], [], [], json_encode([
+            'foo' => 'bar'
+        ]));
+        $requestStack = new RequestStack();
+        $requestStack->push($request);
+        $dateFormatter->method('format');
+        $container->set('entity_type.manager', $entityTypeManager);
+        $container->set('date.formatter', $dateFormatter);
+        $entityTypeManager->method('getStorage')->willReturn($storage);
+        $storage->method('loadRevision')->willReturn($revision);
+        $container->set('string_translation', self::getStringTranslationStub());
+        $container->set('request_stack', $requestStack);
+        \Drupal::setContainer($container);
+        $this->reverter = OCActivityRevisionRevertForm::create($container);
+    }
+
+    public function testBuildForm():void {
+        $form = [];
+        $this->assertTrue(is_array($this->reverter->buildForm($form, new FormState())));
+    }
+
+}