Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/4.1' into security-advisory
Browse files Browse the repository at this point in the history
  • Loading branch information
chihiro-adachi committed Sep 15, 2022
2 parents ff231dc + 68b469c commit f14e37f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
8 changes: 8 additions & 0 deletions codeception/_support/Page/Admin/DeliveryEditPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ public function 入力_支払方法選択($array)
return $this;
}

public function 入力_お届け時間($value)
{
$this->tester->fillField(['id' => 'add-delivery-time-value'], $value);
$this->tester->click('#add-delivery-time-button');

return $this;
}

public function 入力_全国一律送料($value)
{
$this->tester->fillField(['id' => 'delivery_free_all'], $value);
Expand Down
9 changes: 6 additions & 3 deletions codeception/acceptance/EA07BasicinfoCest.php
Original file line number Diff line number Diff line change
Expand Up @@ -696,13 +696,16 @@ public function basicinfo_配送方法登録(AcceptanceTester $I)
->新規登録();

// 登録
DeliveryEditPage::at($I)
$Page = DeliveryEditPage::at($I)
->入力_配送業者名('配送業者名')
->入力_名称('名称')
->入力_支払方法選択(['1', '4'])
->入力_全国一律送料('100')
->登録();
->入力_お届け時間('<AM>')
->入力_全国一律送料('100');

$I->assertSame('<AM>', $I->grabTextFrom('a.display-label'));

$Page->登録();
DeliveryEditPage::at($I);
$I->see('保存しました', DeliveryEditPage::$登録完了メッセージ);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ file that was distributed with this source code.
var prototype = $collectionHolder.data('prototype');
var newForm = prototype.replace(/__name__/g, index);
var newForm = newForm.replace(/__value__/g, deliveryTimeName);
var newForm = $(prototype.replace(/__name__/g, index));
newForm.find('.display-label').text(deliveryTimeName)
// 要素を追加
var $lastRow = $('#delivery-time-group > li:last');
Expand Down

0 comments on commit f14e37f

Please sign in to comment.