@@ -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 |
@@ -35,7 +35,6 @@ |
||
| 35 | 35 | use Symfony\Component\Form\FormBuilderInterface; |
| 36 | 36 | use Symfony\Component\Form\FormEvent; |
| 37 | 37 | use Symfony\Component\Form\FormEvents; |
| 38 | -use Symfony\Component\HttpFoundation\RequestStack; |
|
| 39 | 38 | use Symfony\Component\OptionsResolver\OptionsResolver; |
| 40 | 39 | use Symfony\Component\Validator\Constraints as Assert; |
| 41 | 40 | |
@@ -25,6 +25,7 @@ |
||
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * @param string $type |
| 28 | + * @param string|null $message |
|
| 28 | 29 | */ |
| 29 | 30 | private function __construct($type, $message) |
| 30 | 31 | { |
@@ -26,6 +26,9 @@ discard block |
||
| 26 | 26 | return $page; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | + /** |
|
| 30 | + * @param \AcceptanceTester $I |
|
| 31 | + */ |
|
| 29 | 32 | public static function at($I) |
| 30 | 33 | { |
| 31 | 34 | $page = new self($I); |
@@ -46,30 +49,45 @@ discard block |
||
| 46 | 49 | return $this; |
| 47 | 50 | } |
| 48 | 51 | |
| 52 | + /** |
|
| 53 | + * @param string $value |
|
| 54 | + */ |
|
| 49 | 55 | public function 入力_姓($value, $num = 0) |
| 50 | 56 | { |
| 51 | 57 | $this->tester->fillField(['id' => 'form_shippings_'.$num.'_name_name01'], $value); |
| 52 | 58 | return $this; |
| 53 | 59 | } |
| 54 | 60 | |
| 61 | + /** |
|
| 62 | + * @param string $value |
|
| 63 | + */ |
|
| 55 | 64 | public function 入力_名($value, $num = 0) |
| 56 | 65 | { |
| 57 | 66 | $this->tester->fillField(['id' => 'form_shippings_'.$num.'_name_name02'], $value); |
| 58 | 67 | return $this; |
| 59 | 68 | } |
| 60 | 69 | |
| 70 | + /** |
|
| 71 | + * @param string $value |
|
| 72 | + */ |
|
| 61 | 73 | public function 入力_セイ($value, $num = 0) |
| 62 | 74 | { |
| 63 | 75 | $this->tester->fillField(['id' => 'form_shippings_'.$num.'_kana_kana01'], $value); |
| 64 | 76 | return $this; |
| 65 | 77 | } |
| 66 | 78 | |
| 79 | + /** |
|
| 80 | + * @param string $value |
|
| 81 | + */ |
|
| 67 | 82 | public function 入力_メイ($value, $num = 0) |
| 68 | 83 | { |
| 69 | 84 | $this->tester->fillField(['id' => 'form_shippings_'.$num.'_kana_kana02'], $value); |
| 70 | 85 | return $this; |
| 71 | 86 | } |
| 72 | 87 | |
| 88 | + /** |
|
| 89 | + * @param string $value |
|
| 90 | + */ |
|
| 73 | 91 | public function 入力_郵便番号($value, $num = 0) |
| 74 | 92 | { |
| 75 | 93 | $this->tester->fillField(['id' => 'form_shippings_'.$num.'_postal_code'], $value); |
@@ -83,18 +101,27 @@ discard block |
||
| 83 | 101 | return $this; |
| 84 | 102 | } |
| 85 | 103 | |
| 104 | + /** |
|
| 105 | + * @param string $value |
|
| 106 | + */ |
|
| 86 | 107 | public function 入力_市区町村名($value, $num = 0) |
| 87 | 108 | { |
| 88 | 109 | $this->tester->fillField(['id' => 'form_shippings_'.$num.'_address_addr01'], $value); |
| 89 | 110 | return $this; |
| 90 | 111 | } |
| 91 | 112 | |
| 113 | + /** |
|
| 114 | + * @param string $value |
|
| 115 | + */ |
|
| 92 | 116 | public function 入力_番地_ビル名($value, $num = 0) |
| 93 | 117 | { |
| 94 | 118 | $this->tester->fillField(['id' => 'form_shippings_'.$num.'_address_addr02'], $value); |
| 95 | 119 | return $this; |
| 96 | 120 | } |
| 97 | 121 | |
| 122 | + /** |
|
| 123 | + * @param string $value |
|
| 124 | + */ |
|
| 98 | 125 | public function 入力_電話番号($value, $num = 0) |
| 99 | 126 | { |
| 100 | 127 | $this->tester->fillField(['id' => 'form_shippings_'.$num.'_phone_number'], $value); |
@@ -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 | } |
@@ -3,13 +3,13 @@ |
||
| 3 | 3 | use Codeception\Util\Fixtures; |
| 4 | 4 | use Page\Admin\CategoryCsvUploadPage; |
| 5 | 5 | use Page\Admin\CategoryManagePage; |
| 6 | -use Page\Admin\CsvSettingsPage; |
|
| 7 | 6 | use Page\Admin\ClassCategoryManagePage; |
| 8 | 7 | use Page\Admin\ClassNameManagePage; |
| 8 | +use Page\Admin\CsvSettingsPage; |
|
| 9 | 9 | use Page\Admin\ProductClassEditPage; |
| 10 | 10 | use Page\Admin\ProductCsvUploadPage; |
| 11 | -use Page\Admin\ProductManagePage; |
|
| 12 | 11 | use Page\Admin\ProductEditPage; |
| 12 | +use Page\Admin\ProductManagePage; |
|
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * @group admin |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Codeception\Util\Fixtures; |
| 4 | 4 | use Eccube\Entity\Customer; |
| 5 | -use Eccube\Entity\Order; |
|
| 6 | 5 | use Eccube\Entity\Master\OrderStatus; |
| 6 | +use Eccube\Entity\Order; |
|
| 7 | 7 | use Page\Admin\OrderEditPage; |
| 8 | 8 | use Page\Admin\OrderManagePage; |
| 9 | 9 | use Page\Admin\ShippingCsvUploadPage; |