Improve tests

joomla · Aug 25, 2020 · 68d7382 · 68d7382
1 parent 07ea6e6
commit 68d7382
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/administrator/components/com_contact/src/Model/ContactModel.php b/administrator/components/com_contact/src/Model/ContactModel.php
@@ -131,7 +131,7 @@ protected function batchUser($value, $pks, $contexts)
 	protected function canDelete($record)
 	{
 		// We ignore the requirement for an item to be trashed when calling delete from the API
-		if (empty($record->id) || ($record->published != -2 && !Factory::getApplication()->isClient('api')))
+		if (empty($record->id) || $record->published != -2)
 		{
 			return false;
 		}

diff --git a/tests/Codeception/api/com_contact/ContactCest.php b/tests/Codeception/api/com_contact/ContactCest.php
@@ -80,7 +80,7 @@ public function testCrudOnArticle(ApiTester $I)
 		$I->amHttpAuthenticated('admin', 'admin');
 		$I->haveHttpHeader('Content-Type', 'application/json');
 		$I->haveHttpHeader('Accept', 'application/vnd.api+json');
-		$I->sendGET('/contact/1', ['name' => 'Frankie Blogs']);
+		$I->sendPATCH('/contact/1', ['name' => 'Frankie Blogs', 'state' => -2]);
 		$I->seeResponseCodeIs(HttpCode::OK);
 
 		$I->amHttpAuthenticated('admin', 'admin');

diff --git a/tests/Codeception/api/com_content/ContentCest.php b/tests/Codeception/api/com_content/ContentCest.php
@@ -89,12 +89,40 @@ public function testCrudOnArticle(ApiTester $I)
 		$I->amBearerAuthenticated('c2hhMjU2OjM6ZTJmMjJlYTNlNTU0NmM1MDJhYTIzYzMwN2MxYzAwZTQ5NzJhMWRmOTUyNjY5MTk2YjE5ODJmZWMwZTcxNzgwMQ==');
 		$I->haveHttpHeader('Content-Type', 'application/json');
 		$I->haveHttpHeader('Accept', 'application/vnd.api+json');
-		$I->sendGET('/content/article/1', ['title' => 'Another Title']);
+		$I->sendPATCH('/content/article/1', ['title' => 'Another Title']);
 		$I->seeResponseCodeIs(HttpCode::OK);
 
 		$I->amBearerAuthenticated('c2hhMjU2OjM6ZTJmMjJlYTNlNTU0NmM1MDJhYTIzYzMwN2MxYzAwZTQ5NzJhMWRmOTUyNjY5MTk2YjE5ODJmZWMwZTcxNzgwMQ==');
 		$I->haveHttpHeader('Accept', 'application/vnd.api+json');
 		$I->sendDELETE('/content/article/1');
 		$I->seeResponseCodeIs(HttpCode::NO_CONTENT);
 	}
+
+	/**
+	 * Test the crud endpoints of com_content from the API.
+	 *
+	 * @param   mixed   ApiTester  $I  Api tester
+	 *
+	 * @return void
+	 *
+	 * @since   4.0.0
+	 *
+	 * @TODO: Make these separate tests but requires sample data being installed so there are existing categories
+	 */
+	public function testCrudOnCategory(ApiTester $I)
+	{
+		$I->amHttpAuthenticated('admin', 'admin');
+		$I->haveHttpHeader('Content-Type', 'application/json');
+		$I->haveHttpHeader('Accept', 'application/vnd.api+json');
+
+		$testarticle = [
+			'title' => 'Just for you',
+			'catid' => 2,
+			'articletext' => 'A dummy article to save to the database',
+			'language' => '*',
+			'alias' => 'tobias'
+		];
+
+		$I->sendPOST('/content/article', $testarticle);
+	}
 }