diff --git a/Test/Case/Config/RoutesTest.php b/Test/Case/Config/RoutesTest.php index c9e1fd59..ee57ad26 100644 --- a/Test/Case/Config/RoutesTest.php +++ b/Test/Case/Config/RoutesTest.php @@ -66,6 +66,7 @@ public function setUp() { * - exception ExceptionError文字列(省略可) * * @return array テストデータ + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function dataProvider() { return array( @@ -80,6 +81,8 @@ public function dataProvider() { 'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index', 'pass' => array('test4'), 'pagePermalink' => array('test4'), + 'spacePermalink' => '', + 'spaceId' => '2', ) ), array('url' => '/test_pages/test_page/index', @@ -97,6 +100,8 @@ public function dataProvider() { 'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index', 'pass' => array('test_err', 'test_error'), 'pagePermalink' => array('test_err', 'test_error'), + 'spacePermalink' => '', + 'spaceId' => '2', ) ), array('url' => '/test_err/test_error/index', @@ -104,6 +109,8 @@ public function dataProvider() { 'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index', 'pass' => array('test_err', 'test_error', 'index'), 'pagePermalink' => array('test_err', 'test_error', 'index'), + 'spacePermalink' => '', + 'spaceId' => '2', ) ), array('url' => '/aaaaa/', @@ -116,6 +123,8 @@ public function dataProvider() { 'expected' => array( 'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index', 'pagePermalink' => array(), + 'spacePermalink' => '', + 'spaceId' => '2', ), 'settingMode' => true ), @@ -124,6 +133,8 @@ public function dataProvider() { 'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index', 'pass' => array('test4'), 'pagePermalink' => array('test4'), + 'spacePermalink' => '', + 'spaceId' => '2', ), 'settingMode' => true ), @@ -146,6 +157,8 @@ public function dataProvider() { 'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index', 'pass' => array('test_err', 'test_error'), 'pagePermalink' => array('test_err', 'test_error'), + 'spacePermalink' => '', + 'spaceId' => '2', ), 'settingMode' => true ), @@ -153,7 +166,9 @@ public function dataProvider() { 'expected' => array( 'plugin' => 'pages', 'controller' => 'pages', 'action' => 'index', 'pass' => array('test_err', 'test_error', 'index'), - 'pagePermalink' => array('test_err', 'test_error', 'index') + 'pagePermalink' => array('test_err', 'test_error', 'index'), + 'spacePermalink' => '', + 'spaceId' => '2', ), 'settingMode' => true ), diff --git a/Test/Case/Utility/CurrentFrame/SetFrameTest.php b/Test/Case/Utility/CurrentFrame/SetFrameTest.php index 98a9752d..acecb330 100644 --- a/Test/Case/Utility/CurrentFrame/SetFrameTest.php +++ b/Test/Case/Utility/CurrentFrame/SetFrameTest.php @@ -502,7 +502,7 @@ private function __assertFrameMain($mergeExpected = array(), $removeKeys = array 'after_user_save_model' => null, ), 'BoxesPageContainer' => array( - 'id' => '58', + 'id' => '50', 'page_container_id' => '8', 'page_id' => '2', 'container_type' => '3', diff --git a/View/Elements/common_css.ctp b/View/Elements/common_css.ctp index ecfdf29a..a445e0ec 100644 --- a/View/Elements/common_css.ctp +++ b/View/Elements/common_css.ctp @@ -8,7 +8,7 @@ * @license http://www.netcommons.org/license.txt NetCommons License */ -echo $this->Html->css( +echo $this->NetCommonsHtml->css( array( '/components/bootstrap/dist/css/bootstrap.min.css', '/components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css', @@ -21,5 +21,5 @@ echo $this->Html->css( '/user_attributes/css/style.css', '/wysiwyg/css/style.css', ), - array('plugin' => false) + array('plugin' => false, 'inline' => true, 'once' => false) ); diff --git a/View/Elements/common_js.ctp b/View/Elements/common_js.ctp index 20ddea5c..85386d40 100644 --- a/View/Elements/common_js.ctp +++ b/View/Elements/common_js.ctp @@ -8,7 +8,7 @@ * @license http://www.netcommons.org/license.txt NetCommons License */ -echo $this->Html->script( +echo $this->NetCommonsHtml->script( array( '/components/jquery/dist/jquery.min.js', '/components/bootstrap/dist/js/bootstrap.min.js', @@ -16,7 +16,7 @@ echo $this->Html->script( '/components/angular-bootstrap/ui-bootstrap-tpls.min.js', '/net_commons/js/base.js', ), - array('plugin' => false) + array('plugin' => false, 'inline' => true, 'once' => false) ); ?>