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

add Admin_EditorTemplatesController_add #3338

Merged
merged 11 commits into from
May 24, 2024
Merged

add Admin_EditorTemplatesController_add #3338

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8215f64
unitTest_Admin_EditorTemplatesController_add
Apr 11, 2024
e9af398
Merge branch 'dev-5' into unitTest_Admin_EditorTemplatesController_add
Apr 12, 2024
fead4ca
modified
Apr 12, 2024
2d8eb2f
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
Apr 12, 2024
9b0578a
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
Apr 15, 2024
fed1481
modified
Apr 15, 2024
974aa12
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
May 8, 2024
8cb9a97
modified
May 8, 2024
ae62564
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
May 9, 2024
11629d2
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
May 20, 2024
c648a20
modified
May 20, 2024
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
1 change: 1 addition & 0 deletions plugins/bc-editor-template/src/Controller/Admin/EditorTemplatesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public function index(EditorTemplatesServiceInterface $service)
* @param EditorTemplatesService $service
* @checked
* @noTodo
* @UnitTest
*/
public function add(EditorTemplatesServiceInterface $service)
{
Expand Down
27 changes: 27 additions & 0 deletions plugins/bc-editor-template/tests/TestCase/Controller/Admin/EditorTemplatesControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

namespace BcEditorTemplate\Test\TestCase\Controller\Admin;

use BaserCore\Service\SiteConfigsServiceInterface;
use BaserCore\Test\Factory\SiteConfigFactory;
use BaserCore\Test\Scenario\InitAppScenario;
use BaserCore\TestSuite\BcTestCase;
use BaserCore\Utility\BcContainerTrait;
Expand Down Expand Up @@ -112,6 +114,31 @@ public function testAfterAddEvent()
$this->assertEquals(1, $query->count());
}

/**
* Test add
*/
public function testAdmin_add()
{
$this->enableSecurityToken();
$this->enableCsrfToken();

SiteConfigFactory::make(['name' => 'editor', 'value' => 'BaserCore.BcCkeditor'])->persist();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HungDV2022 @thangnnmd この行は無くてもテストは動きませんか？

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ryuring
#3338 (comment)
この行はなし場合は画像のようにエラーを発生しました。
確認お願いします。

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HungDV2022 そのエラーが出る方が問題のような気がしますね。一度調べてみます。

Copy link
Collaborator

@ryuring ryuring May 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HungDV2022 @thangnnmd 調べました。本体に問題がありました。
plugins/bc-editor-template/src/Controller/Admin/EditorTemplatesController.php を次のように修正してください。

76行目、119行目に return を追加

return $this->redirect(['action' => 'index']);

87行目、130行目を削除（なくてもブラウザで正常に動作しました）

$this->viewBuilder()->addHelper(BcSiteConfig::get('editor'));

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

そうすると SiteConfigFactory は不要になります。


//正常系実行
$this->post('/baser/admin/bc-editor-template/editor_templates/add', ['name' => 'test', 'description' => 'test description']);
$this->assertResponseCode(302);
$this->assertFlashMessage('テンプレート「test」を追加しました');
$this->assertRedirect(['action' => 'index']);

//異常系実行
$this->post('/baser/admin/bc-editor-template/editor_templates/add', ['name' => '']);
$this->assertResponseCode(200);

//エラーメッセージを確認
$vars = $this->_controller->viewBuilder()->getVars();
$this->assertEquals(['name' => ['_empty' => "テンプレート名を入力してください。"]], $vars['editorTemplate']->getErrors());
}

/**
* Test beforeAddEvent
*/
Expand Down
Loading