@@ -377,7 +377,7 @@ |
||
| 377 | 377 | |
| 378 | 378 | $findPlugins = Fixtures::get('findPlugins'); |
| 379 | 379 | $Plugins = $findPlugins(); |
| 380 | - if (is_array($Plugins) && count($Plugins) > 0 ) { |
|
| 380 | + if (is_array($Plugins) && count($Plugins) > 0) { |
|
| 381 | 381 | $I->getScenario()->skip('プラグインのアンインストールが必要なため、テストをスキップします'); |
| 382 | 382 | } |
| 383 | 383 | |
@@ -162,9 +162,9 @@ discard block |
||
| 162 | 162 | // 削除 |
| 163 | 163 | $OrderNumForDel = $OrderListPage->一覧_注文番号(1); |
| 164 | 164 | $OrderListPage |
| 165 | - ->一覧_選択(1) |
|
| 166 | - ->一覧_削除() |
|
| 167 | - ->Accept_削除(); |
|
| 165 | + ->一覧_選択(1) |
|
| 166 | + ->一覧_削除() |
|
| 167 | + ->Accept_削除(); |
|
| 168 | 168 | |
| 169 | 169 | $I->see('受注情報を削除しました', ['css' => '#page_admin_order > div > div.c-contentsArea > div.alert.alert-success.alert-dismissible.fade.show.m-3 > span']); |
| 170 | 170 | $I->assertNotEquals($OrderNumForDel, $OrderListPage->一覧_注文番号(1)); |
@@ -172,9 +172,9 @@ discard block |
||
| 172 | 172 | // 削除キャンセル |
| 173 | 173 | $OrderNumForDontDel = $OrderListPage->一覧_注文番号(1); |
| 174 | 174 | $OrderListPage |
| 175 | - ->一覧_選択(1) |
|
| 176 | - ->一覧_削除() |
|
| 177 | - ->Cancel_削除(); |
|
| 175 | + ->一覧_選択(1) |
|
| 176 | + ->一覧_削除() |
|
| 177 | + ->Cancel_削除(); |
|
| 178 | 178 | |
| 179 | 179 | $I->assertEquals($OrderNumForDontDel, $OrderListPage->一覧_注文番号(1)); |
| 180 | 180 | } |
@@ -114,7 +114,7 @@ |
||
| 114 | 114 | |
| 115 | 115 | public function 受注ステータス検索($value = '') |
| 116 | 116 | { |
| 117 | - $this->tester->checkOption(['id' => 'admin_search_order_status_' . $value]); |
|
| 117 | + $this->tester->checkOption(['id' => 'admin_search_order_status_'.$value]); |
|
| 118 | 118 | $this->tester->click('#search_form #search_submit'); |
| 119 | 119 | return $this; |
| 120 | 120 | } |
@@ -98,7 +98,7 @@ |
||
| 98 | 98 | return "body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child($rowNum) > div > div.col.d-flex.align-items-center > a"; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - public static function XPathでタグを取得する($textEl){ |
|
| 101 | + public static function XPathでタグを取得する($textEl) { |
|
| 102 | 102 | return '//*[@id="page_admin_product_category"]/div[1]/div[3]/div[3]/div[1]/div/div/div/div/ul/li/div/div[2]/a[contains(text(), "'.$textEl.'")]'; |
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | \ No newline at end of file |
@@ -150,8 +150,8 @@ |
||
| 150 | 150 | */ |
| 151 | 151 | public function 検索結果_削除($rowNum) |
| 152 | 152 | { |
| 153 | - $this->tester->click("#page_admin_product > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pr-3 > div > div:nth-child(3) > a"); |
|
| 154 | - return $this; |
|
| 153 | + $this->tester->click("#page_admin_product > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div > div > form > div.card.rounded.border-0.mb-4 > div.card-body.p-0 > table > tbody > tr:nth-child(${rowNum}) > td.align-middle.pr-3 > div > div:nth-child(3) > a"); |
|
| 154 | + return $this; |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | public function Accept_重複する($rowNum) |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | { |
| 64 | 64 | $this->tester->click(self::$詳細検索ボタン); |
| 65 | 65 | $this->tester->wait(1); |
| 66 | - $this->tester->checkOption(['id' => 'admin_search_product_status_' . $value]); |
|
| 66 | + $this->tester->checkOption(['id' => 'admin_search_product_status_'.$value]); |
|
| 67 | 67 | $this->tester->click(self::$検索ボタン); |
| 68 | 68 | $this->tester->see('商品一覧商品管理', '.c-pageTitle'); |
| 69 | 69 | return $this; |
@@ -169,6 +169,6 @@ |
||
| 169 | 169 | { |
| 170 | 170 | $this->tester->scrollTo(['id' => 'shipmentOverview_'.$num], 0, 50); |
| 171 | 171 | $this->tester->see((new \DateTime())->format('Y/m/d'), |
| 172 | - '#shipmentOverview_'.$num.' > div > div:nth-child(4) > div:nth-child(2) > div:nth-child(3) > div > span'); |
|
| 172 | + '#shipmentOverview_'.$num.' > div > div:nth-child(4) > div:nth-child(2) > div:nth-child(3) > div > span'); |
|
| 173 | 173 | } |
| 174 | 174 | } |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | use Faker\Factory as Faker; |
| 9 | 9 | |
| 10 | 10 | |
| 11 | -$config = parse_ini_file(__DIR__.'/config.ini',true); |
|
| 11 | +$config = parse_ini_file(__DIR__.'/config.ini', true); |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * create fixture |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | $faker = Faker::create('ja_JP'); |
| 36 | 36 | Fixtures::add('faker', $faker); |
| 37 | 37 | |
| 38 | -$progress = (function() |
|
| 38 | +$progress = (function () |
|
| 39 | 39 | { |
| 40 | 40 | $current = ''; |
| 41 | 41 | return function ($key) use (&$current) { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | ->getQuery() |
| 73 | 73 | ->getSingleScalarResult(); |
| 74 | 74 | // 受注生成件数 + 初期データの商品が生成されているはず |
| 75 | -if ($num < ($config['fixture_product_num']+2)) { |
|
| 75 | +if ($num < ($config['fixture_product_num'] + 2)) { |
|
| 76 | 76 | // 規格なしも含め $config['fixture_product_num'] の分だけ生成する |
| 77 | 77 | for ($i = 0; $i < $config['fixture_product_num'] - 1; $i++) { |
| 78 | 78 | $progress('Generating Products'); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | |
| 162 | 162 | /** 管理画面アカウント情報. */ |
| 163 | -Fixtures::add('admin_account',array( |
|
| 163 | +Fixtures::add('admin_account', array( |
|
| 164 | 164 | 'member' => $config['admin_user'], |
| 165 | 165 | 'password' => $config['admin_password'], |
| 166 | 166 | )); |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | |
| 226 | 226 | $deleteShippingNotExistsOfItem = function () use ($entityManager) { |
| 227 | 227 | |
| 228 | - $Shippings= $entityManager->getRepository('Eccube\Entity\Shipping')->findAll(); |
|
| 228 | + $Shippings = $entityManager->getRepository('Eccube\Entity\Shipping')->findAll(); |
|
| 229 | 229 | |
| 230 | 230 | if ($Shippings) { |
| 231 | 231 | foreach ($Shippings as $Shipping) { |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | /** 商品を検索するクロージャ. */ |
| 251 | 251 | Fixtures::add('findProducts', $findProducts); |
| 252 | 252 | |
| 253 | -$createProduct = function($product_name = null, $product_class_num = 3) use ($container) { |
|
| 253 | +$createProduct = function ($product_name = null, $product_class_num = 3) use ($container) { |
|
| 254 | 254 | return createProduct($container, $product_name, $product_class_num); |
| 255 | 255 | }; |
| 256 | 256 | Fixtures::add('createProduct', $createProduct); |