Fixes after review

Author: pawlakadrian

features/standard/ContentManagement.feature

@@ -143,11 +143,11 @@ Scenario: Content can be copied
       | title                  | short_title            | intro            |
       | TestArticleToHideLater | TestArticleToHideLater | TestArticleIntro |
     And I'm on Content view Page for "ContentManagement/TestArticleToHideLater"
-    When I perform the "Hide" action
+    And I perform the "Hide" action
     And I select hide "later" for field options
     And I perform the "Confirm" action
     And I should be on Content view Page for "ContentManagement/TestArticleToHideLater"
-    Then I should see the alert contains "This Content item will be hidden and won't be publicly available after" appear
+    And I should see the alert contains "This Content item will be hidden and won't be publicly available after" appear
     When I run the scheduled jobs
     And I clear the behat cache directory
     Then I should see the alert "This Content item or its Location is hidden." appear
@@ -161,10 +161,10 @@ Scenario: Content can be copied
       | title                        | short_title                  | intro            |
       | TestArticleToCancelHideLater | TestArticleToCancelHideLater | TestArticleIntro |
     And I'm on Content view Page for "ContentManagement/TestArticleToCancelHideLater"
-    When I perform the "Hide" action
+    And I perform the "Hide" action
     And I select hide "later" for field options
     And I perform the "Confirm" action
     And I should be on Content view Page for "ContentManagement/TestArticleToCancelHideLater"
-    Then I should see the alert contains "This Content item will be hidden and won't be publicly available after" appear
+    And I should see the alert contains "This Content item will be hidden and won't be publicly available after" appear
     When I cancel scheduled hiding of the content item
     Then I should see the alert "Canceled scheduled hiding of Content item 'TestArticleToCancelHideLater'." appear

src/lib/Behat/Component/CancelContentDialog.php

@@ -95,8 +95,6 @@ class ContentViewPage extends Page
 
     private TableBuilder $tableBuilder;
 
-    private ?CancelContentDialog $cancelContentDialog;
-
     public function __construct(
         Session $session,
         Router $router,
@@ -115,8 +113,7 @@ public function __construct(
         UpperMenu $upperMenu,
         DeleteContentDialog $deleteContentDialog,
         CreateUrlAliasModal $createUrlAliasModal,
-        TableBuilder $tableBuilder,
-        ?CancelContentDialog $cancelContentDialog = null
+        TableBuilder $tableBuilder
     ) {
         parent::__construct($session, $router);
 
@@ -136,16 +133,12 @@ public function __construct(
         $this->deleteContentDialog = $deleteContentDialog;
         $this->createUrlAliasModal = $createUrlAliasModal;
         $this->tableBuilder = $tableBuilder;
-        $this->cancelContentDialog = $cancelContentDialog;
     }
 
-    public function startCreatingContent(string $contentTypeName, ?string $language = null)
+    public function startCreatingContent(string $contentTypeName)
     {
         $this->contentActionsMenu->clickButton('Create content');
         $this->contentTypePicker->verifyIsLoaded();
-        if ($language !== null) {
-            $this->contentTypePicker->selectLanguage($language);
-        }
         $this->contentTypePicker->select($contentTypeName);
         $this->contentTypePicker->confirm();
     }
@@ -430,8 +423,6 @@ public function cancelScheduledHiding(): void
     {
         $this->getHTMLPage()->find($this->getLocator('cancelScheduleButton'))->click();
         $this->dialog->verifyIsLoaded();
-        if ($this->cancelContentDialog !== null) {
-            $this->cancelContentDialog->confirmCanceling('Cancel scheduled hiding');
-        }
+        $this->dialog->confirm();
     }
 }