Skip to content

Commit

Permalink
fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonvarga committed Apr 8, 2024
1 parent 6f9b1e6 commit f764023
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tests/Fieldtypes/BardTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1299,12 +1299,12 @@ public function it_calls_hooks()
$expectedHtml = '<p>Second</p><p>First</p>';

$this->assertEquals($expectedHtml, $bard->augment($data));
$this->assertEquals($expectedData, $bard->process(json_encode($data)));
$this->assertEquals(json_encode($expectedData), $bard->preProcess($data));
$this->assertEquals($expectedData, $bard->process($data));
$this->assertEquals($expectedData, $bard->preProcess($data));
$this->assertEquals($expectedHtml, $bard->preProcessIndex($data));
$this->assertArrayHasKey('customData', $bard->preload(json_encode($data)));
$this->assertArrayHasKey('custom_field', $bard->extraRules(json_encode($data)));
$this->assertArrayHasKey('custom_field', $bard->extraValidationAttributes(json_encode($data)));
$this->assertArrayHasKey('customData', $bard->preload($data));
$this->assertArrayHasKey('custom_field', $bard->extraRules($data));
$this->assertArrayHasKey('custom_field', $bard->extraValidationAttributes($data));
}

private function bard($config = [])
Expand Down

1 comment on commit f764023

@jasonvarga
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should have been part of 6f9b1e6, oops.

Please sign in to comment.