From f19a832f1f00562ccdaec3eefb4eb58da3fabb5f Mon Sep 17 00:00:00 2001 From: sai_tanaka Date: Tue, 31 Jul 2018 22:08:28 +0900 Subject: [PATCH 1/5] =?UTF-8?q?#264=20=E3=80=90=E5=95=86=E5=93=81=E7=B7=A8?= =?UTF-8?q?=E9=9B=86=E3=80=91=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88=E3=81=AE?= =?UTF-8?q?=E5=95=86=E5=93=81=E3=83=9A=E3=83=BC=E3=82=B8=E3=82=92=E8=A6=8B?= =?UTF-8?q?=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=80=8C=E7=A2=BA=E8=AA=8D=E3=83=9C=E3=82=BF=E3=83=B3=E3=80=8D?= =?UTF-8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_support/Page/Admin/PageEditPage.php | 5 +++ codeception/acceptance/EA03ProductCest.php | 35 +++++++++++++++++++ src/Eccube/Resource/locale/messages.en.php | 1 + src/Eccube/Resource/locale/messages.ja.php | 1 + .../template/admin/Product/product.twig | 14 ++++++++ 5 files changed, 56 insertions(+) diff --git a/codeception/_support/Page/Admin/PageEditPage.php b/codeception/_support/Page/Admin/PageEditPage.php index c9c0388ac2b..592513c0f22 100644 --- a/codeception/_support/Page/Admin/PageEditPage.php +++ b/codeception/_support/Page/Admin/PageEditPage.php @@ -60,4 +60,9 @@ public function 登録() { $this->tester->click(['xpath' => '//button/span[text()="登録"]']); } + + public function プレビュー() + { + $this->tester->click(['xpath' => "//*[@id='preview']/div/div/div/a[text()='プレビュー']"]); + } } \ No newline at end of file diff --git a/codeception/acceptance/EA03ProductCest.php b/codeception/acceptance/EA03ProductCest.php index 7c1533af0b1..c8b526f76b4 100644 --- a/codeception/acceptance/EA03ProductCest.php +++ b/codeception/acceptance/EA03ProductCest.php @@ -729,4 +729,39 @@ public function product_一覧からの商品確認(\AcceptanceTester $I) $I->switchToNewWindow(); $I->seeInCurrentUrl('/products/detail/'); } + + public function product_商品編集からの商品確認_公開(\AcceptanceTester $I) + { + $I->wantTo('EA0310-UC05-T02 編集からの商品確認 公開'); + + ProductManagePage::go($I) + ->検索('パーコレーター') + ->検索結果_選択(1); + + ProductEditPage::at($I) + ->入力_非公開() + ->登録() + ->プレビュー(); + + $I->switchToNewWindow(); + $I->seeInCurrentUrl('/products/detail/'); + } + + public function product_商品編集からの商品確認_非公開(\AcceptanceTester $I) + { + $I->wantTo('EA0310-UC05-T03 編集からの商品確認 非公開'); + + ProductManagePage::go($I) + ->検索('パーコレーター') + ->検索結果_選択(1); + + ProductEditPage::at($I) + ->入力_非公開() + ->登録() + ->プレビュー(); + + $I->switchToNewWindow(); + $I->seeInCurrentUrl('/products/detail/'); + } + } \ No newline at end of file diff --git a/src/Eccube/Resource/locale/messages.en.php b/src/Eccube/Resource/locale/messages.en.php index 476a6488083..0bce8f18327 100644 --- a/src/Eccube/Resource/locale/messages.en.php +++ b/src/Eccube/Resource/locale/messages.en.php @@ -1075,6 +1075,7 @@ 'admin.product.product.521' => 'Registration Date', 'admin.product.product.522' => 'Updated on', 'admin.product.product.523' => 'Store Owner\'s Notes', + 'admin.product.product.preview' => 'Preview', 'admin.product.product_class.524' => 'Products', 'admin.product.product_class.525' => 'Add New Product', 'admin.product.product_class.526' => 'The data will be deleted permanently. Are you sure to delete?', diff --git a/src/Eccube/Resource/locale/messages.ja.php b/src/Eccube/Resource/locale/messages.ja.php index 5b9046a7db8..cfbef913db1 100644 --- a/src/Eccube/Resource/locale/messages.ja.php +++ b/src/Eccube/Resource/locale/messages.ja.php @@ -1639,6 +1639,7 @@ 'admin.product.product.text09' => 'この商品の規格管理', 'admin.product.product.text10' => 'ページを移動します。', 'admin.product.product.text11' => '%name%に移動します。商品情報を保存してから移動しますか？', + 'admin.product.product.preview' => 'プレビュー', 'admin.product.product.save' => '変更を保存', 'admin.product.product.cancel' => '保存せずに移動', 'admin.product.product.category' => 'カテゴリ', diff --git a/src/Eccube/Resource/template/admin/Product/product.twig b/src/Eccube/Resource/template/admin/Product/product.twig index 3d16b035ad5..95ce22468e9 100644 --- a/src/Eccube/Resource/template/admin/Product/product.twig +++ b/src/Eccube/Resource/template/admin/Product/product.twig @@ -728,6 +728,20 @@ file that was distributed with this source code.
+ {% if id is not null %} +
+ +
+ {% endif %}
From 9432d9f13afd45a6141b3a3bc6aaaf4260d1757f Mon Sep 17 00:00:00 2001 From: sai_tanaka Date: Tue, 31 Jul 2018 22:47:31 +0900 Subject: [PATCH 2/5] =?UTF-8?q?#264=20=E3=80=90=E5=95=86=E5=93=81=E7=B7=A8?= =?UTF-8?q?=E9=9B=86=E3=80=91=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88=E3=81=AE?= =?UTF-8?q?=E5=95=86=E5=93=81=E3=83=9A=E3=83=BC=E3=82=B8=E3=82=92=E8=A6=8B?= =?UTF-8?q?=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=80=8C=E7=A2=BA=E8=AA=8D=E3=83=9C=E3=82=BF=E3=83=B3=E3=80=8D?= =?UTF-8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- codeception/_support/Page/Admin/PageEditPage.php | 5 ----- codeception/_support/Page/Admin/ProductEditPage.php | 11 +++++++++++ codeception/acceptance/EA03ProductCest.php | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/codeception/_support/Page/Admin/PageEditPage.php b/codeception/_support/Page/Admin/PageEditPage.php index 592513c0f22..c9c0388ac2b 100644 --- a/codeception/_support/Page/Admin/PageEditPage.php +++ b/codeception/_support/Page/Admin/PageEditPage.php @@ -60,9 +60,4 @@ public function 登録() { $this->tester->click(['xpath' => '//button/span[text()="登録"]']); } - - public function プレビュー() - { - $this->tester->click(['xpath' => "//*[@id='preview']/div/div/div/a[text()='プレビュー']"]); - } } \ No newline at end of file diff --git a/codeception/_support/Page/Admin/ProductEditPage.php b/codeception/_support/Page/Admin/ProductEditPage.php index eab586ab58c..ec37b998d66 100644 --- a/codeception/_support/Page/Admin/ProductEditPage.php +++ b/codeception/_support/Page/Admin/ProductEditPage.php @@ -55,6 +55,12 @@ public function 入力_公開() return $this; } + public function 入力_非公開() + { + $this->tester->selectOption('#admin_product_Status', '非公開'); + return $this; + } + public function クリックして開くタグリスト() { $this->tester->click(['css' => 'div[href="#allTags"] > a']); @@ -89,4 +95,9 @@ public function 登録() return $this; } + public function プレビュー() + { + $this->tester->click(['xpath' => "//*[@id='preview']/div/div/a[text()='プレビュー']"]); + } + } diff --git a/codeception/acceptance/EA03ProductCest.php b/codeception/acceptance/EA03ProductCest.php index c8b526f76b4..57f36e41a7c 100644 --- a/codeception/acceptance/EA03ProductCest.php +++ b/codeception/acceptance/EA03ProductCest.php @@ -739,7 +739,7 @@ public function product_商品編集からの商品確認_公開(\AcceptanceTest ->検索結果_選択(1); ProductEditPage::at($I) - ->入力_非公開() + ->入力_公開() ->登録() ->プレビュー(); From 2a3c1ee856aa0b775bfeabc5f3004fb59085cf78 Mon Sep 17 00:00:00 2001 From: kiy0taka Date: Wed, 1 Aug 2018 18:14:31 +0900 Subject: [PATCH 3/5] =?UTF-8?q?PullRequest=E6=99=82=E3=81=AF=E3=82=AB?= =?UTF-8?q?=E3=83=90=E3=83=AC=E3=83=83=E3=82=B8=E3=82=92=E8=A8=88=E6=B8=AC?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f49636eb53b..6388eae3517 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,8 +80,8 @@ jobs: env: GROUP=admin03 APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 - <<: *e2e_test env: GROUP=front APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 - - &coverage - stage: Code Coverage + - stage: Code Coverage + if: type != pull_request env: DATABASE_URL=sqlite:///%kernel.project_dir%/var/eccube.db DATABASE_SERVER_VERSION=3 COVERAGE=1 before_install: - *php_setup From e8de18eb240e5fd30eeca6e8e950329886f4f80e Mon Sep 17 00:00:00 2001 From: Kiyoshi Yamamura Date: Thu, 2 Aug 2018 10:39:57 +0900 Subject: [PATCH 4/5] =?UTF-8?q?mtb=5Fcustomer=5Forder=5Fstatus=E3=81=AB?= =?UTF-8?q?=E5=88=9D=E6=9C=9F=E3=83=87=E3=83=BC=E3=82=BF=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/doctrine/import_csv/mtb_customer_order_status.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Eccube/Resource/doctrine/import_csv/mtb_customer_order_status.csv b/src/Eccube/Resource/doctrine/import_csv/mtb_customer_order_status.csv index 68e99cfc3e8..7f286d132cb 100644 --- a/src/Eccube/Resource/doctrine/import_csv/mtb_customer_order_status.csv +++ b/src/Eccube/Resource/doctrine/import_csv/mtb_customer_order_status.csv @@ -7,3 +7,5 @@ id,name,sort_no,discriminator_type "4","注文受付","5","customerorderstatus" "5","発送済み","6","customerorderstatus" "8","注文未完了","7","customerorderstatus" +"9","注文受付","8","customerorderstatus" +"10","返品","9","customerorderstatus" From e21a2fe49838ffd59e5a45dbba08a347da617cfe Mon Sep 17 00:00:00 2001 From: kiy0taka Date: Thu, 2 Aug 2018 11:35:38 +0900 Subject: [PATCH 5/5] =?UTF-8?q?Scrutinizer=E3=81=AE=E3=82=AB=E3=83=90?= =?UTF-8?q?=E3=83=AC=E3=83=83=E3=82=B8=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2?= =?UTF-8?q?=E3=82=A6=E3=83=88=E3=82=921=E6=99=82=E9=96=93=E3=81=AB?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .scrutinizer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 224e84eeb55..bb325453ffe 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -162,7 +162,7 @@ tools: external_code_coverage: runs: 1 - timeout: 36000 #The timeout must be in the interval [60,36000]. + timeout: 3600 #php_code_sniffer: # enabled: true