Merge pull request #118 from humhub/fix/114-tests

Fix tests on soft delete of content
humhub · Apr 27, 2023 · cc379ce · cc379ce
2 parents b399c5c + 1f3fc80
commit cc379ce
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/controllers/content/ContentController.php b/controllers/content/ContentController.php
@@ -90,7 +90,11 @@ public function actionView($id)
 
     public function actionDelete($id)
     {
-        $content = Content::findOne(['id' => $id]);
+        $content = Content::find()
+            ->where(['id' => $id])
+            ->andWhere(['!=', 'state', Content::STATE_DELETED])
+            ->one();
+
         if ($content === null) {
             return $this->returnError(404, 'Content not found!');
         }

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -7,7 +7,8 @@ Changelog
 - Enh #106: Allow to set `authclient` and `authclient_id` on user creating and updating
 - Enh #112: Added support of HttpBearer and QueryParam auth methods
 - Enh #117: Added support of user Impersonate
-- Enh #113: Deleted unnecessary code used for Calendar And Task Modules 
+- Enh #113: Deleted unnecessary code used for Calendar And Task Modules
+- Fix #114: Fix tests on soft delete of content
 
 0.8.0 (March 10, 2023)
 ----------------------

diff --git a/tests/codeception/acceptance/BearerTokensManagementCest.php b/tests/codeception/acceptance/BearerTokensManagementCest.php
@@ -13,7 +13,7 @@
 
 class BearerTokensManagementCest
 {
-    
+
     public function addNewBearerToken(AcceptanceTester $I)
     {
         $expiration = (new \Datetime('tomorrow'));
@@ -24,7 +24,7 @@ public function addNewBearerToken(AcceptanceTester $I)
         $I->selectUserFromPicker('#restuserbearertoken-userguid', 'Peter Tester');
         $I->fillField('RestUserBearerToken[expiration]', Yii::$app->formatter->asDate($expiration, 'short'));
         $I->fillField('RestUserBearerToken[expirationTime]', Yii::$app->formatter->asTime($expiration, 'short'));
-        $I->click('Add');
+        $I->jsClick('form button[type=submit]');
         $I->waitForText(Yii::$app->formatter->asDate($expiration));
     }