Merge pull request #66 from tarfin-labs/WEB-4061-test-senaryo-datalar…

…inin-v-4-te-kullanilabilir-olmasinin-saglanmasi
tarfin-labs · Nov 20, 2023 · 65a7c67 · 65a7c67
2 parents 1322d0e + 35237a5
commit 65a7c67
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/Definition/MachineDefinition.php b/src/Definition/MachineDefinition.php
@@ -629,6 +629,9 @@ public function transition(
 
         // Get scenario state if exists
         $newState = $this->getScenarioStateIfAvailable(state: $newState, eventBehavior: $eventBehavior);
+        if ($state->currentStateDefinition->id !== $newState->currentStateDefinition->id) {
+            $targetStateDefinition = $newState->currentStateDefinition;
+        }
 
         // Record state enter event
         $state->setInternalEventBehavior(

diff --git a/tests/ScenarioTest.php b/tests/ScenarioTest.php
@@ -14,12 +14,12 @@
     expect($state)
         ->toBeInstanceOf(State::class)
         ->and($state->value)->toBe([MachineDefinition::DEFAULT_ID.MachineDefinition::STATE_DELIMITER.'test.stateC'])
-        ->and($state->context->count)->toBe(0);
+        ->and($state->context->count)->toBe(-1);
 
     $state = $machine->send('EVENT_D');
 
     expect($state)
         ->toBeInstanceOf(State::class)
         ->and($state->value)->toBe([MachineDefinition::DEFAULT_ID.MachineDefinition::STATE_DELIMITER.'test.stateA'])
-        ->and($state->context->count)->toBe(-1);
+        ->and($state->context->count)->toBe(-2);
 });
diff --git a/tests/Stubs/Machines/MachineWithScenarios.php b/tests/Stubs/Machines/MachineWithScenarios.php
@@ -65,6 +65,9 @@ public static function definition(): MachineDefinition
                         ],
                     ],
                     'stateC' => [
+                        'entry' => [
+                            'decrementAction',
+                        ],
                         'on' => [
                             'EVENT_D' => [
                                 'target'  => 'stateA',