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

Deploy用のUbuntuイメージ更新 #6062

Merged
merged 5 commits into from
Nov 6, 2023
+11 −1
Merged

Deploy用のUbuntuイメージ更新 #6062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7372c67
GithubActionsのエラー対応
shinya Oct 5, 2023
d7c4359
GithubActionsのエラー対応
shinya Oct 5, 2023
28e236f
GithubActionsのエラー対応
shinya Oct 6, 2023
2796f7f
GithubActionsのエラー対応
shinya Oct 6, 2023
54144fa
Ubuntuのイメージ更新
shinya Nov 6, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
deploy:
name: Deploy
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
services:
postgres:
image: postgres:14
Expand Down
1 change: 1 addition & 0 deletions codeception/_support/AcceptanceTester.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public function logoutAsMember()
{
$I = $this;
$I->amOnPage('/');
$I->wait(1);
$isLogin = $I->grabTextFrom('.ec-headerNaviRole .ec-headerNav .ec-headerNav__item:nth-child(3) a');
if ($isLogin == 'ログアウト') {
$I->wait(1);
Expand Down
1 change: 1 addition & 0 deletions codeception/_support/Page/Admin/AbstractAdminPageStyleGuide.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ abstract class AbstractAdminPageStyleGuide extends AbstractAdminPage
*/
protected function atPage($pageTitle)
{
$this->tester->wait(1);
$this->tester->see($pageTitle, '.c-pageTitle');

return $this;
Expand Down
5 changes: 5 additions & 0 deletions codeception/_support/Page/Front/CartPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ public static function at($I)

public function 商品名($index)
{
$this->tester->waitForElementVisible(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__name']"]);
return $this->tester->grabTextFrom(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__name']"]);
}

public function 商品数量($index)
{
$this->tester->waitForElementVisible(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__amount']"]);
return $this->tester->grabTextFrom(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__amount']"]);
}

Expand All @@ -53,20 +55,23 @@ public function 明細数()

public function 商品数量増やす($index)
{
$this->tester->waitForElementVisible(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__amountUpDown']/a[contains(@class, 'ec-cartRow__amountUpButton')]"]);
$this->tester->click(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__amountUpDown']/a[contains(@class, 'ec-cartRow__amountUpButton')]"]);

return $this;
}

public function 商品数量減らす($index)
{
$this->tester->waitForElementVisible(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__amountUpDown']/a[contains(@class, 'ec-cartRow__amountDownButton')]"]);
$this->tester->click(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//div[@class='ec-cartRow__amountUpDown']/a[contains(@class, 'ec-cartRow__amountDownButton')]"]);

return $this;
}

public function 商品削除($index)
{
$this->tester->waitForElementVisible(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//li[@class='ec-cartRow__delColumn']/a"]);
$this->tester->click(['xpath' => "//div[@class='ec-cartRole']//ul[@class='ec-cartRow'][position()=${index}]//li[@class='ec-cartRow__delColumn']/a"]);
$this->tester->acceptPopup();

Expand Down
2 changes: 2 additions & 0 deletions codeception/_support/Page/Front/ProductListPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ public function __construct(\AcceptanceTester $I)

public function 表示件数設定($num)
{
$this->tester->waitForElementVisible(['css' => "select[name = 'disp_number']"]);
$this->tester->selectOption(['css' => "select[name = 'disp_number']"], "${num}件");

return $this;
}

public function 表示順設定($sort)
{
$this->tester->waitForElementVisible(['css' => "select[name = 'orderby']"]);
$this->tester->selectOption(['css' => "select[name = 'orderby']"], $sort);

return $this;
Expand Down
1 change: 1 addition & 0 deletions codeception/acceptance/EF02ProductCest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public function product_商品一覧表示件数(AcceptanceTester $I)

// 表示件数の選択リストを変更する
$listPage->表示件数設定(40);
$I->wait(1);

// 変更された表示件数分が1画面に表示される
$expected = ($productNum >= 40) ? 40 : $productNum;
Expand Down
Loading