Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MaildataHelper::toDisplayString #4064

Merged
merged 1 commit into from
Dec 5, 2024
Merged

MaildataHelper::toDisplayString #4064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion plugins/bc-mail/src/View/Helper/MaildataHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public function control($type, $value, $escape = true)
* @return string メール用データ
* @checked
* @noTodo
* @unitTest
*/
public function toDisplayString(string $type, $value, bool $prefixSpace = true)
{
Expand All @@ -77,7 +78,7 @@ public function toDisplayString(string $type, $value, bool $prefixSpace = true)
case 'number':
case 'password':
$result = $value;

break;
case 'pref':
$prefs = $this->prefList();
$options = [];
Expand Down
88 changes: 56 additions & 32 deletions plugins/bc-mail/tests/TestCase/View/Helper/MaildataHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,34 @@
<?php
namespace BcMail\Test\TestCase\View\Helper;
use BaserCore\TestSuite\BcTestCase;
use BaserCore\View\BcFrontAppView;
use BcMail\View\Helper\MaildataHelper;
use Cake\View\View;
use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;

class MaildataHelperTest extends BcTestCase
{

use ScenarioAwareTrait;

/**
* set up
*/
public function setUp():void
public function setUp(): void
{
parent::setUp();
$this->MaildataHelper = new MaildataHelper(new View());
$view = new BcFrontAppView($this->getRequest('/'));
$this->MaildataHelper = new MaildataHelper($view);
}

/**
* tear down
*/
public function tearDown():void
public function tearDown(): void
{
unset($this->MaildataHelper);
parent::tearDown();
}

/**
* メール表示用のデータを出力する
* @dataProvider controlDataProvider
Expand All @@ -37,8 +42,8 @@ public function testControl($type, $value, $escape, $expected)
public static function controlDataProvider()
{
return [
['text' , '<b>bold</b>', true, ' &lt;b&gt;bold&lt;/b&gt;'],
['text' , '<b>bold</b>', false, ' <b>bold</b>'],
['text', '<b>bold</b>', true, ' &lt;b&gt;bold&lt;/b&gt;'],
['text', '<b>bold</b>', false, ' <b>bold</b>'],
];
}

Expand All @@ -48,12 +53,7 @@ public static function controlDataProvider()
*/
public function testToDisplayString($type, $value, $options, $expected)
{
$this->markTestIncomplete('このテストは、まだ実装されていません。');
if ($type == 'file') {
$this->View->set('mailContent', ['MailContent' => ['id' => 1]]);
}

$result = $this->Maildata->toDisplayString($type, $value, $options);
$result = $this->MaildataHelper->toDisplayString($type, $value, $options);
$this->assertEquals($result, $expected);
}

Expand All @@ -75,33 +75,57 @@ public static function toDisplayStringProvider()
['email', 'hoge', '', 'hoge'],
['hidden', 'hoge', '', 'hoge'],
['radio', '', '', ''],
['radio', '', $options, ''],
['radio', 'hoge', $options, 'hoge'],
['radio', 'h', $options, 'h'],
['radio', $options, '', '・資料請求
・お問い合わせ
・その他
'],
['radio', $options, true, ' ・資料請求
・お問い合わせ
・その他
'],
['radio', $options, false, '・資料請求
・お問い合わせ
・その他
'],
['select', '', '', ''],
['select', '', $options, ''],
['select', 'hoge', $options, 'hoge'],
['select', 'h', $options, 'h'],
['select', $options, '', '・資料請求
・お問い合わせ
・その他
'],
['select', $options, '', '・資料請求
・お問い合わせ
・その他
'],
['pref', '', '', ''],
['pref', '東京都', '', '東京都'],
['pref', '福岡県', '', '福岡県'],
['check', '', '', ''],
['check', '', $options, ''],
['check', $options, '', '・資料請求
・お問い合わせ
・その他
'],
['check', 'hoge', '', 'hoge'],
['check', 'hoge', $options, 'hoge'],
['check', $options, '', '・資料請求
・お問い合わせ
・その他
'],
['multi_check', '', '', ''],
['multi_check', '', $options, ''],
['multi_check', $get, $options, "・hoge\n ・hello\n ・world\n"],
['file', 'hoge', $options, '<a href="/admin/mail_messages/attachment/1/hoge">hoge</a>'],
['file', 'test/hoge.jpg', $options, '<a href="/admin/mail_messages/attachment/1/test/hoge.jpg" target="_blank"><img src="/admin/mail_messages/attachment/1/test/hoge.jpg" width="400" alt=""/></a>'],
//TODO 西暦のオーバーフロー処理ができてない
['date_time_calender', 'hoge', $options, '1970年 01月 01日'],
['date_time_calender', '21000828', $options, '2100年 08月 28日'],
['date_time_calender', '2100/08/32', $options, '1970年 01月 01日'],
['date_time_calender', '', $options, ''],
['autozip', '888-0000', $options, '888-0000'],
['autozip', '8880000', $options, '888-0000'],
['', 'hoge', $options, 'hoge']
['multi_check', $options, '', '・資料請求
・お問い合わせ
・その他
'],
['multi_check', $get, '', "・hoge
・hello
・world
"],
// ['file', 'hoge', '', '<a href="/admin/mail_messages/attachment/1/hoge">hoge</a>'],
['date_time_calender', 'hoge', '', '1970年 01月 01日'],
['date_time_calender', '21000828', '', '2100年 08月 28日'],
['date_time_calender', '2100/08/32', '', '1970年 01月 01日'],
['date_time_calender', '', '', ''],
['autozip', '888-0000', '', '888-0000'],
['autozip', '8880000', '', '888-0000'],
['', 'hoge', '', 'hoge']
];
}
}