Skip to content

fix: CI 復旧 (actions/cache@v4) と 4.3 でのテスト失敗・Bootstrap 5 クラス名の修正 #201

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

Open
ttokoro20240902 wants to merge 3 commits into
base: 4.2
Choose a base branch
from
Open

fix: CI 復旧 (actions/cache@v4) と 4.3 でのテスト失敗・Bootstrap 5 クラス名の修正 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a307a61
fix(ci): 廃止された actions/cache@v1 と ::set-output を更新
ttokoro20240902 Aug 3, 2026
d12e1c6
fix(test): decimal カラムの比較を assertEquals にする
ttokoro20240902 Aug 3, 2026
debb4b2
fix: Bootstrap 5 に存在しない mr-2 / mr-3 を me-2 / me-3 に修正
ttokoro20240902 Aug 3, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ jobs:
- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions Resource/template/admin/regist.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
</div>
</div>
<div class="col-1 icon_edit">
<a class="btn btn-ec-actionIcon mr-3 delete-item" data-bs-toggle="modal" data-bs-toggle="tooltip" data-bs-target="#confirmModal" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<a class="btn btn-ec-actionIcon me-3 delete-item" data-bs-toggle="modal" data-bs-toggle="tooltip" data-bs-target="#confirmModal" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<i class="fa fa-close fa-lg text-secondary"></i>
</a>
</div>
Expand Down Expand Up @@ -447,7 +447,7 @@
<div class="collapse show ec-cardCollapse" style="display: block;" id="categoryArea">
<div class="card-body">
<div class="text-center">
<a id="showSearchCategoryModal" class="btn btn-ec-regular mr-2 add" data-bs-toggle="modal" data-bs-target="#searchCategoryModal">カテゴリの追加</a>
<a id="showSearchCategoryModal" class="btn btn-ec-regular me-2 add" data-bs-toggle="modal" data-bs-target="#searchCategoryModal">カテゴリの追加</a>
</div>
<div class="tableish"
id="coupon_detail_list2"
Expand All @@ -470,7 +470,7 @@
</div>

<div class="col-1 icon_edit">
<a class="btn btn-ec-actionIcon mr-3 delete-item" data-bs-toggle="modal" data-bs-toggle="tooltip" data-bs-target="#confirmModal" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<a class="btn btn-ec-actionIcon me-3 delete-item" data-bs-toggle="modal" data-bs-toggle="tooltip" data-bs-target="#confirmModal" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<i class="fa fa-close fa-lg text-secondary"></i>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Resource/template/admin/regist_category_list_prototype.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>

<div class="col-1 icon_edit">
<a class="btn btn-ec-actionIcon mr-3 delete-item" data-bs-toggle="modal" data-bs-toggle="tooltip" data-bs-target="#confirmModal" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<a class="btn btn-ec-actionIcon me-3 delete-item" data-bs-toggle="modal" data-bs-toggle="tooltip" data-bs-target="#confirmModal" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<i class="fa fa-close fa-lg text-secondary"></i>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Resource/template/admin/regist_product_list_prototype.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</div>
</div>
<div class="col-1 icon_edit">
<a class="btn btn-ec-actionIcon mr-3 delete-item" data-bs-toggle="modal" data-bs-toggle="tooltip" data-bs-target="#confirmModal" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<a class="btn btn-ec-actionIcon me-3 delete-item" data-bs-toggle="modal" data-bs-toggle="tooltip" data-bs-target="#confirmModal" data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
<i class="fa fa-close fa-lg text-secondary"></i>
</a>
</div>
Expand Down
6 changes: 4 additions & 2 deletions Tests/Service/CouponServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,8 @@ public function testRecalcOrderDiscountRate()

$this->actual = $discount;
$this->expected = (int) round(round($total) * $discountRate / 100);
$this->verify();
// decimal カラムは Doctrine が文字列で返すため数値等価で比較する
self::assertEquals($this->expected, $this->actual);
}

/**
Expand Down Expand Up @@ -449,7 +450,8 @@ public function testRecalcOrderWithTaxRateIsEmpty()

$this->actual = $discount;
$this->expected = (int) round(round($total) * $discountRate / 100);
$this->verify();
// decimal カラムは Doctrine が文字列で返すため数値等価で比較する
self::assertEquals($this->expected, $this->actual);
}

/**
Expand Down
12 changes: 8 additions & 4 deletions Tests/Web/CouponControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ public function testShoppingCoupon()

$this->expected = round(0 - $Coupon->getDiscountPrice(), 2);
$this->actual = $Order->getItems()->getDiscounts()->first()->getPrice();
$this->verify();
// decimal カラムは Doctrine が文字列で返すため数値等価で比較する
self::assertEquals($this->expected, $this->actual);
}

/**
Expand Down Expand Up @@ -259,7 +260,8 @@ public function testShoppingCouponDiscountTypePrice()

$this->actual = $Coupon->getDiscountPrice();
$this->expected = 0 - $Order->getItems()->getDiscounts()->first()->getPrice();
$this->verify();
// decimal カラムは Doctrine が文字列で返すため数値等価で比較する
self::assertEquals($this->expected, $this->actual);
}

/**
Expand Down Expand Up @@ -300,7 +302,8 @@ public function testShoppingCouponDiscountTypeRate()

$this->actual = $CouponOrder->getDiscount();
$this->expected = 0 - $Order->getItems()->getDiscounts()->first()->getPrice();
$this->verify();
// decimal カラムは Doctrine が文字列で返すため数値等価で比較する
self::assertEquals($this->expected, $this->actual);
}

/**
Expand Down Expand Up @@ -358,7 +361,8 @@ public function testCompleteWithNonmember()

$this->actual = $Coupon->getDiscountPrice();
$this->expected = 0 - $Order->getItems()->getDiscounts()->first()->getPrice();
$this->verify();
// decimal カラムは Doctrine が文字列で返すため数値等価で比較する
self::assertEquals($this->expected, $this->actual);
}

/**
Expand Down
Loading