Skip to content

Fix/update fixture #69

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

Merged
s-nakajima merged 2 commits into from
Feb 19, 2023
Merged

Fix/update fixture #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56b201d
test: github actionエラー修正
s-nakajima Feb 19, 2023
1d91e6a
test: PHPUnitエラー修正
s-nakajima Feb 19, 2023
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
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Fix up git URLs
run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig

- name: environment
run: |
echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}"
Expand All @@ -58,7 +61,7 @@ jobs:

- name: docker-compose install
run: |
curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
chmod +x ~/docker-compose
sudo mv ~/docker-compose /usr/local/bin/docker-compose
docker-compose --version
Expand Down
2 changes: 2 additions & 0 deletions Test/Case/Model/MenuFrameSetting/GetMenuFrameSettingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public function dataProvider() {
'id' => '2',
'frame_key' => 'frame_2',
'display_type' => 'major',
'is_private_room_hidden' => null,
'created_user' => null,
'created' => null,
'modified_user' => null,
Expand All @@ -74,6 +75,7 @@ public function dataProvider() {
array('frameKey' => 'frame_8', 'expected' => array(
'frame_key' => 'frame_8',
'display_type' => 'major',
'is_private_room_hidden' => null,
'created_user' => null,
'created' => null,
'modified_user' => null,
Expand Down
1 change: 1 addition & 0 deletions Test/Case/Model/MenuFrameSetting/SaveMenuFrameSettingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ private function __data() {
'id' => '3',
'frame_key' => 'frame_3',
'display_type' => 'major',
'is_private_room_hidden' => null,
),
);

Expand Down
1 change: 1 addition & 0 deletions Test/Case/Model/MenuFrameSetting/SaveTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ private function __data() {
'id' => '3',
'frame_key' => 'frame_3',
'display_type' => 'major',
'is_private_room_hidden' => null,
),
'Menus' => array(
1 => array(
Expand Down
34 changes: 15 additions & 19 deletions Test/Fixture/MenuFrameSettingFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,6 @@
*/
class MenuFrameSettingFixture extends CakeTestFixture {

/**
* Fields
*
* @var array
*/
public $fields = array(
'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary', 'comment' => 'ID'),
'frame_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'フレームKey', 'charset' => 'utf8'),
'display_type' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'comment' => 'bootstrap navi type', 'charset' => 'utf8'),
'created_user' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'comment' => '作成者'),
'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => '作成日時'),
'modified_user' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'comment' => '更新者'),
'modified' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => '更新日時'),
'indexes' => array(
'PRIMARY' => array('column' => 'id', 'unique' => 1)
),
'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
);

/**
* Records
*
Expand All @@ -46,27 +27,42 @@ class MenuFrameSettingFixture extends CakeTestFixture {
'id' => '1',
'frame_key' => 'frame_1',
'display_type' => 'header',
'is_private_room_hidden' => null,
),
array(
'id' => '2',
'frame_key' => 'frame_2',
'display_type' => 'major',
'is_private_room_hidden' => null,
),
array(
'id' => '3',
'frame_key' => 'frame_3',
'display_type' => 'major',
'is_private_room_hidden' => null,
),
array(
'id' => '4',
'frame_key' => 'frame_4',
'display_type' => 'minor',
'is_private_room_hidden' => null,
),
array(
'id' => '5',
'frame_key' => 'frame_5',
'display_type' => 'footer',
'is_private_room_hidden' => null,
),
);

/**
* Initialize the fixture.
*
* @return void
*/
public function init() {
require_once App::pluginPath('Menus') . 'Config' . DS . 'Schema' . DS . 'schema.php';
$this->fields = (new MenusSchema())->tables[Inflector::tableize($this->name)];
parent::init();
}
}
31 changes: 10 additions & 21 deletions Test/Fixture/MenuFramesPageFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,6 @@
*/
class MenuFramesPageFixture extends CakeTestFixture {

/**
* Fields
*
* @var array
*/
public $fields = array(
'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
'frame_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'page_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
'is_hidden' => array('type' => 'boolean', 'null' => true, 'default' => null),
'folder_type' => array('type' => 'boolean', 'null' => true, 'default' => null),
'created_user' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'comment' => '作成者'),
'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => '作成日時'),
'modified_user' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'comment' => '更新者'),
'modified' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => '更新日時'),
'indexes' => array(
'PRIMARY' => array('column' => 'id', 'unique' => 1)
),
'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
);

/**
* Records
*
Expand All @@ -53,4 +32,14 @@ class MenuFramesPageFixture extends CakeTestFixture {
),
);

/**
* Initialize the fixture.
*
* @return void
*/
public function init() {
require_once App::pluginPath('Menus') . 'Config' . DS . 'Schema' . DS . 'schema.php';
$this->fields = (new MenusSchema())->tables[Inflector::tableize($this->name)];
parent::init();
}
}
30 changes: 10 additions & 20 deletions Test/Fixture/MenuFramesRoomFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,6 @@
*/
class MenuFramesRoomFixture extends CakeTestFixture {

/**
* Fields
*
* @var array
*/
public $fields = array(
'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
'frame_key' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
'room_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
'is_hidden' => array('type' => 'boolean', 'null' => true, 'default' => null),
'created_user' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'comment' => '作成者 | '),
'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => '作成日時'),
'modified_user' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'comment' => '更新者 | '),
'modified' => array('type' => 'datetime', 'null' => true, 'default' => null, 'comment' => '更新日時'),
'indexes' => array(
'PRIMARY' => array('column' => 'id', 'unique' => 1)
),
'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
);

/**
* Records
*
Expand All @@ -51,4 +31,14 @@ class MenuFramesRoomFixture extends CakeTestFixture {
),
);

/**
* Initialize the fixture.
*
* @return void
*/
public function init() {
require_once App::pluginPath('Menus') . 'Config' . DS . 'Schema' . DS . 'schema.php';
$this->fields = (new MenusSchema())->tables[Inflector::tableize($this->name)];
parent::init();
}
}