Merge pull request #65 from NetCommons3/issues/1468

Issues/1468
NetCommons3 · Aug 4, 2019 · fc41482 · fc41482
2 parents 173b836 + ba8531a
commit fc41482
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 104 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,10 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 sudo: false
+dist: trusty
 
 env:
   matrix:

diff --git a/Test/Case/Config/RoutesTest.php b/Test/Case/Config/RoutesTest.php
diff --git a/Test/Case/Controller/CabinetBlockRolePermissionsController/EditTest.php b/Test/Case/Controller/CabinetBlockRolePermissionsController/EditTest.php
@@ -72,7 +72,7 @@ private function __data() {
 			'CabinetSetting' => array(
 				'id' => 2,
 				'cabinet_key' => 'cabinet_key_2',
-				'use_workflow' => true,
+				'use_workflow' => '1',
 				//'use_comment_approval' => true,
 				//'approval_type' => true,
 			)

diff --git a/Test/Case/Controller/CabinetBlocksController/EditTest.php b/Test/Case/Controller/CabinetBlocksController/EditTest.php
@@ -65,8 +65,8 @@ private function __data($isEdit) {
 		$frameId = '6';
 		//$frameKey = 'frame_3';
 		if ($isEdit) {
-			$blockId = '4';
-			$blockKey = 'block_2';
+			$blockId = '2';
+			$blockKey = 'block_1';
 			$cabinetId = '3';
 			$cabinetKey = 'cabinet_key_2';
 		} else {

diff --git a/Test/Case/Model/Cabinet/SaveCabinetTest.php b/Test/Case/Model/Cabinet/SaveCabinetTest.php
@@ -62,8 +62,8 @@ public function setUp() {
 
 		Current::$current['Block']['id'] = '2';
 		Current::$current['Room']['id'] = '1';
-		Current::$current['Permission']['content_editable']['value'] = true;
-		Current::$current['Permission']['content_publishable']['value'] = true;
+		Current::writePermission('1', 'content_editable', true);
+		Current::writePermission('1', 'content_publishable', true);
 	}
 
 /**