BcHtml->link(__d('baser_core', '一覧に戻る'), ['action' => 'index'], [
diff --git a/plugins/bc-admin-third/templates/plugin/BcThemeConfig/Admin/ThemeConfigs/index.php b/plugins/bc-admin-third/templates/plugin/BcThemeConfig/Admin/ThemeConfigs/index.php
index 70a3ad0a8b..9ca47785ec 100644
--- a/plugins/bc-admin-third/templates/plugin/BcThemeConfig/Admin/ThemeConfigs/index.php
+++ b/plugins/bc-admin-third/templates/plugin/BcThemeConfig/Admin/ThemeConfigs/index.php
@@ -17,7 +17,7 @@
* @noTodo
* @unitTest
*/
-$this->BcBaser->css('vendor/colpick', ['inline' => false]);
+$this->BcBaser->css('vendor/colpick', false);
$this->BcBaser->js(['vendor/colpick'], false);
$this->BcAdmin->setTitle(__d('baser_core', 'テーマ設定'));
$this->BcAdmin->setHelp('theme_configs_form');
diff --git a/plugins/bc-blog/src/Service/BlogCategoriesService.php b/plugins/bc-blog/src/Service/BlogCategoriesService.php
index 76f84ad6fa..f714fdb9a1 100755
--- a/plugins/bc-blog/src/Service/BlogCategoriesService.php
+++ b/plugins/bc-blog/src/Service/BlogCategoriesService.php
@@ -119,7 +119,7 @@ public function getTreeIndex(int $blogContentId, array $queryParams): array
$categories = [];
foreach ($srcCategories->toArray() as $key => $value) {
/* @var BlogCategory $category */
- $category = $this->BlogCategories->find()->where(['id' => $key])->first();
+ $category = $this->BlogCategories->find()->where(['BlogCategories.id' => $key])->first();
if (!preg_match("/^([_]+)/i", $value, $matches)) {
$category->depth = 0;
$category->layered_title = $category->title;
diff --git a/plugins/bc-blog/src/Service/BlogContentsService.php b/plugins/bc-blog/src/Service/BlogContentsService.php
index b5ecb81a43..328863335d 100755
--- a/plugins/bc-blog/src/Service/BlogContentsService.php
+++ b/plugins/bc-blog/src/Service/BlogContentsService.php
@@ -331,6 +331,9 @@ public function getContentsTemplateRelativePath(array $options): string
*
* @param string $url
* @return EntityInterface|null
+ * @checked
+ * @noTodo
+ * @unitTest
*/
public function findByUrl(string $url): ?EntityInterface
{
diff --git a/plugins/bc-blog/src/Service/BlogPostsService.php b/plugins/bc-blog/src/Service/BlogPostsService.php
index 750f422029..b16aa2cd4b 100755
--- a/plugins/bc-blog/src/Service/BlogPostsService.php
+++ b/plugins/bc-blog/src/Service/BlogPostsService.php
@@ -271,8 +271,14 @@ protected function createIndexConditions(Query $query, array $params)
} else {
$conditions = [];
}
- // ID
- if ($params['id']) $conditions["BlogPosts.id"] = $params['id'];
+ // ID【blog】一覧表示でブログIDを指定する時、IDが複数の場合エラーになる問題を解決
+ if ($params['id']) {
+ if (is_array($params['id'])) {
+ $conditions["BlogPosts.id IN"] = $params['id'];
+ } else {
+ $conditions["BlogPosts.id"] = $params['id'];
+ }
+ }
// タイトル
if (!is_null($params['title'])) $conditions['BlogPosts.title LIKE'] = '%' . $params['title'] . '%';
// ユーザーID
diff --git a/plugins/bc-blog/src/View/Helper/BlogHelper.php b/plugins/bc-blog/src/View/Helper/BlogHelper.php
index 5de84141fe..c4ffe43324 100755
--- a/plugins/bc-blog/src/View/Helper/BlogHelper.php
+++ b/plugins/bc-blog/src/View/Helper/BlogHelper.php
@@ -49,6 +49,7 @@
use BaserCore\Annotation\NoTodo;
use BaserCore\Annotation\Checked;
use BaserCore\Annotation\UnitTest;
+use BcMail\View\Helper\MailHelper;
/**
* ブログヘルパー
@@ -1296,7 +1297,6 @@ public function getEyeCatch($post, $options = [])
*/
public function mailFormLink($title, $contentsName, $datas = [], $options = [])
{
- App::uses('MailHelper', 'BcMail.View/Helper');
$MailHelper = new MailHelper($this->_View);
$MailHelper->link($title, $contentsName, $datas, $options);
}
diff --git a/plugins/bc-blog/tests/TestCase/Service/BlogContentsServiceTest.php b/plugins/bc-blog/tests/TestCase/Service/BlogContentsServiceTest.php
index 88fee59aac..345e2688cf 100755
--- a/plugins/bc-blog/tests/TestCase/Service/BlogContentsServiceTest.php
+++ b/plugins/bc-blog/tests/TestCase/Service/BlogContentsServiceTest.php
@@ -342,4 +342,23 @@ public function test_findByContentId()
$rs = $this->BlogContentsService->findByContentId(999);
$this->assertNull($rs);
}
+ /**
+ * test findByUrl
+ */
+ public function test_findByUrl()
+ {
+ //generate data
+ BlogContentFactory::make(['id' => 1])->persist();
+ ContentFactory::make(['id' => 1, 'type' => 'BlogContent', 'entity_id' => 1, 'title' => 'url test', 'url' => '/test', 'site_id' => 1])->persist();
+ ContentFactory::make(['id' => 2, 'type' => 'BlogContent', 'entity_id' => 1,'title' => 'url demo', 'url' => '/demo', 'site_id' => 1])->persist();
+ SiteFactory::make(['id' => 1, 'theme' => 'BcBlog'])->persist();
+
+ $rs = $this->BlogContentsService->findByUrl('/test');
+ $this->assertEquals('url test', $rs->content->title);
+
+ //with empty url
+ $rs = $this->BlogContentsService->findByUrl('');
+ $this->assertNull($rs);
+ }
+
}
diff --git a/plugins/bc-custom-content/src/View/Helper/CustomContentAdminHelper.php b/plugins/bc-custom-content/src/View/Helper/CustomContentAdminHelper.php
index 20b4a2d9d7..c812732534 100644
--- a/plugins/bc-custom-content/src/View/Helper/CustomContentAdminHelper.php
+++ b/plugins/bc-custom-content/src/View/Helper/CustomContentAdminHelper.php
@@ -231,7 +231,7 @@ public function description(CustomLink $link)
if ($link->description) {
return '
' .
'
' .
- $link->description .
+ preg_replace('/]*>(.*?)<\/script>/is', '', $link->description) .
'
';
}
return '';
diff --git a/plugins/bc-installer/src/Service/Admin/InstallationsAdminService.php b/plugins/bc-installer/src/Service/Admin/InstallationsAdminService.php
index fc79636031..6f4a6634ad 100644
--- a/plugins/bc-installer/src/Service/Admin/InstallationsAdminService.php
+++ b/plugins/bc-installer/src/Service/Admin/InstallationsAdminService.php
@@ -232,13 +232,11 @@ public function readDbSetting(ServerRequest $request, array $installationData =
* @return bool
* @checked
* @noTodo
+ * @unitTest
*/
public function deleteAllTables(ServerRequest $request): bool
{
$dbConfig = $this->readDbSetting($request);
- if (!$dbConfig) {
- $dbConfig = ConnectionManager::getConfig('default');
- }
return $this->BcDatabase->deleteTables('default', $dbConfig);
}
@@ -281,6 +279,7 @@ public function initAdmin(ServerRequest $request): void
* @param ServerRequest $request
* @checked
* @noTodo
+ * @unitTest
*/
public function initFiles(ServerRequest $request): void
{
@@ -301,6 +300,7 @@ public function initFiles(ServerRequest $request): void
* @return \Cake\Datasource\ConnectionInterface
* @checked
* @noTodo
+ * @unitTest
*/
public function connectDb(ServerRequest $request): \Cake\Datasource\ConnectionInterface
{
@@ -316,6 +316,7 @@ public function connectDb(ServerRequest $request): \Cake\Datasource\ConnectionIn
* @return void
* @checked
* @noTodo
+ * @unitTest
*/
public function login(ServerRequest $request, Response $response): void
{
@@ -332,6 +333,7 @@ public function login(ServerRequest $request, Response $response): void
* @param ServerRequest $request
* @checked
* @noTodo
+ * @unitTest
*/
public function initDb(ServerRequest $request): void
{
diff --git a/plugins/bc-installer/src/Service/InstallationsService.php b/plugins/bc-installer/src/Service/InstallationsService.php
index 98813e8f28..fe706571ed 100644
--- a/plugins/bc-installer/src/Service/InstallationsService.php
+++ b/plugins/bc-installer/src/Service/InstallationsService.php
@@ -339,6 +339,7 @@ public function setSiteName(string $name)
* @return bool
* @checked
* @noTodo
+ * @unitTest
*/
public function executeDefaultUpdates(): bool
{
diff --git a/plugins/bc-installer/tests/TestCase/Service/Admin/InstallationsAdminServiceTest.php b/plugins/bc-installer/tests/TestCase/Service/Admin/InstallationsAdminServiceTest.php
index 71d743a13b..42f1cd9c96 100644
--- a/plugins/bc-installer/tests/TestCase/Service/Admin/InstallationsAdminServiceTest.php
+++ b/plugins/bc-installer/tests/TestCase/Service/Admin/InstallationsAdminServiceTest.php
@@ -12,17 +12,23 @@
namespace BcInstaller\Test\TestCase\Service\Admin;
+use BaserCore\Service\PermissionGroupsServiceInterface;
use BaserCore\Test\Factory\ContentFactory;
use BaserCore\Test\Factory\ContentFolderFactory;
use BaserCore\Test\Factory\UserFactory;
use BaserCore\Test\Scenario\InitAppScenario;
+use BaserCore\Service\BcDatabaseServiceInterface;
use BaserCore\TestSuite\BcTestCase;
use BaserCore\Utility\BcContainerTrait;
+use BaserCore\Utility\BcFile;
use BcInstaller\Service\Admin\InstallationsAdminService;
use BcInstaller\Service\Admin\InstallationsAdminServiceInterface;
+use BcSearchIndex\Test\Scenario\Service\SearchIndexesServiceScenario;
use Cake\Core\Configure;
+use Cake\Http\Response;
use Cake\Http\ServerRequest;
use Cake\Http\Session;
+use Migrations\Migrations;
use Cake\ORM\Exception\PersistenceFailedException;
use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
@@ -423,7 +429,55 @@ public static function readDbSettingDataProvider()
*/
public function test_deleteAllTables()
{
- $this->markTestIncomplete('このテストは、まだ実装されていません。');
+ //準備
+ $bcDatabaseService = $this->getService(BcDatabaseServiceInterface::class);
+ $config = [
+ 'dbType' => 'mysql',
+ 'dbHost' => 'localhost',
+ 'dbPrefix' => '',
+ 'dbPort' => '3306',
+ 'dbUsername' => 'dbUsername',
+ 'dbPassword' => 'dbPassword',
+ 'dbSchema' => 'dbSchema',
+ 'dbName' => 'basercms',
+ 'dbEncoding' => 'utf-8',
+ 'dbDataPattern' => 'BcThemeSample.default'
+ ];
+ $session = new Session();
+ $session->write('Installation', $config);
+ $request = new ServerRequest(['session' => $session]);
+
+ //テストを実行
+ $this->Installations->deleteAllTables($request);
+
+ //全てテーブルを削除できるか確認
+ $db = $bcDatabaseService->getDataSource();
+ $tables = $db->getSchemaCollection()->listTables();
+ $this->assertCount(0, $tables);
+
+ //テーブルを復活
+ $migrations = new Migrations();
+ $plugins = [
+ 'BaserCore',
+ 'BcBlog',
+ 'BcContentLink',
+ 'BcCustomContent',
+ 'BcEditorTemplate',
+ 'BcFavorite',
+ 'BcMail',
+ 'BcSearchIndex',
+ 'BcThemeConfig',
+ 'BcThemeFile',
+ 'BcUploader',
+ 'BcWidgetArea',
+ ];
+ foreach ($plugins as $plugin) {
+ $migrate = $migrations->migrate([
+ 'connection' => 'test',
+ 'plugin' => $plugin,
+ ]);
+ $this->assertTrue($migrate);
+ }
}
/**
@@ -481,7 +535,47 @@ public function test_initAdmin()
*/
public function test_initFiles()
{
- $this->markTestIncomplete('このテストは、まだ実装されていません。');
+ // install.phpをバックアップ
+ $configPath = ROOT . DS . 'config' . DS;
+ copy($configPath . 'install.php', $configPath . 'install.php.copy');
+ //準備
+ $config = [
+ 'dbType' => 'mysql',
+ 'dbHost' => 'localhost',
+ 'dbPrefix' => '',
+ 'dbPort' => '3306',
+ 'dbUsername' => 'dbUsername',
+ 'dbPassword' => 'dbPassword',
+ 'dbSchema' => 'dbSchema',
+ 'dbName' => 'basercms',
+ 'dbEncoding' => 'utf-8',
+ 'dbDataPattern' => 'BcThemeSample.default'
+ ];
+ $session = new Session();
+ $session->write('Installation', $config);
+ $request = new ServerRequest(['session' => $session]);
+
+ //テストを実行
+ $this->Installations->initFiles($request);
+
+ // インストールファイルが生成できるか確認する
+ $file = new BcFile($configPath . 'install.php');
+ $result = $file->read();
+ $this->assertMatchesRegularExpression("/'username' => 'dbUsername'.*'password' => 'dbPassword'.*'database' => 'basercms'/s", $result);
+
+ // JWTキーを作成できるか確認する
+ $this->assertFileExists(CONFIG . 'jwt.key');
+ $this->assertFileExists(CONFIG . 'jwt.pem');
+
+ // アップロード用初期フォルダが生成できるか確認する
+ $this->assertTrue(is_dir(WWW_ROOT . 'files' . DS . 'blog'));
+
+ // エディタテンプレート用の画像を配置
+ $this->assertFileExists(WWW_ROOT . 'files' . DS . 'editor' . DS);
+ $this->assertFileExists(WWW_ROOT . 'files' . DS . 'editor' . DS . 'template1.gif');
+
+ // 生成されたファイルを削除し、バックアップしたファイルに置き換える
+ rename($configPath . 'install.php.copy', $configPath . 'install.php');
}
/**
@@ -489,7 +583,28 @@ public function test_initFiles()
*/
public function test_connectDb()
{
- $this->markTestIncomplete('このテストは、まだ実装されていません。');
+ //準備
+ $session = new Session();
+ $request = new ServerRequest(['session' => $session]);
+ $session->write('Installation', [
+ "datasource" => "MySQL",
+ "dbSchema" => "test_basercms",
+ 'dbType' => 'mysql',
+ 'dbName' => 'test_db',
+ 'dbHost' => 'bc-db',
+ 'dbPrefix' => '',
+ 'dbPort' => '3306',
+ 'dbEncoding' => 'utf-8',
+ 'dbDataPattern' => 'BcThemeSample.default',
+ "dbUsername" => "root",
+ "dbPassword" => "root",
+ ]);
+ //準備
+ $rs = $this->Installations->connectDb($request);
+
+ // 接続できていること
+ $this->assertNotEmpty($rs);
+ $this->assertTrue($rs->getDriver()->isConnected());
}
/**
@@ -497,7 +612,15 @@ public function test_connectDb()
*/
public function test_login()
{
- $this->markTestIncomplete('このテストは、まだ実装されていません。');
+ //準備
+ $this->loadFixtureScenario(InitAppScenario::class);
+ $request = $this->getRequest('/baser/admin/baser-core/users/index');
+ $request->getSession()->write('Installation.id', 1);
+ $response = new Response();
+ //テストを実行
+ $this->Installations->login($request, $response);
+ //ログインできるか確認
+ $this->assertEquals(1, $request->getSession()->read('AuthAdmin')->id);
}
/**
@@ -505,7 +628,22 @@ public function test_login()
*/
public function test_initDb()
{
- $this->markTestIncomplete('このテストは、まだ実装されていません。');
+ //準備
+ $PermissionGroupsService = $this->getService(PermissionGroupsServiceInterface::class);
+ $this->loadFixtureScenario(SearchIndexesServiceScenario::class);
+ //テスト前、アクセスルールを確認
+ $this->assertCount(0, $PermissionGroupsService->getList());
+
+ //テストを実行
+ $this->Installations->initDb(new ServerRequest());
+
+ // データベースのデータを初期設定に更新できるか確認
+ $searchIndexesTable = $this->getTableLocator()->get('SearchIndexes');
+ $this->assertEquals(3, $searchIndexesTable->find()->count());
+ //テスト後、アクセスルールを確認
+ $this->assertCount(28, $PermissionGroupsService->getList());
+ // SITE_URL更新
+ $this->assertEquals('https://localhost/', env('SITE_URL'));
}
}
diff --git a/plugins/bc-installer/tests/TestCase/Service/InstallationsServiceTest.php b/plugins/bc-installer/tests/TestCase/Service/InstallationsServiceTest.php
index 5df63389af..ee43cdd14d 100644
--- a/plugins/bc-installer/tests/TestCase/Service/InstallationsServiceTest.php
+++ b/plugins/bc-installer/tests/TestCase/Service/InstallationsServiceTest.php
@@ -20,9 +20,9 @@
use BaserCore\TestSuite\BcTestCase;
use BaserCore\Utility\BcContainerTrait;
use BaserCore\Utility\BcFile;
-use BaserCore\Utility\BcFolder;
use BcInstaller\Service\InstallationsService;
use BcInstaller\Service\InstallationsServiceInterface;
+use BcSearchIndex\Test\Scenario\Service\SearchIndexesServiceScenario;
use Cake\Core\Configure;
use Cake\ORM\Exception\PersistenceFailedException;
use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
@@ -302,57 +302,15 @@ public function test_deployAdminAssets()
*/
public function testExecuteDefaultUpdates()
{
- $this->markTestIncomplete('このテストは未実装です。BcManagerComponentから移植中です。');
- $dbConfig = [
- 'datasource' => 'Database/BcMysql',
- 'persistent' => false,
- 'host' => 'localhost',
- 'port' => '8889',
- 'login' => 'root',
- 'password' => 'root',
- 'database' => 'basercms',
- 'schema' => '',
- 'prefix' => 'mysite_',
- 'encoding' => 'utf8',
- ];
-
- // プラグイン有効化チェック用準備(ダミーのプラグインディレクトリを作成)
- $testPluginPath = BASER_PLUGINS . 'Test' . DS;
- $testPluginConfigPath = $testPluginPath . 'config.php';
- $Folder = new BcFolder($testPluginPath);
- $Folder->create();
- $File = new BcFile($testPluginConfigPath);
- $File->write('BcManager->executeDefaultUpdates($dbConfig);
-
-
- // =====================
- // プラグイン有効化チェック
- // =====================
- $File->delete();
- $Folder->delete($testPluginPath);
-
- $this->Plugin = ClassRegistry::init('Plugin');
- $plugin = $this->Plugin->find('first', [
- 'conditions' => ['id' => 4],
- 'fields' => ['title', 'status'],
- ]
- );
- $expected = [
- 'Plugin' => [
- 'title' => 'テスト',
- 'status' => 1,
- ]
- ];
- $this->Plugin->delete(4);
- unset($this->Plugin);
- $this->assertEquals($expected, $plugin, 'プラグインのステータスを正しく更新できません');
- $this->assertTrue($result, 'データベースのデータに初期更新に失敗しました');
+ //準備
+ $this->loadFixtureScenario(SearchIndexesServiceScenario::class);
+ $searchIndexesTable = $this->getTableLocator()->get('SearchIndexes');
+ //テスト前、search_indexes テーブルにデータを確認
+ $this->assertEquals(1, $searchIndexesTable->find()->count());
+ //テストを実行
+ $this->assertTrue($this->Installations->executeDefaultUpdates());
+ //テスト後、search_indexes テーブルにデータを確認
+ $this->assertEquals(3, $searchIndexesTable->find()->count());
}
/**
diff --git a/plugins/bc-mail/config/setting.php b/plugins/bc-mail/config/setting.php
index 9c8bec4378..caed5a3e3d 100755
--- a/plugins/bc-mail/config/setting.php
+++ b/plugins/bc-mail/config/setting.php
@@ -154,6 +154,13 @@
['name' => 'email', 'title' => 'Eメールアドレス'],
['name' => 'impp', 'title' => 'インスタントメッセージングプロトコルの端点'],
['name' => 'on', 'title' => '自動設定'],
- ]
+ ],
+ /**
+ * bc_formのテンプレートを指定
+ * config/bc_form.phpを差し替える
+ * プラグイン記法 (プラグイン名.テンプレート名)
+ * basercms/plugins/bc-mail/src/View/MailFrontAppView.php
+ */
+ 'formTemplate' => 'BaserCore.bc_form'
]
];
diff --git a/plugins/bc-mail/src/Controller/Api/Admin/MailFieldsController.php b/plugins/bc-mail/src/Controller/Api/Admin/MailFieldsController.php
index 189fdedde2..0ebe48731c 100644
--- a/plugins/bc-mail/src/Controller/Api/Admin/MailFieldsController.php
+++ b/plugins/bc-mail/src/Controller/Api/Admin/MailFieldsController.php
@@ -118,6 +118,7 @@ public function update_sort(MailFieldsServiceInterface $service, int $mailConten
*
* @checked
* @noTodo
+ * @unitTest
*/
public function index(MailFieldsServiceInterface $service)
{
diff --git a/plugins/bc-mail/src/Controller/Api/Admin/MailMessagesController.php b/plugins/bc-mail/src/Controller/Api/Admin/MailMessagesController.php
index 4ce9eb1a09..663fe68f36 100644
--- a/plugins/bc-mail/src/Controller/Api/Admin/MailMessagesController.php
+++ b/plugins/bc-mail/src/Controller/Api/Admin/MailMessagesController.php
@@ -314,6 +314,7 @@ public function batch(MailMessagesServiceInterface $service, $mailContentId)
*
* @checked
* @noTodo
+ * @unitTest
*/
public function download(MailMessagesAdminServiceInterface $service, int $mailContentId)
{
diff --git a/plugins/bc-mail/src/Controller/Api/MailMessagesController.php b/plugins/bc-mail/src/Controller/Api/MailMessagesController.php
index 6f8fcc0257..a7485bdc00 100644
--- a/plugins/bc-mail/src/Controller/Api/MailMessagesController.php
+++ b/plugins/bc-mail/src/Controller/Api/MailMessagesController.php
@@ -36,6 +36,7 @@ class MailMessagesController extends BcApiController
* @return \Cake\Http\Response|void
* @checked
* @noTodo
+ * @unitTest
*/
public function beforeFilter(EventInterface $event)
{
diff --git a/plugins/bc-mail/src/Controller/MailController.php b/plugins/bc-mail/src/Controller/MailController.php
index fa4fde61be..ccae3c4762 100755
--- a/plugins/bc-mail/src/Controller/MailController.php
+++ b/plugins/bc-mail/src/Controller/MailController.php
@@ -134,6 +134,7 @@ public function beforeRender(EventInterface $event): void
* @return void
* @checked
* @noTodo
+ * @unitTest
*/
public function index(
MailFrontServiceInterface $service,
diff --git a/plugins/bc-mail/src/Model/Entity/MailContent.php b/plugins/bc-mail/src/Model/Entity/MailContent.php
index e40f6c1740..5babb22437 100755
--- a/plugins/bc-mail/src/Model/Entity/MailContent.php
+++ b/plugins/bc-mail/src/Model/Entity/MailContent.php
@@ -60,6 +60,7 @@ class MailContent extends Entity
* @return int
* @checked
* @noTodo
+ * @unitTest
*/
public function getNumberOfMessages()
{
diff --git a/plugins/bc-mail/src/Model/Table/MailFieldsTable.php b/plugins/bc-mail/src/Model/Table/MailFieldsTable.php
index a5de9fdada..228f6cff6d 100755
--- a/plugins/bc-mail/src/Model/Table/MailFieldsTable.php
+++ b/plugins/bc-mail/src/Model/Table/MailFieldsTable.php
@@ -207,6 +207,7 @@ public function getControlSource($field = null)
* @return boolean
* @checked
* @noTodo
+ * @unitTest
*/
public function duplicateMailField(string $value, array $context)
{
diff --git a/plugins/bc-mail/src/Service/Admin/MailMessagesAdminService.php b/plugins/bc-mail/src/Service/Admin/MailMessagesAdminService.php
index 93c3543a04..1ed4547989 100644
--- a/plugins/bc-mail/src/Service/Admin/MailMessagesAdminService.php
+++ b/plugins/bc-mail/src/Service/Admin/MailMessagesAdminService.php
@@ -86,11 +86,12 @@ public function getViewVarsForView(int $mailContentId, int $mailMessageId)
*/
public function getViewVarsForDownloadCsv(int $mailContentId, ServerRequest $request)
{
+ $currentContent = $request->getAttribute('currentContent');
$this->setup($mailContentId);
return [
'encoding' => $request->getQuery('encoding') ?? 'utf-8',
'messages' => $this->MailMessages->convertMessageToCsv($this->getIndex()->all()->toArray()),
- 'contentName' => $request->getAttribute('currentContent')?->name,
+ 'contentName' => $currentContent ? $request->getAttribute('currentContent')?->name : '',
];
}
diff --git a/plugins/bc-mail/src/View/Helper/MailHelper.php b/plugins/bc-mail/src/View/Helper/MailHelper.php
index 3a65c94d86..1236b3a709 100755
--- a/plugins/bc-mail/src/View/Helper/MailHelper.php
+++ b/plugins/bc-mail/src/View/Helper/MailHelper.php
@@ -198,6 +198,7 @@ public function descriptionExists()
/**
* メールフォームへのリンクを生成する
+ * $contentsNameはコンテンツ管理上の１階層のみ対応
*
* @param string $title リンクのタイトル
* @param string $contentsName メールフォームのコンテンツ名
@@ -212,10 +213,26 @@ public function link($title, $contentsName, $datas = [], $options = [])
{
if ($datas && is_array($datas)) {
foreach ($datas as $key => $data) {
- $datas[$key] = base64UrlsafeEncode($data);
+ $datas[$key] = BcUtil::base64UrlsafeEncode($data);
}
}
- $link = array_merge(['plugin' => '', 'controller' => $contentsName, 'action' => 'index'], $datas);
+
+ $contentsTable = TableRegistry::getTableLocator()->get('BaserCore.Contents');
+ $content = $contentsTable->find('all')
+ ->where([
+ 'Contents.name' => $contentsName,
+ 'Contents.plugin' => 'BcMail',
+ 'Contents.type' => 'MailContent',
+ ])
+ ->first();
+
+ $link = [
+ 'plugin' => 'BcMail',
+ 'controller' => 'Mail',
+ 'action' => 'index',
+ 'entityId' => $content->entity_id,
+ '?' => $datas,
+ ];
$this->BcBaser->link($title, $link, $options);
}
diff --git a/plugins/bc-mail/src/View/MailFrontAppView.php b/plugins/bc-mail/src/View/MailFrontAppView.php
index 24d0908844..aefa4a2a18 100644
--- a/plugins/bc-mail/src/View/MailFrontAppView.php
+++ b/plugins/bc-mail/src/View/MailFrontAppView.php
@@ -11,6 +11,7 @@
namespace BcMail\View;
+use Cake\Core\Configure;
use BaserCore\View\BcFrontAppView;
use BaserCore\Annotation\UnitTest;
use BaserCore\Annotation\NoTodo;
@@ -39,7 +40,7 @@ public function initialize(): void
parent::initialize();
$this->addHelper('BcMail.Mail');
$this->addHelper('BcMail.Mailfield');
- $this->addHelper('BcMail.Mailform', ['templates' => 'BaserCore.bc_form']);
+ $this->addHelper('BcMail.Mailform', ['templates' => Configure::read('BcMail.formTemplate')]);
}
}
diff --git a/plugins/bc-mail/tests/TestCase/Controller/Api/Admin/MailFieldsControllerTest.php b/plugins/bc-mail/tests/TestCase/Controller/Api/Admin/MailFieldsControllerTest.php
index ba8a48a92e..52770b6cc9 100644
--- a/plugins/bc-mail/tests/TestCase/Controller/Api/Admin/MailFieldsControllerTest.php
+++ b/plugins/bc-mail/tests/TestCase/Controller/Api/Admin/MailFieldsControllerTest.php
@@ -290,4 +290,33 @@ public function testView()
$this->assertEquals('お名前', $result->mailField->head);
$this->assertEquals('text', $result->mailField->type);
}
+
+ /**
+ * test index
+ */
+ public function testIndex()
+ {
+ //Create data
+ $this->loadFixtureScenario(MailFieldsScenario::class);
+ $this->loadFixtureScenario(MailContentsScenario::class);
+
+ //mail_content_id is not set
+ $this->get("/baser/api/admin/bc-mail/mail_fields/index.json?token=" . $this->accessToken);
+ $this->assertResponseCode(400);
+ $vars = $this->_controller->viewBuilder()->getVars();
+ $this->assertEquals('パラメーターに mail_content_id を指定してください。', $vars['message']);
+
+ //mail_content_id is set
+ $this->get("/baser/api/admin/bc-mail/mail_fields/index.json?mail_content_id=1&token=" . $this->accessToken);
+ $this->assertResponseOk();
+
+ $result = json_decode((string)$this->_response->getBody());
+ $this->assertNotNull($result->mailFields);
+
+ //mail_content_id fails
+ $this->get("/baser/api/admin/bc-mail/mail_fields/index.json?mail_content_id=tt&token=" . $this->accessToken);
+ $this->assertResponseCode(500);
+ $vars = $this->_controller->viewBuilder()->getVars();
+ $this->assertTextContains('データベース処理中にエラーが発生しました。', $vars['message']);
+ }
}
diff --git a/plugins/bc-mail/tests/TestCase/Controller/Api/Admin/MailMessagesControllerTest.php b/plugins/bc-mail/tests/TestCase/Controller/Api/Admin/MailMessagesControllerTest.php
index 99f9a1c342..69e134efa9 100644
--- a/plugins/bc-mail/tests/TestCase/Controller/Api/Admin/MailMessagesControllerTest.php
+++ b/plugins/bc-mail/tests/TestCase/Controller/Api/Admin/MailMessagesControllerTest.php
@@ -15,9 +15,11 @@
use BaserCore\Test\Factory\ContentFactory;
use BaserCore\Test\Scenario\InitAppScenario;
use BaserCore\TestSuite\BcTestCase;
+use BcMail\Controller\Api\MailMessagesController;
use BcMail\Service\MailMessagesServiceInterface;
use BcMail\Test\Factory\MailContentFactory;
use BcMail\Test\Scenario\MailContentsScenario;
+use Cake\Event\Event;
use Cake\ORM\Entity;
use Cake\ORM\TableRegistry;
use Cake\TestSuite\IntegrationTestTrait;
@@ -56,6 +58,19 @@ public function tearDown(): void
parent::tearDown();
}
+
+ /**
+ * test beforeFilter
+ */
+ public function testBeforeFilter()
+ {
+ $this->MailMessagesController = new MailMessagesController($this->getRequest());
+ $event = new Event('Controller.beforeFilter', $this->MailMessagesController);
+ $this->MailMessagesController->beforeFilter($event);
+ $config = $this->MailMessagesController->FormProtection->getConfig('validate');
+ $this->assertFalse($config);
+ }
+
/**
* [API] 受信メール一覧
*/
@@ -347,6 +362,18 @@ public function testBatch()
*/
public function testDownload()
{
- $this->markTestIncomplete('このテストは、まだ実装されていません。');
+ // メールメッセージのデータを作成する
+ $MailMessagesService = $this->getService(MailMessagesServiceInterface::class);
+ //テストデータベースを生成
+ $MailMessagesService->createTable(1);
+ $mailMessageTable = TableRegistry::getTableLocator()->get('BcMail.MailMessages');
+ $mailContentId = 1;
+ $mailMessageTable->setup($mailContentId);
+ $mailMessageTable->save(new Entity(['id' => 2]));
+
+ ob_start();
+ $this->get("/baser/api/admin/bc-mail/mail_messages/download/1.json?token=$this->accessToken");
+ $actual = ob_get_clean();
+ $this->assertNotEmpty($actual);
}
}
diff --git a/plugins/bc-mail/tests/TestCase/Controller/MailControllerTest.php b/plugins/bc-mail/tests/TestCase/Controller/MailControllerTest.php
index 604c4da8d9..88a552da50 100644
--- a/plugins/bc-mail/tests/TestCase/Controller/MailControllerTest.php
+++ b/plugins/bc-mail/tests/TestCase/Controller/MailControllerTest.php
@@ -11,10 +11,22 @@
namespace BcMail\Test\TestCase\Controller;
+use BaserCore\Test\Factory\ContentFactory;
+use BaserCore\Test\Factory\SiteFactory;
use BaserCore\TestSuite\BcTestCase;
+use BaserCore\Utility\BcContainerTrait;
+use BcMail\Test\Factory\MailContentFactory;
+use BcMail\Test\Factory\MailFieldsFactory;
+use Cake\TestSuite\IntegrationTestTrait;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
class MailControllerTest extends BcTestCase
{
+
+ use ScenarioAwareTrait;
+ use IntegrationTestTrait;
+ use BcContainerTrait;
+
/**
* set up
*
@@ -53,11 +65,28 @@ public function testBeforeRender()
/**
* [test_index description]
- * @return [type] [description]
*/
public function test_index()
{
- $this->markTestIncomplete('このテストは、まだ実装されていません。');
+ //準備
+ SiteFactory::make(['id' => 1])->persist();
+ MailFieldsFactory::make(['mail_content_id' => 1, 'no' => 1])->persist();
+ ContentFactory::make(['id' => 1, 'plugin' => 'BcMail', 'type' => 'MailContent', 'entity_id' => 1, 'url' => '/contact/', 'site_id' => 1, 'lft' => 1, 'rght' => 2])->persist();
+ MailContentFactory::make(['id' => 1, 'form_template' => 'default', 'mail_template' => 'mail_default'])->persist();
+ //正常テスト
+ $this->get('/contact/');
+
+ $this->assertResponseOk();
+ $vars = $this->_controller->viewBuilder()->getVars();
+ $this->assertNotNull($vars['mailContent']);
+ $this->assertNotNull($vars['mailFields']);
+ $this->assertNotNull($vars['mailMessage']);
+ $this->assertNotNull($vars['description']);
+ $this->assertTrue($_SESSION["BcMail"]["valid"]);
+
+ //異常テスト
+ $this->get('/contact-test/');
+ $this->assertResponseCode(404);
}
/**
diff --git a/plugins/bc-mail/tests/TestCase/Model/Entity/MailContentTest.php b/plugins/bc-mail/tests/TestCase/Model/Entity/MailContentTest.php
new file mode 100644
index 0000000000..e35781ed72
--- /dev/null
+++ b/plugins/bc-mail/tests/TestCase/Model/Entity/MailContentTest.php
@@ -0,0 +1,67 @@
+MailContent = new MailContent();
+ }
+
+ public function tearDown(): void
+ {
+ parent::tearDown();
+ }
+
+
+ /**
+ * Test getNumberOfMessages
+ */
+ public function testGetNumberOfMessages()
+ {
+ $MailMessagesService = $this->getService(MailMessagesServiceInterface::class);
+
+ $rs = $this->MailContent->getNumberOfMessages();
+ $this->assertEquals(0, $rs);
+
+ //テストデータベースを生成
+ $MailMessagesService->createTable(1);
+ $mailMessageTable = TableRegistry::getTableLocator()->get('BcMail.MailMessages');
+ $mailContentId = 1;
+ $mailMessageTable->setup($mailContentId);
+ $mailMessageTable->save(new Entity(['id' => 1]));
+ $mailMessageTable->save(new Entity(['id' => 2]));
+ // テストデータを作成する
+ ContentFactory::make([
+ 'id' => 9,
+ 'name' => 'contact',
+ 'plugin' => 'BcMail',
+ 'type' => 'MailContent',
+ 'entity_id' => 1,
+ 'url' => '/contact/',
+ 'site_id' => 1,
+ 'title' => 'お問い合わせ(※関連Fixture未完了)',
+ 'status' => true,
+ ])->persist();
+ MailContentFactory::make(['id' => 1, 'save_info' => 1])->persist();
+
+ $this->MailContent->id = $mailContentId;
+
+ $rs = $this->MailContent->getNumberOfMessages();
+ $this->assertEquals(2, $rs);
+
+ //不要なテーブルを削除
+ $MailMessagesService->dropTable(1);
+ }
+
+}
diff --git a/plugins/bc-mail/tests/TestCase/Model/Table/MailFieldsTableTest.php b/plugins/bc-mail/tests/TestCase/Model/Table/MailFieldsTableTest.php
index 1664de4fd7..4aa429f809 100755
--- a/plugins/bc-mail/tests/TestCase/Model/Table/MailFieldsTableTest.php
+++ b/plugins/bc-mail/tests/TestCase/Model/Table/MailFieldsTableTest.php
@@ -14,6 +14,9 @@
use BaserCore\TestSuite\BcTestCase;
use BcMail\Model\Table\MailFieldsTable;
use BcMail\Test\Factory\MailFieldsFactory;
+use BcMail\Test\Scenario\MailContentsScenario;
+use BcMail\Test\Scenario\MailFieldsScenario;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
/**
* @property MailFieldsTable $MailFieldsTable
@@ -21,6 +24,8 @@
class MailFieldsTableTest extends BcTestCase
{
+ use ScenarioAwareTrait;
+
/**
* Set Up
*
@@ -167,7 +172,22 @@ public function testGetControlSource()
*/
public function testDuplicateMailField()
{
- $this->markTestIncomplete('このテストは、まだ実装されていません。');
+ $this->loadFixtureScenario(MailFieldsScenario::class);
+ $this->loadFixtureScenario(MailContentsScenario::class);
+
+ $context = [
+ 'field' => 'field_name',
+ 'data' => ['mail_content_id' => 1, 'id' => 2],
+ 'newRecord' => true
+ ];
+ //case false
+ $result = $this->MailFieldsTable->duplicateMailField('name_1', $context);
+ $this->assertFalse($result);
+
+ //case true
+ $result = $this->MailFieldsTable->duplicateMailField('name_test', $context);
+ $this->assertTrue($result);
+
}
/**
diff --git a/plugins/bc-search-index/src/Model/Behavior/BcSearchIndexManagerBehavior.php b/plugins/bc-search-index/src/Model/Behavior/BcSearchIndexManagerBehavior.php
index c702af7d8e..454d2c5e57 100755
--- a/plugins/bc-search-index/src/Model/Behavior/BcSearchIndexManagerBehavior.php
+++ b/plugins/bc-search-index/src/Model/Behavior/BcSearchIndexManagerBehavior.php
@@ -191,7 +191,7 @@ public function saveSearchIndex($searchIndex)
}
if (!empty($searchIndex['content_id'])) {
- $content = $this->Contents->find()->select(['lft', 'rght'])->where(['id' => $searchIndex['content_id']])->first();
+ $content = $this->Contents->find()->select(['lft', 'rght'])->where(['Contents.id' => $searchIndex['content_id']])->first();
$searchIndex['lft'] = $content->lft;
$searchIndex['rght'] = $content->rght;
} else {
diff --git a/plugins/bc-theme-config/src/Event/BcThemeConfigControllerEventListener.php b/plugins/bc-theme-config/src/Event/BcThemeConfigControllerEventListener.php
index 451e078718..1b6dce75ff 100644
--- a/plugins/bc-theme-config/src/Event/BcThemeConfigControllerEventListener.php
+++ b/plugins/bc-theme-config/src/Event/BcThemeConfigControllerEventListener.php
@@ -32,6 +32,9 @@ class BcThemeConfigControllerEventListener extends BcControllerEventListener
* テーマ適用後イベント
* @param Event $event
* @return void
+ * @checked
+ * @noTodo
+ * @unitTest
*/
public function baserCoreThemesAfterApply(Event $event)
{
diff --git a/plugins/bc-theme-config/tests/TestCase/Event/BcThemeConfigControllerEventListenerTest.php b/plugins/bc-theme-config/tests/TestCase/Event/BcThemeConfigControllerEventListenerTest.php
new file mode 100644
index 0000000000..7d895584ae
--- /dev/null
+++ b/plugins/bc-theme-config/tests/TestCase/Event/BcThemeConfigControllerEventListenerTest.php
@@ -0,0 +1,40 @@
+BcThemeConfigControllerEventListener = new BcThemeConfigControllerEventListener();
+ }
+
+ public function tearDown(): void
+ {
+ parent::tearDown();
+ }
+
+ /**
+ * Test baserCoreThemesAfterApply
+ */
+ public function test_baserCoreThemesAfterApply()
+ {
+ $path = WWW_ROOT . 'files' . DS . 'theme_configs' . DS . 'config.css';
+
+ if (!is_dir(dirname($path))) {
+ mkdir(dirname($path), 0777, true);
+ }
+ file_put_contents($path, 'test content');
+ $this->assertFileExists($path);
+
+ $event = new Event('BaserCore.Themes.afterApply');
+ $this->BcThemeConfigControllerEventListener->baserCoreThemesAfterApply($event);
+
+ $this->assertFileDoesNotExist($path);
+ }
+}