Fix problem e2e tests

nanasess · Mar 14, 2024 · 0419c74 · 0419c74
1 parent 302f86f
commit 0419c74
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "doctrine/instantiator": "~1.0.5",
         "fzaninotto/faker": "^1.8",
         "nanasess/ec-cube2-class-extends-stubs": "^1.0",
-        "nanasess/eccube2-fixture-generator": "^1.1",
+        "nanasess/eccube2-fixture-generator": "^1.2",
         "php5friends/phpunit48": ">=4.8.41",
         "phpdocumentor/reflection-docblock": "~2.0.5",
         "symfony/yaml": "^2.8 || ^3.4 || ^4.4"

diff --git a/composer.lock b/composer.lock
diff --git a/e2e-tests/test/admin/system/index.test.ts b/e2e-tests/test/admin/system/index.test.ts
@@ -40,9 +40,9 @@ test.describe.serial('システム設定＞メンバー管理画面を確認を
   });
 
   const name = faker.name.lastName();
-  const department = faker.company.companyName();
+  const department = faker.company.name();
   const user = fakerEn.internet.password();
-  const password = fakerEn.fake('{{internet.password}}{{datatype.number}}');
+  const password = fakerEn.helpers.fake('{{internet.password}}{{datatype.number}}');
   test('メンバー登録を確認します', async () => {
     popup.on('dialog', dialog => dialog.accept());
     await popup.fill('input[name=name]', name);

diff --git a/e2e-tests/test/front_guest/entry.test.ts b/e2e-tests/test/front_guest/entry.test.ts
@@ -49,7 +49,7 @@ test.describe.serial('会員登録のテストをします', () => {
     await page.fill('input[name=name02]', faker.name.firstName());
     await page.fill('input[name=kana01]', 'イシ');
     await page.fill('input[name=kana02]', 'キュウブ');
-    await page.fill('input[name=company_name]', faker.company.companyName());
+    await page.fill('input[name=company_name]', faker.company.name());
     await page.fill('input[name=zip01]', faker.address.zipCode('###'));
     await page.fill('input[name=zip02]', faker.address.zipCode('####'));
     await page.selectOption('select[name=pref]', { label: faker.address.state() });

diff --git a/e2e-tests/test/front_guest/shopping.test.ts b/e2e-tests/test/front_guest/shopping.test.ts
@@ -57,7 +57,7 @@ test.describe.serial('購入フロー(ゲスト)のテストをします', () =>
     await page.fill('input[name=order_name02]', faker.name.firstName());
     await page.fill('input[name=order_kana01]', 'イシ');
     await page.fill('input[name=order_kana02]', 'キュウブ');
-    await page.fill('input[name=order_company_name]', faker.company.companyName());
+    await page.fill('input[name=order_company_name]', faker.company.name());
     await page.fill('input[name=order_zip01]', faker.address.zipCode('###'));
     await page.fill('input[name=order_zip02]', faker.address.zipCode('####'));
     await page.selectOption('select[name=order_pref]', { label: faker.address.state() });
@@ -86,7 +86,7 @@ test.describe.serial('購入フロー(ゲスト)のテストをします', () =>
     await page.fill('input[name=shipping_name02]', faker.name.firstName());
     await page.fill('input[name=shipping_kana01]', 'イシ');
     await page.fill('input[name=shipping_kana02]', 'キュウブ');
-    await page.fill('input[name=shipping_company_name]', faker.company.companyName());
+    await page.fill('input[name=shipping_company_name]', faker.company.name());
     await page.fill('input[name=shipping_zip01]', faker.address.zipCode('###'));
     await page.fill('input[name=shipping_zip02]', faker.address.zipCode('####'));
     await page.selectOption('select[name=shipping_pref]', { label: faker.address.state() });

diff --git a/e2e-tests/test/installer/installer.test.ts b/e2e-tests/test/installer/installer.test.ts
@@ -37,8 +37,8 @@ test.describe.serial('インストーラのテストをします', () => {
     await expect(page.locator('h2').first()).toHaveText('ECサイトの設定');
     adminDirectory = faker.datatype.uuid().substring(0, 8);
     user = faker.internet.userName();
-    password = faker.fake('{{internet.password}}{{datatype.number}}');
-    await page.fill('input[name=shop_name]', faker.company.companyName());
+    password = faker.helpers.fake('{{internet.password}}{{datatype.number}}');
+    await page.fill('input[name=shop_name]', faker.company.name());
     await page.fill('input[name=admin_mail]', faker.internet.exampleEmail());
     await page.fill('input[name=login_id]', user);
     await page.fill('input[name=login_pass]', password);