From 5f3fd5f06922f5358401719e2dceb6d6d91d115f Mon Sep 17 00:00:00 2001 From: DemeritCowboy Date: Wed, 4 Sep 2019 18:25:45 -0400 Subject: [PATCH] fix typo in second test and update to match first url workaround --- tests/phpunit/api/v3/AttachmentTest.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/api/v3/AttachmentTest.php b/tests/phpunit/api/v3/AttachmentTest.php index 33bc8ec2691..4d9833829cc 100644 --- a/tests/phpunit/api/v3/AttachmentTest.php +++ b/tests/phpunit/api/v3/AttachmentTest.php @@ -349,8 +349,16 @@ public function testCreate($testEntityClass, $createParams, $expectedContent) { 'return' => ['content'], ]); $this->assertEquals($expectedContent, $getResult2['values'][$fileId]['content']); + // Do this again even though we just tested above to demonstrate that these fields should be returned even if you only ask to return 'content'. foreach (['id', 'entity_table', 'entity_id', 'url'] as $field) { - $this->assertEquals($createResult['values'][$fileId][$field], $getResult['values'][$fileId][$field], "Expect field $field to match"); + if ($field == 'url') { + $this->assertEquals(substr($createResult['values'][$fileId][$field], 0, -15), substr($getResult2['values'][$fileId][$field], 0, -15)); + $this->assertEquals(substr($createResult['values'][$fileId][$field], -3), substr($getResult2['values'][$fileId][$field], -3)); + $this->assertApproxEquals(substr($createResult['values'][$fileId][$field], -14, 10), substr($getResult2['values'][$fileId][$field], -14, 10), 2); + } + else { + $this->assertEquals($createResult['values'][$fileId][$field], $getResult2['values'][$fileId][$field], "Expect field $field to match"); + } } }