X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fworkflows%2Ftests%2Fsrc%2FKernel%2FRequiredStatesTest.php;fp=web%2Fcore%2Fmodules%2Fworkflows%2Ftests%2Fsrc%2FKernel%2FRequiredStatesTest.php;h=8d4edc90124485644116ee188231497abe452bad;hp=c9ef7151d771cf05865cad5304b5a7e41f895be7;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5

diff --git a/web/core/modules/workflows/tests/src/Kernel/RequiredStatesTest.php b/web/core/modules/workflows/tests/src/Kernel/RequiredStatesTest.php
index c9ef7151d..8d4edc901 100644
--- a/web/core/modules/workflows/tests/src/Kernel/RequiredStatesTest.php
+++ b/web/core/modules/workflows/tests/src/Kernel/RequiredStatesTest.php
@@ -22,7 +22,6 @@ class RequiredStatesTest extends KernelTestBase {
 
   /**
    * @covers ::getRequiredStates
-   * @covers ::initializeWorkflow
    * @covers ::__construct
    */
   public function testGetRequiredStates() {
@@ -30,15 +29,14 @@ class RequiredStatesTest extends KernelTestBase {
       'id' => 'test',
       'type' => 'workflow_type_required_state_test',
     ], 'workflow');
-    $workflow = $workflow->getTypePlugin()->initializeWorkflow($workflow);
     $workflow->save();
     $this->assertEquals(['fresh', 'rotten'], $workflow->getTypePlugin()
       ->getRequiredStates());
 
     // Ensure that the workflow has the default configuration.
-    $this->assertTrue($workflow->hasState('rotten'));
-    $this->assertTrue($workflow->hasState('fresh'));
-    $this->assertTrue($workflow->hasTransitionFromStateToState('fresh', 'rotten'));
+    $this->assertTrue($workflow->getTypePlugin()->hasState('rotten'));
+    $this->assertTrue($workflow->getTypePlugin()->hasState('fresh'));
+    $this->assertTrue($workflow->getTypePlugin()->hasTransitionFromStateToState('fresh', 'rotten'));
   }
 
   /**
@@ -49,11 +47,11 @@ class RequiredStatesTest extends KernelTestBase {
       'id' => 'test',
       'type' => 'workflow_type_required_state_test',
     ], 'workflow');
-    $workflow = $workflow->getTypePlugin()->initializeWorkflow($workflow);
     $workflow->save();
     // Ensure that required states can't be deleted.
     $this->setExpectedException(RequiredStateMissingException::class, "Required State Type Test' requires states with the ID 'fresh' in workflow 'test'");
-    $workflow->deleteState('fresh')->save();
+    $workflow->getTypePlugin()->deleteState('fresh');
+    $workflow->save();
   }
 
   /**
@@ -63,6 +61,9 @@ class RequiredStatesTest extends KernelTestBase {
     $workflow = new Workflow([
       'id' => 'test',
       'type' => 'workflow_type_required_state_test',
+      'type_settings' => [
+        'states' => [],
+      ],
     ], 'workflow');
     $this->setExpectedException(RequiredStateMissingException::class, "Required State Type Test' requires states with the ID 'fresh', 'rotten' in workflow 'test'");
     $workflow->save();
@@ -76,45 +77,49 @@ class RequiredStatesTest extends KernelTestBase {
       'id' => 'test',
       'type' => 'workflow_type_required_state_test',
     ], 'workflow');
-    $workflow = $workflow->getTypePlugin()->initializeWorkflow($workflow);
     $workflow->save();
 
     // Ensure states added by default configuration can be changed.
-    $this->assertEquals('Fresh', $workflow->getState('fresh')->label());
+    $this->assertEquals('Fresh', $workflow->getTypePlugin()->getState('fresh')->label());
     $workflow
-      ->setStateLabel('fresh', 'Fresher')
-      ->save();
-    $this->assertEquals('Fresher', $workflow->getState('fresh')->label());
+      ->getTypePlugin()
+      ->setStateLabel('fresh', 'Fresher');
+    $workflow->save();
+    $this->assertEquals('Fresher', $workflow->getTypePlugin()->getState('fresh')->label());
 
     // Ensure transitions can be altered.
     $workflow
+      ->getTypePlugin()
       ->addState('cooked', 'Cooked')
-      ->setTransitionFromStates('rot', ['fresh', 'cooked'])
-      ->save();
-    $this->assertTrue($workflow->hasTransitionFromStateToState('fresh', 'rotten'));
-    $this->assertTrue($workflow->hasTransitionFromStateToState('cooked', 'rotten'));
+      ->setTransitionFromStates('rot', ['fresh', 'cooked']);
+    $workflow->save();
+    $this->assertTrue($workflow->getTypePlugin()->hasTransitionFromStateToState('fresh', 'rotten'));
+    $this->assertTrue($workflow->getTypePlugin()->hasTransitionFromStateToState('cooked', 'rotten'));
 
     $workflow
-      ->setTransitionFromStates('rot', ['cooked'])
-      ->save();
-    $this->assertFalse($workflow->hasTransitionFromStateToState('fresh', 'rotten'));
-    $this->assertTrue($workflow->hasTransitionFromStateToState('cooked', 'rotten'));
+      ->getTypePlugin()
+      ->setTransitionFromStates('rot', ['cooked']);
+    $workflow->save();
+    $this->assertFalse($workflow->getTypePlugin()->hasTransitionFromStateToState('fresh', 'rotten'));
+    $this->assertTrue($workflow->getTypePlugin()->hasTransitionFromStateToState('cooked', 'rotten'));
 
     // Ensure the default configuration does not cause ordering issues.
-    $workflow->addTransition('cook', 'Cook', ['fresh'], 'cooked')->save();
+    $workflow->getTypePlugin()->addTransition('cook', 'Cook', ['fresh'], 'cooked');
+    $workflow->save();
     $this->assertSame([
       'cooked',
       'fresh',
       'rotten',
-    ], array_keys($workflow->get('states')));
+    ], array_keys($workflow->getTypePlugin()->getConfiguration()['states']));
     $this->assertSame([
       'cook',
       'rot',
-    ], array_keys($workflow->get('transitions')));
+    ], array_keys($workflow->getTypePlugin()->getConfiguration()['transitions']));
 
     // Ensure that transitions can be deleted.
-    $workflow->deleteTransition('rot')->save();
-    $this->assertFalse($workflow->hasTransition('rot'));
+    $workflow->getTypePlugin()->deleteTransition('rot');
+    $workflow->save();
+    $this->assertFalse($workflow->getTypePlugin()->hasTransition('rot'));
   }
 
 }