89 Croogo/View/Helper/CroogoHelper.php → Croogo/src/View/Helper/CroogoHelper.php
View file
@@ -2,8 +2,14 @@

namespace Croogo\Croogo\View\Helper;

use App\View\Helper\AppHelper;
use Croogo\Lib\CroogoStatus;
use Cake\Controller\Component\AuthComponent;
use Cake\Core\Configure;
use Cake\Utility\Hash;
use Cake\Utility\Inflector;
use Cake\View\Helper;
use Cake\View\View;
use Croogo\Croogo\Croogo;
use Croogo\Croogo\CroogoStatus;
/**
* Croogo Helper
*
@@ -14,13 +20,16 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
* @link http://www.croogo.org
*/
class CroogoHelper extends AppHelper {
class CroogoHelper extends Helper {

public $helpers = array(
'Form' => array('className' => 'Croogo.CroogoForm'),
'Html' => array('className' => 'Croogo.CroogoHtml'),
'Croogo.Layout',
'Menus.Menus',
'Form',
'Html',
'Url',
'Croogo/Croogo.Layout',
'Croogo/Croogo.CroogoForm',
'Croogo/Croogo.CroogoHtml',
'Croogo/Menus.Menus',
);

/**
@@ -52,7 +61,7 @@ public function __construct(View $View, $settings = array()) {
* Before Render callback
*/
public function beforeRender($viewFile) {
if (isset($this->request->params['admin'])) {
if ($this->request->param('prefix') === 'admin') {
Croogo::dispatchEvent('Croogo.setupAdminData', $this->_View);
}
}
@@ -94,31 +103,31 @@ public function adminMenus($menus, $options = array(), $depth = 0) {
),
), $options);

$aclPlugin = Configure::read('Site.acl_plugin');
$userId = AuthComponent::user('id');
if (empty($userId)) {
return '';
}
// $aclPlugin = Configure::read('Site.acl_plugin');
// $userId = AuthComponent::user('id');
// if (empty($userId)) {
// return '';
// }

$sidebar = $options['type'] === 'sidebar';
$htmlAttributes = $options['htmlAttributes'];
$out = null;
$sorted = Hash::sort($menus, '{s}.weight', 'ASC');
if (empty($this->Role)) {
$this->Role = ClassRegistry::init('Users.Role');
$this->Role->Behaviors->attach('Croogo.Aliasable');
}
$currentRole = $this->Role->byId($this->Layout->getRoleId());
// if (empty($this->Role)) {
// $this->Role = ClassRegistry::init('Users.Role');
// $this->Role->Behaviors->attach('Croogo.Aliasable');
// }
// $currentRole = $this->Role->byId($this->Layout->getRoleId());

foreach ($sorted as $menu) {
if (isset($menu['separator'])) {
$liOptions['class'] = 'divider';
$out .= $this->Html->tag('li', null, $liOptions);
continue;
}
if ($currentRole != 'admin' && !$this->{$aclPlugin}->linkIsAllowedByUserId($userId, $menu['url'])) {
continue;
}
// if ($currentRole != 'admin' && !$this->{$aclPlugin}->linkIsAllowedByUserId($userId, $menu['url'])) {
// continue;
// }

if (empty($menu['htmlAttributes']['class'])) {
$menuClass = Inflector::slug(strtolower('menu-' . $menu['title']), '-');
@@ -162,7 +171,7 @@ public function adminMenus($menus, $options = array(), $depth = 0) {
}
$menu['htmlAttributes']['class'] .= ' sidebar-item';

$menuUrl = $this->url($menu['url']);
$menuUrl = $this->Url->build($menu['url']);
if ($menuUrl == env('REQUEST_URI')) {
if (isset($menu['htmlAttributes']['class'])) {
$menu['htmlAttributes']['class'] .= ' current';
@@ -187,7 +196,9 @@ public function adminMenus($menus, $options = array(), $depth = 0) {
$title = $title . $menu['after'];
}

$link = $this->Html->link($title, $menu['url'], $menu['htmlAttributes']);
$menu['htmlAttributes']['escape'] = false;

$link = $this->CroogoHtml->link($title, $menu['url'], $menu['htmlAttributes']);
$liOptions = array();
if ($sidebar && !empty($children) && $depth > 0) {
$liOptions['class'] = ' dropdown-submenu';
@@ -218,7 +229,7 @@ public function adminMenus($menus, $options = array(), $depth = 0) {
*/
public function adminRowActions($id, $options = array()) {
$output = '';
$rowActions = Configure::read('Admin.rowActions.' . Inflector::camelize($this->request->params['controller']) . '/' . $this->request->params['action']);
$rowActions = Configure::read('Admin.rowActions.' . Inflector::camelize($this->request->param('controller')) . '/' . $this->request->param('action'));
if (is_array($rowActions)) {
foreach ($rowActions as $title => $link) {
$linkOptions = $options;
@@ -265,6 +276,11 @@ public function adminRowAction($title, $url = null, $options = array(), $confirm
'escapeTitle' => false,
'escape' => true,
), $options);

if (!$confirmMessage) {
$options['confirm'] = $confirmMessage;
}

if (is_array($url)) {
$action = $url['action'];
if (isset($options['class'])) {
@@ -280,7 +296,7 @@ public function adminRowAction($title, $url = null, $options = array(), $confirm
if (!empty($options['rowAction'])) {
$options['data-row-action'] = $options['rowAction'];
unset($options['rowAction']);
return $this->_bulkRowAction($title, $url, $options, $confirmMessage);
return $this->_bulkRowAction($title, $url, $options);
}

if (!empty($options['method']) && strcasecmp($options['method'], 'post') == 0) {
@@ -289,10 +305,13 @@ public function adminRowAction($title, $url = null, $options = array(), $confirm
}

if ($action == 'delete' || isset($usePost)) {
return $this->Form->postLink($title, $url, $options, $confirmMessage);
$this->CroogoForm->_helperMap['Html']['class'] = 'Croogo/Croogo.CroogoHtml';
$postLink = $this->CroogoForm->postLink($title, $url, $options);
$this->CroogoForm->_helperMap['Html']['class'] = 'Html';
return $postLink;
}

return $this->Html->link($title, $url, $options, $confirmMessage);
return $this->CroogoHtml->link($title, $url, $options);
}

/**
@@ -309,7 +328,7 @@ protected function _bulkRowAction($title, $url = null, $options = array(), $conf
if (isset($options['icon'])) {
$options['iconInline'] = false;
}
$output = $this->Html->link($title, $url, $options);
$output = $this->CroogoHtml->link($title, $url, $options);
return $output;
}

@@ -322,21 +341,21 @@ public function adminAction($title, $url, $options = array()) {
'method' => 'get',
), $options);
if (strcasecmp($options['method'], 'post') == 0) {
return $this->Html->tag('li',
$this->Form->postLink($title, $url, $options)
return $this->CroogoHtml->tag('li',
$this->CroogoForm->postLink($title, $url, $options)
);
}
return $this->Html->tag('li',
$this->Html->link($title, $url, $options)
return $this->CroogoHtml->tag('li',
$this->CroogoHtml->link($title, $url, $options)
);
}

/**
* Create a tab title/link
*/
public function adminTab($title, $url, $options = array()) {
return $this->Html->tag('li',
$this->Html->link($title, $url, Hash::merge(array(
return $this->CroogoHtml->tag('li',
$this->CroogoHtml->link($title, $url, Hash::merge(array(
'data-toggle' => 'tab',
), $options)
)
@@ -397,7 +416,7 @@ public function adminBoxes($boxName = null) {
}

$output = '';
$allBoxes = Configure::read('Admin.boxes.' . Inflector::camelize($this->request->params['controller']) . '/' . $this->request->params['action']);
$allBoxes = Configure::read('Admin.boxes.' . Inflector::camelize($this->request->param('controller')) . '/' . $this->request->param('action'));
$allBoxes = empty($allBoxes) ? array() : $allBoxes;
$boxNames = array();

45 Croogo/View/Helper/CroogoHtmlHelper.php → Croogo/src/View/Helper/CroogoHtmlHelper.php
View file
@@ -3,6 +3,8 @@
namespace Croogo\Croogo\View\Helper;

use Cake\View\Helper\HtmlHelper;
use Cake\View\View;
use Croogo\Croogo\CroogoStatus;

/**
* Croogo Html Helper
@@ -11,35 +13,38 @@
*/
class CroogoHtmlHelper extends HtmlHelper {

public $helpers = [
'Url'
];

public function __construct(View $View, $settings = array()) {
parent::__construct($View, $settings);

$this->_tags['beginbox'] =
'<div class="row-fluid">
<div class="span12">
<div class="box">
<div class="box-title">
<i class="icon-list"></i>
%s
</div>
<div class="box-content %s">';
$this->_tags['endbox'] =
'</div>
</div>
</div>
</div>';
$this->_tags['icon'] = '<i class="%s"%s></i> ';
$this->_defaultConfig['templates']['icon'] = '<i class="%s"%s></i> ';
}

public function beginBox($title, $isHidden = false, $isLabelHidden = false) {
$isHidden = $isHidden ? 'hidden' : '';
$isLabelHidden = $isLabelHidden ? 'label-hidden' : '';
$class = $isHidden . ' ' . $isLabelHidden;
return $this->useTag('beginbox', $title, $class);

$output = '
<div class="row-fluid">
<div class="span12">
<div class="box">';

$output .= $this->div('box-title', '<i class="icon-list"></i> ' . $title, ['escape' => false]);

$output .= '<div class="box-content ' . $class . '">';

return $output;
}

public function endBox() {
return $this->useTag('endbox');
return ' </div>
</div>
</div>
</div>';
}

public function icon($name, $options = array()) {
@@ -59,7 +64,7 @@ public function icon($name, $options = array()) {
if ($attributes) {
$attributes = ' ' . $attributes;
}
return sprintf($this->_tags['icon'], $class, $attributes);
return sprintf($this->_defaultConfig['templates']['icon'], $class, $attributes);
}

public function status($value, $url = array()) {
@@ -70,7 +75,7 @@ public function status($value, $url = array()) {
return $this->icon($icon, array('class' => $class));
} else {
return $this->link('', 'javascript:void(0);', array(
'data-url' => $this->url($url),
'data-url' => $this->Url->build($url),
'class' => 'icon-' . $icon . ' ' . $class . ' ajax-toggle',
));
}
@@ -161,7 +166,7 @@ public function addPath($path, $separator) {
return $this;
}

public function addCrumb($name, $link = null, array $options = null) {
public function addCrumb($name, $link = null, array $options = array()) {
parent::addCrumb($name, $link, $options);
return $this;
}
25 Croogo/View/Helper/CroogoPaginatorHelper.php → ...src/View/Helper/CroogoPaginatorHelper.php
View file
@@ -1,22 +1,27 @@
<?php

namespace Croogo\Croogo\View\Helper;
use Cake\View\Helper\PaginatorHelper;

use App\View\Helper\PaginatorHelper;
/**
* Croogo Paginator Helper
*
* @package Croogo.Croogo.View.Helper
*/
class CroogoPaginatorHelper extends PaginatorHelper {

public $helpers = [
'Html',
'Url'
];

/**
* doesn't use parent::numbers()
*
* @param type $options
* @param array $options
* @return boolean
*/
public function numbers($options = array()) {
public function numbers(array $options = []) {
$defaults = array(
'tag' => 'li',
'model' => $this->defaultModel(),
@@ -40,7 +45,7 @@ public function numbers($options = array()) {
$output = '';
for ($i = $begin; $i < $end; $i++) {
$class = ($i == $page) ? 'active' : '';
$output .= $this->Html->tag($tag, $this->link($i, array('page' => $i), compact('class')));
$output .= $this->Html->tag($tag, $this->Html->link($i, array('page' => $i), compact('class')));
}
return $output;
}
@@ -53,25 +58,25 @@ protected function _defaultOptions($options) {
return $options;
}

public function prev($title = '<< Previous', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
public function prev($title = '<< Previous', array $options = []) {
$options['escape'] = isset($options['escape']) ? $options['escape'] : false;
$options = $this->_defaultOptions($options, false);
return parent::prev($title, $options, $this->link($title), $disabledOptions);
return parent::prev($title = '<< Previous', $options = []);
}

public function next($title = 'Next >>', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
public function next($title = '<< Previous', array $options = []) {
$options['escape'] = isset($options['escape']) ? $options['escape'] : false;
$options = $this->_defaultOptions($options, false);
return parent::next($title, $options, $this->link($title), $disabledOptions);
return parent::next($title = 'Next >>', $options = []);
}

public function first($first = '<< first', $options = array()) {
public function first($first = '<< first', array $options = []) {
$options['escape'] = isset($options['escape']) ? $options['escape'] : true;
$options = $this->_defaultOptions($options);
return parent::first($first, $options);
}

public function last($last = 'last >>', $options = array()) {
public function last($last = 'last >>', array $options = []) {
$options['escape'] = isset($options['escape']) ? $options['escape'] : true;
$options = $this->_defaultOptions($options);
return parent::last($last, $options);
3 Croogo/View/Helper/CustomHelper.php → Croogo/src/View/Helper/CustomHelper.php
View file
@@ -2,7 +2,8 @@

namespace Croogo\Croogo\View\Helper;

use App\View\Helper\Helper;
use Cake\View\Helper;

/**
* Custom Helper
*
0 Croogo/View/Helper/ImageHelper.php → Croogo/src/View/Helper/ImageHelper.php
View file
File renamed without changes.
152 Croogo/View/Helper/LayoutHelper.php → Croogo/src/View/Helper/LayoutHelper.php
View file
@@ -1,8 +1,13 @@
<?php

namespace Croogo\Croogo\View\Helper;

use App\View\Helper\AppHelper;
use Cake\ORM\Entity;
use Cake\View\Helper;
use Cake\Routing\Router;
use Cake\Core\Configure;
use Cake\Utility\Hash;
use Croogo\Croogo\Croogo;
use Cake\Utility\Inflector;

/**
* Layout Helper
@@ -14,7 +19,7 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
* @link http://www.croogo.org
*/
class LayoutHelper extends AppHelper {
class LayoutHelper extends Helper {

/**
* Other helpers used by this helper
@@ -25,9 +30,7 @@ class LayoutHelper extends AppHelper {
public $helpers = array(
'Croogo.Croogo',
'Html',
'Form',
'Session',
'Js',
'Form'
);

/**
@@ -53,7 +56,6 @@ class LayoutHelper extends AppHelper {
'Paginator',
'PrototypeEngine',
'Rss',
'Session',
'Text',
'Time',
'Xml',
@@ -68,70 +70,70 @@ class LayoutHelper extends AppHelper {
/**
* Provides backward compatibility for deprecated methods
*/
public function __call($method, $params) {
$mapMethods = array(
'meta' => array('Meta.Meta', 'meta'),
'metaField' => array('Meta.Meta', 'field'),
'blocks' => array('Blocks.Regions', 'blocks'),
'regionIsEmpty' => array('Blocks.Regions', 'isEmpty'),
'linkStringToArray' => array('Menus.Menus', 'linkStringToArray'),
'menu' => array('Menus.Menus', 'menu'),
'nestedLinks' => array('Menus.Menus', 'nestedLinks'),
'nestedTerms' => array('Taxonomy.Taxonomies', 'nestedTerms'),
'vocabulary' => array('Taxonomy.Taxonomies', 'vocabulary'),
'node' => array('Nodes.Nodes', 'field'),
'nodeBody' => array('Nodes.Nodes', 'body'),
'nodeExcerpt' => array('Nodes.Nodes', 'excerpt'),
'nodeInfo' => array('Nodes.Nodes', 'info'),
'nodeList' => array('Nodes.Nodes', 'nodeList'),
'nodeMoreInfo' => array('Nodes.Nodes', 'moreInfo'),
'setNode' => array('Nodes.Nodes', 'set'),
'setNodeField' => array('Nodes.Nodes', 'field'),
'adminRowActions' => array('Croogo', 'adminRowActions'),
'adminTabs' => array('Croogo', 'adminTabs'),
'adminMenus' => array('Croogo', 'adminMenus'),
);

if (!isset($mapMethods[$method])) {
trigger_error(__d('croogo', 'Method %1$s::%2$s does not exist', get_class($this), $method), E_USER_WARNING);
return;
}

$mapped = $mapMethods[$method];
list($helper, $method) = $mapped;
list($plugin, $helper) = pluginSplit($helper, true);
if (!$this->{$helper}) {
if (!$this->_View->Helpers->loaded($helper)) {
$this->_View->Helpers->load($helper);
}
$this->{$helper} = $this->_View->{$helper};
}
return call_user_func_array(array($this->{$helper}, $method), $params);
}

/**
* Provides backward compatibility for deprecated properties
*/
public function __get($name) {
switch ($name) {
case 'node':
return $this->_View->Nodes->node;
default:
return parent::__get($name);
}
}
// public function __call($method, $params) {
// $mapMethods = array(
// 'meta' => array('Meta.Meta', 'meta'),
// 'metaField' => array('Meta.Meta', 'field'),
// 'blocks' => array('Blocks.Regions', 'blocks'),
// 'regionIsEmpty' => array('Blocks.Regions', 'isEmpty'),
// 'linkStringToArray' => array('Menus.Menus', 'linkStringToArray'),
// 'menu' => array('Menus.Menus', 'menu'),
// 'nestedLinks' => array('Menus.Menus', 'nestedLinks'),
// 'nestedTerms' => array('Taxonomy.Taxonomies', 'nestedTerms'),
// 'vocabulary' => array('Taxonomy.Taxonomies', 'vocabulary'),
// 'node' => array('Nodes.Nodes', 'field'),
// 'nodeBody' => array('Nodes.Nodes', 'body'),
// 'nodeExcerpt' => array('Nodes.Nodes', 'excerpt'),
// 'nodeInfo' => array('Nodes.Nodes', 'info'),
// 'nodeList' => array('Nodes.Nodes', 'nodeList'),
// 'nodeMoreInfo' => array('Nodes.Nodes', 'moreInfo'),
// 'setNode' => array('Nodes.Nodes', 'set'),
// 'setNodeField' => array('Nodes.Nodes', 'field'),
// 'adminRowActions' => array('Croogo', 'adminRowActions'),
// 'adminTabs' => array('Croogo', 'adminTabs'),
// 'adminMenus' => array('Croogo', 'adminMenus'),
// );
//
// if (!isset($mapMethods[$method])) {
// trigger_error(__d('croogo', 'Method %1$s::%2$s does not exist', get_class($this), $method), E_USER_WARNING);
// return;
// }
//
// $mapped = $mapMethods[$method];
// list($helper, $method) = $mapped;
// list($plugin, $helper) = pluginSplit($helper, true);
// if (!$this->{$helper}) {
// if (!$this->_View->Helpers->loaded($helper)) {
// $this->_View->Helpers->load($helper);
// }
// $this->{$helper} = $this->_View->{$helper};
// }
// return call_user_func_array(array($this->{$helper}, $method), $params);
// }

/**
* Provides backward compatibility for deprecated properties
*/
public function __set($name, $val) {
switch ($name) {
case 'node':
return $this->_View->Nodes->node = $val;
default:
return parent::__set($name, $val);
}
}
// public function __get($name) {
// switch ($name) {
// case 'node':
// return $this->_View->Nodes->node;
// default:
// return parent::__get($name);
// }
// }
//
///**
// * Provides backward compatibility for deprecated properties
// */
// public function __set($name, $val) {
// switch ($name) {
// case 'node':
// return $this->_View->Nodes->node = $val;
// default:
// return parent::__set($name, $val);
// }
// }

/**
* Javascript variables
@@ -164,7 +166,7 @@ public function js() {
if (is_array(Configure::read('Js'))) {
$croogo = Hash::merge($croogo, Configure::read('Js'));
}
return $this->Html->scriptBlock('var Croogo = ' . $this->Js->object($croogo) . ';');
return $this->Html->scriptBlock('var Croogo = ' . json_encode($croogo) . ';');
}

/**
@@ -202,18 +204,18 @@ public function status($value) {
* @param $options array
* @return string
*/
public function displayField($item, $model, $field, $options = array()) {
public function displayField(Entity $item, $model, $field, $options = array()) {
extract(array_intersect_key($options, array(
'type' => null,
'url' => array(),
'options' => array(),
)));
switch ($type) {
case 'boolean':
$out = $this->status($item[$model][$field]);
$out = $this->status($item->{$field});
break;
default:
$out = h($item[$model][$field]);
$out = h((!isset($item->{$model})) ? $item->{$field} : $item->{$model}->{$field});
break;
}

@@ -245,11 +247,11 @@ public function displayField($item, $model, $field, $options = array()) {
* @return string
*/
public function sessionFlash() {
$messages = $this->Session->read('Message');
$messages = $this->request->session()->read('Message');
$output = '';
if (is_array($messages)) {
foreach (array_keys($messages) as $key) {
$output .= $this->Session->flash($key);
$output .= $this->request->session()->flash($key);
}
}
return $output;
@@ -263,7 +265,7 @@ public function sessionFlash() {
* @return boolean
*/
public function isLoggedIn() {
if ($this->Session->check('Auth.User.id')) {
if ($this->request->session()->check('Auth.User.id')) {
return true;
} else {
return false;
@@ -309,7 +311,7 @@ public function feed($returnUrl = false) {
*/
public function getRoleId() {
if ($this->isLoggedIn()) {
$roleId = $this->Session->read('Auth.User.role_id');
$roleId = $this->request->session()->read('Auth.User.role_id');
} else {
// Public
$roleId = 3;
14 Croogo/View/Helper/RecaptchaHelper.php → Croogo/src/View/Helper/RecaptchaHelper.php
View file
@@ -2,14 +2,14 @@

namespace Croogo\Croogo\View\Helper;

use App\View\Helper\AppHelper;
use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
use Cake\Core\Configure;
use Cake\View\Helper;

/**
* @package Croogo.Croogo.View.Helper
* @link http://bakery.cakephp.org/articles/view/recaptcha-component-helper-for-cakephp
*/
class RecaptchaHelper extends AppHelper {
class RecaptchaHelper extends Helper {
public $helpers = array('Form');

public function display_form($output_method = 'return', $error = null, $use_ssl = false) {
@@ -41,7 +41,8 @@ public function hide_mail($email = '',$output_method = 'return') {
*/
private function __form($pubkey, $error = null, $use_ssl = false) {
if ($pubkey == null || $pubkey == '') {
die ("To }
die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
}

if ($use_ssl) {
$server = Configure::read('Recaptcha.apiSecureServer');
@@ -66,7 +67,8 @@ private function __form($pubkey, $error = null, $use_ssl = false) {
/* Mailhide related code */
protected function _recaptcha_aes_encrypt($val,$ky) {
if (! function_exists ("mcrypt_encrypt")) {
die ("To }
die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
}
$mode=MCRYPT_MODE_CBC;
$enc=MCRYPT_RIJNDAEL_128;
$val=$this->_recaptcha_aes_pad($val);
9 Croogo/Test/Fixture/OrderRecordFixture.php → Croogo/tests/Fixture/OrderRecordFixture.php
View file
@@ -2,18 +2,21 @@

namespace Croogo\Croogo\Test\Fixture;

use Croogo\TestSuite\CroogoTestFixture;
use Croogo\Croogo\TestSuite\CroogoTestFixture;

class OrderRecordFixture extends CroogoTestFixture {

public $fields = array(
'id' => ['type' => 'integer', 'null' => false, 'default' => null, 'length' => 20],
'id' => ['type' => 'integer', 'null' => false, 'default' => null],
'title' => ['type' => 'string', 'null' => false, 'default' => null, 'length' => 60],
'weight' => ['type' => 'integer', 'null' => false, 'default' => null],
'created' => ['type' => 'datetime', 'null' => false, 'default' => null],
'updated' => ['type' => 'datetime', 'null' => false, 'default' => null],
'start' => ['type' => 'datetime', 'null' => true, 'default' => null],
'end' => ['type' => 'datetime', 'null' => true, 'default' => null],
'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']], 'PRIMARY' => ['type' => 'unique', 'columns' => 'id']],
'_constraints' => [
'primary' => ['type' => 'primary', 'columns' => ['id']],
],
'_options' => ['charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'InnoDB']
);

9 Croogo/Test/Fixture/TrackableFixture.php → Croogo/tests/Fixture/TrackableFixture.php
View file
@@ -2,17 +2,20 @@

namespace Croogo\Croogo\Test\Fixture;

use Croogo\TestSuite\CroogoTestFixture;
use Croogo\Croogo\TestSuite\CroogoTestFixture;

class TrackableFixture extends CroogoTestFixture {

public $fields = array(
'id' => ['type' => 'integer', 'null' => false, 'default' => null, 'length' => 20],
'id' => ['type' => 'integer', 'null' => false, 'default' => null],
'title' => ['type' => 'string', 'null' => false, 'default' => null, 'length' => 60],
'created_by' => ['type' => 'integer', 'null' => false, 'default' => null],
'created' => ['type' => 'datetime', 'null' => false, 'default' => null],
'updated_by' => ['type' => 'integer', 'null' => false, 'default' => null],
'updated' => ['type' => 'datetime', 'null' => false, 'default' => null],
'_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']], 'PRIMARY' => ['type' => 'unique', 'columns' => 'id']],
'_constraints' => [
'primary' => ['type' => 'primary', 'columns' => ['id']],
],
'_options' => ['charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'InnoDB']
);

25 ...stCase/Configure/CroogoJsonReaderTest.php → ...stCase/Configure/CroogoJsonReaderTest.php
View file
@@ -2,8 +2,9 @@

namespace Croogo\Croogo\Test\TestCase\Configure;

use Croogo\Configure\CroogoJsonReader;
use Croogo\TestSuite\CroogoTestCase;
use Cake\Core\Plugin;
use Croogo\Croogo\Configure\CroogoJsonReader;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class MockCroogoJsonReader extends CroogoJsonReader {

public $written = null;
@@ -16,18 +17,24 @@ public function getPath() {

class CroogoJsonReaderTest extends CroogoTestCase {

public $fixtures = array(
'plugin.settings.setting',
);
/**
* @var CroogoJsonReader
*/
private $CroogoJsonReader;

/**
/**
* @var string
*/
private $testFile;

/**
* setUp
*/
public function setUp() {
parent::setUp();
$this->CroogoJsonReader = $this->getMock('MockCroogoJsonReader',
$this->CroogoJsonReader = $this->getMock('\\Croogo\\Croogo\\Test\\TestCase\\Configure\\MockCroogoJsonReader',
null,
array(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'Config' . DS)
array(Plugin::path('Croogo/Croogo') . 'tests' . DS . 'test_app' . DS . 'config' . DS)
);
$this->testFile = $this->CroogoJsonReader->getPath() . 'test.json';
}
@@ -46,7 +53,7 @@ public function tearDown() {
*/
public function testDefaultPath() {
$path = $this->CroogoJsonReader->getPath();
$this->assertEquals(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'Config' . DS, $path);
$this->assertEquals(Plugin::path('Croogo/Croogo') . 'tests' . DS . 'test_app' . DS . 'config' . DS, $path);
}

/**
23 ...roller/Component/BaseApiComponentTest.php → ...roller/Component/BaseApiComponentTest.php
View file
@@ -4,8 +4,8 @@

use Cake\Controller\Component;
use Cake\Controller\Controller;
use Croogo\Controller\Component\BaseApiComponent;
use Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\Controller\Component\BaseApiComponent;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class TestApiComponent extends BaseApiComponent {

protected $_apiVersion = 'v1.0';
@@ -19,7 +19,10 @@ class TestApiComponent extends BaseApiComponent {

class TestBaseApiController extends Controller {

public $components = array('TestApi');
public function initialize() {
$this->components()->set('TestApi', new TestApiComponent($this->components()));
}


public function index() {
}
@@ -32,7 +35,7 @@ public function view() {
class BaseApiComponentTest extends CroogoTestCase {

public $fixtures = array(
'plugin.settings.setting',
'plugin.croogo/settings.setting',
);

public function setUp() {
@@ -41,31 +44,39 @@ public function setUp() {
'api' => 'api', 'prefix' => 'v1.0',
'controller' => 'users', 'action' => 'index',
));
$response = $this->getMock('CakeRespone');
$response = $this->getMock('\\Cake\\Network\\Response');

$this->Controller = new TestBaseApiController($request, $response);
$this->Controller->constructClasses();
// $this->Controller->constructClasses();
$this->Controller->startupProcess();
$this->TestApi = $this->Controller->TestApi;
}

public function testControllerMethodInjection() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$expected = array(
'index', 'view', 'v1_0_index', 'v1_0_view', 'v1_0_delete',
);
$this->assertEquals($expected, $this->Controller->methods);
}

public function testVersion() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->assertEquals('v1.0', $this->TestApi->version());
}

public function testApiMethods() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$expected = array('index', 'view', 'delete');
$this->assertEquals($expected, $this->TestApi->apiMethods());
}

public function testIsValidAction() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->assertEquals(true, $this->TestApi->isValidAction('index'));
$this->assertEquals(false, $this->TestApi->isValidAction('bogus'));
}
8 ...er/Component/BulkProcessComponentTest.php → ...er/Component/BulkProcessComponentTest.php
View file
@@ -2,8 +2,9 @@

namespace Croogo\Croogo\Test\TestCase\Controller\Component;

use Croogo\Controller\Component\BulkProcessComponent;
use Croogo\TestSuite\CroogoTestCase;
use Cake\Controller\Controller;
use Cake\Network\Request;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class BulkProcessComponentTest extends CroogoTestCase {

public $setupSettings = false;
@@ -12,8 +13,7 @@ protected function _createController($data) {
$request = new Request();
$request->data = $data;
$controller = new Controller($request);
$controller->components = array('Croogo.BulkProcess');
$controller->constructClasses();
$controller->loadComponent('Croogo/Croogo.BulkProcess');
$controller->startupProcess();
return $controller;
}
54 ...troller/Component/CroogoComponentTest.php → ...troller/Component/CroogoComponentTest.php
View file
@@ -5,12 +5,16 @@
use App\Controller\AppController;
use Cake\Controller\Component;
use Cake\Controller\ComponentRegistry;
use Croogo\Controller\Component\CroogoComponent;
use Croogo\TestSuite\CroogoTestCase;
use Cake\Controller\Controller;
use Cake\Event\Event;
use Cake\Network\Request;
use Cake\Network\Response;
use Croogo\Croogo\Controller\Component\CroogoComponent;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class MockCroogoComponent extends CroogoComponent {

public function startup(Controller $controller) {
$this->_controller = $controller;
public function startup(Event $event) {
$this->_controller = $event->subject();
}

}
@@ -21,32 +25,36 @@ class CroogoTestController extends AppController {
class CroogoComponentTest extends CroogoTestCase {

public $fixtures = array(
'plugin.users.aco',
'plugin.users.aro',
'plugin.users.aros_aco',
'plugin.settings.setting',
'plugin.menus.menu',
'plugin.menus.link',
'plugin.users.role',
'plugin.taxonomy.type',
'plugin.taxonomy.vocabulary',
'plugin.taxonomy.types_vocabulary',
'plugin.nodes.node',
// 'plugin.croogo/users.aco',
// 'plugin.croogo/users.aro',
// 'plugin.croogo/users.aros_aco',
'plugin.croogo/settings.setting',
// 'plugin.croogo/menus.menu',
// 'plugin.croogo/menus.link',
// 'plugin.croogo/users.role',
// 'plugin.croogo/taxonomy.type',
// 'plugin.croogo/taxonomy.vocabulary',
// 'plugin.croogo/taxonomy.types_vocabulary',
'plugin.croogo/nodes.node',
);

public function setUp() {
parent::setUp();

$this->Controller = new CroogoTestController(new Request(), new Response());
$this->Controller->constructClasses();
$this->Controller->Croogo = new MockCroogoComponent($this->Controller->Components);
$this->Controller->Components->unload('Blocks');
$this->Controller->Components->unload('Menus');
$this->Controller->Components->set('Croogo', $this->Controller->Croogo);
// $this->Controller->constructClasses();
$this->Controller->Croogo = new MockCroogoComponent($this->Controller->components());
$this->Controller->components()->unload('Blocks');
$this->Controller->components()->unload('Menus');
$this->Controller->components()->set('Croogo', $this->Controller->Croogo);
$this->Controller->startupProcess();
}

public function testAddRemoveAcos() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$Aco = ClassRegistry::init('Aco');

$this->Controller->Croogo->addAco('CroogoTestController');
@@ -67,6 +75,8 @@ public function testAddRemoveAcos() {
}

public function testPluginIsActive() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$result = $this->Controller->Croogo->pluginIsActive('Example');
$this->assertTrue($result);
$result = $this->Controller->Croogo->pluginIsActive('example');
@@ -82,7 +92,9 @@ public function testPluginIsActive() {
* @dataProvider redirectData
*/
public function testRedirect($expected, $url, $data = array()) {
$Controller = $this->getMock('CroogoTestController', array('redirect'), array(new Request(), new Response()));
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$Controller = $this->getMock('Croogo\\Croogo\\Test\\TestCase\\Controller\\Component\\CroogoTestController', array('redirect'), array(new Request(), new Response()));
$Controller->request->data = $data;
$Controller->expects($this->once())
->method('redirect')
57 ...se/Controller/CroogoAppControllerTest.php → ...se/Controller/CroogoAppControllerTest.php
View file
@@ -2,10 +2,14 @@

namespace Croogo\Croogo\Test\TestCase\Controller;

use Cake\Utility\File;
use Croogo\Controller\CroogoAppController;
use Croogo\TestSuite\CroogoControllerTestCase;
use Croogo\TestSuite\CroogoTestFixture;
use Cake\Core\App;
use Cake\Core\Configure;
use Cake\Filesystem\File;
use Cake\Network\Request;
use Cake\Utility\Hash;
use Croogo\Croogo\Controller\CroogoAppController;
use Croogo\Croogo\Croogo;
use Croogo\Croogo\TestSuite\CroogoControllerTestCase;
class TestAppController extends CroogoAppController {

public function admin_edit() {
@@ -28,23 +32,24 @@ public function admin_index_no_actions() {
class CroogoAppControllerTest extends CroogoControllerTestCase {

public $fixtures = array(
'plugin.settings.setting',
'plugin.taxonomy.type',
'plugin.nodes.node',
'plugin.croogo/settings.setting',
// 'plugin.taxonomy.type',
'plugin.croogo/nodes.node',
);

public function setUp() {
parent::setUp();
$this->generate('TestApp', array(
'components' => array(
'Auth',
'Security',
'Acl.AclFilter',
'Blocks.Blocks',
'Menus.Menus',
'Taxonomy.Taxonomies',
)
));

// $this->generate('TestApp', array(
// 'components' => array(
// 'Auth',
// 'Security',
// 'Acl.AclFilter',
// 'Blocks.Blocks',
// 'Menus.Menus',
// 'Taxonomy.Taxonomies',
// )
// ));
}

public function tearDown() {
@@ -56,6 +61,8 @@ public function tearDown() {
* testRenderExistingView
*/
public function testRenderExistingView() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$result = $this->testAction('/admin/test_app/edit', array(
'return' => 'view',
));
@@ -66,6 +73,8 @@ public function testRenderExistingView() {
* testRenderAdminFormFallback
*/
public function testRenderAdminFormFallback() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$result = $this->testAction('/admin/test_app/add', array(
'return' => 'view',
));
@@ -76,6 +85,8 @@ public function testRenderAdminFormFallback() {
* testRenderOverridenAdminFormWithTheme
*/
public function testRenderOverridenAdminFormWithTheme() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$theme = 'Mytheme';
$this->controller->theme = $theme;
$filePath = App::themePath($theme) . 'TestApp'. DS . 'admin_edit.ctp';
@@ -97,6 +108,8 @@ public function testRenderOverridenAdminFormWithTheme() {
* testRenderNonEditView
*/
public function testRenderNonEditView() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$result = $this->testAction('/test_app/register', array(
'return' => 'view',
));
@@ -107,6 +120,8 @@ public function testRenderNonEditView() {
* testRenderDefaultActionsBlock
*/
public function testRenderDefaultActionsBlock() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->controller->viewVars = array(
'displayFields' => array(),
);
@@ -120,6 +135,8 @@ public function testRenderDefaultActionsBlock() {
* testRenderNoActionsBlock
*/
public function testRenderNoActionsBlock() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->controller->viewVars = array(
'displayFields' => array(),
);
@@ -133,6 +150,8 @@ public function testRenderNoActionsBlock() {
* testPaginatorIsNotLoadedWithoutCache
*/
public function testPaginatorIsNotLoadedWithoutCache() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->controller->viewVars = array(
'displayFields' => array(),
);
@@ -148,6 +167,8 @@ public function testPaginatorIsNotLoadedWithoutCache() {
* testPaginatorIsLoadedWithCache
*/
public function testPaginatorIsLoadedWithCache() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->controller->viewVars = array(
'displayFields' => array(),
);
@@ -163,6 +184,8 @@ public function testPaginatorIsLoadedWithCache() {
* Test Setup Component
*/
public function testSetupComponent() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$request = new Request('/api/v1.0/users');
$request->addParams(array(
'api' => 'api',
6 Croogo/Test/TestCase/CroogoJsonTest.php → Croogo/tests/TestCase/CroogoJsonTest.php
View file
@@ -1,12 +1,12 @@
<?php
namespace Croogo\Croogo\Test\TestCase;

use Croogo\Lib\CroogoJson;
use Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\CroogoJson;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class CroogoJsonTest extends CroogoTestCase {

public $fixtures = array(
'plugin.settings.setting',
'plugin.croogo/settings.setting',
);

/**
18 Croogo/Test/TestCase/CroogoNavTest.php → Croogo/tests/TestCase/CroogoNavTest.php
View file
@@ -1,8 +1,10 @@
<?php
namespace Croogo\Croogo\Test\TestCase;

use Croogo\Lib\CroogoNav;
use Croogo\TestSuite\CroogoTestCase;
use Cake\Utility\Hash;
use Croogo\Croogo\Croogo;
use Croogo\Croogo\CroogoNav;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class CroogoNavTest extends CroogoTestCase {

public $setupSettings = false;
@@ -22,35 +24,37 @@ public function tearDown() {
}

public function testNav() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$saved = CroogoNav::items();

// test clear
CroogoNav::clear();
$items = CroogoNav::items();
$this->assertEqual($items, array());
$this->assertEquals($items, array());

// test first level addition
$defaults = CroogoNav::getDefaults();
$extensions = array('title' => 'Extensions');
CroogoNav::add('extensions', $extensions);
$result = CroogoNav::items();
$expected = array('extensions' => Hash::merge($defaults, $extensions));
$this->assertEqual($result, $expected);
$this->assertEquals($result, $expected);

// tested nested insertion (1 level)
$plugins = array('title' => 'Plugins');
CroogoNav::add('extensions.children.plugins', $plugins);
$result = CroogoNav::items();
$expected['extensions']['children']['plugins'] = Hash::merge($defaults, $plugins);
$this->assertEqual($result, $expected);
$this->assertEquals($result, $expected);

// 2 levels deep
$example = array('title' => 'Example');
CroogoNav::add('extensions.children.plugins.children.example', $example);
$result = CroogoNav::items();

$expected['extensions']['children']['plugins']['children']['example'] = Hash::merge($defaults, $example);
$this->assertEqual($result, $expected);
$this->assertEquals($result, $expected);

CroogoNav::items('sidebar', $saved);
$this->assertEquals($saved, CroogoNav::items());
@@ -113,6 +117,8 @@ public function testNavMerge() {
}

public function testNavOverwrite() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

Croogo::dispatchEvent('Croogo.setupAdminData', null);
$defaults = CroogoNav::getDefaults();

45 Croogo/Test/TestCase/CroogoRouterTest.php → Croogo/tests/TestCase/CroogoRouterTest.php
View file
@@ -3,16 +3,17 @@
namespace Croogo\Croogo\Test\TestCase;

use Cake\Cache\Cache;
use Cake\Core\Configure;
use Cake\Routing\Router;
use Croogo\Lib\CroogoRouter;
use Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\CroogoRouter;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class CroogoRouterTest extends CroogoTestCase {

public $fixtures = array(
'plugin.settings.setting',
'plugin.taxonomy.vocabulary',
'plugin.taxonomy.type',
'plugin.taxonomy.types_vocabulary',
'plugin.croogo/settings.setting',
// 'plugin.taxonomy.vocabulary',
// 'plugin.taxonomy.type',
// 'plugin.taxonomy.types_vocabulary',
);

public function setUp() {
@@ -25,9 +26,11 @@ public function setUp() {
* testHomeRoute
*/
public function testHomeRoute() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$promoted = array(
'plugin' => 'nodes',
'controller' => 'nodes',
'plugin' => 'Croogo/nodes',
'controller' => 'Nodes',
'action' => 'promoted',
);
$result = CroogoRouter::connect('/', $promoted);
@@ -40,8 +43,8 @@ public function testHomeRoute() {

// another route
$index = array(
'plugin' => 'nodes',
'controller' => 'nodes',
'plugin' => 'Croogo/Nodes',
'controller' => 'Nodes',
'action' => 'index',
);
$result = CroogoRouter::connect('/nodes', $index);
@@ -50,26 +53,28 @@ public function testHomeRoute() {
$this->assertEquals($promoted, array_intersect_key($promoted, $reversed));

$terms = array(
'plugin' => 'nodes',
'controller' => 'nodes',
'plugin' => 'Croogo/Nodes',
'controller' => 'Nodes',
'action' => 'terms',
);
$result = CroogoRouter::connect('/', $terms);
$this->assertEquals(3, count($result));

// override '/' route
Router::promote();
// Router::promote();
$reversed = Router::parse('/');
$this->assertEquals($terms, array_intersect_key($terms, $reversed));
}

public function testContentType() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

Router::$initialized = true;

$params = array(
'url' => array(),
'plugin' => 'nodes',
'controller' => 'nodes',
'plugin' => 'Croogo/Nodes',
'controller' => 'Nodes',
'action' => 'index',
'type' => 'blog',
);
@@ -84,8 +89,8 @@ public function testContentType() {
CroogoRouter::contentType('page');
$params = array(
'url' => array(),
'plugin' => 'nodes',
'controller' => 'nodes',
'plugin' => 'Croogo/Nodes',
'controller' => 'Nodes',
'action' => 'index',
'type' => 'page',
);
@@ -96,6 +101,8 @@ public function testContentType() {
}

public function testRoutableContentTypes() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$Type = ClassRegistry::init('Taxonomy.Type');
$type = $Type->create(array(
'title' => 'Press Release',
@@ -131,6 +138,8 @@ public function testRoutableContentTypes() {
* testWhitelistedDetectorWithInvalidIp
*/
public function testWhitelistedDetectorWithInvalidIp() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$request = $this->getMock('Request', array('clientIp'));
$request->addDetector('whitelisted', array(
'callback' => array('CroogoRouter', 'isWhitelistedRequest'),
@@ -147,6 +156,8 @@ public function testWhitelistedDetectorWithInvalidIp() {
* testWhitelistedDetectorWithValidIp
*/
public function testWhitelistedDetectorWithValidIp() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$request = $this->getMock('Request', array('clientIp'));
$request->addDetector('whitelisted', array(
'callback' => array('CroogoRouter', 'isWhitelistedRequest'),
14 Croogo/Test/TestCase/CroogoStatusTest.php → Croogo/tests/TestCase/CroogoStatusTest.php
View file
@@ -2,9 +2,11 @@

namespace Croogo\Croogo\Test\TestCase;

use Croogo\Lib\CroogoStatus;
use Croogo\TestSuite\CroogoTestCase;
class CroogoStatusTest extends CroogoTestCase implements EventListener {
use Cake\Event\EventListenerInterface;
use Cake\Event\EventManager;
use Croogo\Croogo\CroogoStatus;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class CroogoStatusTest extends CroogoTestCase implements EventListenerInterface {

public function implementedEvents() {
return array(
@@ -91,8 +93,8 @@ public function modifyStatus($event) {
*/
public function testStatusModifiedByEventHandler() {
$callback = array($this, 'modifyStatus');
EventManager::instance()->detach($this);
EventManager::instance()->attach($callback, 'Croogo.Status.status');
EventManager::instance()->on($this);
EventManager::instance()->on('Croogo.Status.status', $callback);

// test status is modified for 'webmaster' type by event handler
$expected = array(CroogoStatus::PUBLISHED, CroogoStatus::PREVIEW);
@@ -105,7 +107,7 @@ public function testStatusModifiedByEventHandler() {
$result = $this->CroogoStatus->status('publishing', 'bogus');
$this->assertEquals($expected, $result);

EventManager::instance()->detach($callback, 'Croogo.Status.status');
EventManager::instance()->on('Croogo.Status.status', $callback);
}

/**
9 Croogo/Test/TestCase/CroogoTest.php → Croogo/tests/TestCase/CroogoTest.php
View file
@@ -2,14 +2,19 @@

namespace Croogo\Croogo\Test\TestCase;

use Croogo\TestSuite\CroogoTestCase;
use Cake\Core\Configure;
use Cake\Core\Plugin;
use Croogo\Croogo\Croogo;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class CroogoTest extends CroogoTestCase {

public $fixtures = array(
'plugin.settings.setting',
'plugin.croogo/settings.setting',
);

public function testCrossPluginHooks() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

Plugin::load(array('Shops', 'Suppliers'), array(
'bootstrap' => true,
));
32 ...TestCase/Event/CroogoEventManagerTest.php → ...TestCase/Event/CroogoEventManagerTest.php
View file
@@ -1,10 +1,17 @@
<?php
namespace Croogo\Croogo\Test\TestCase\Event;

use Cake\Cache\Cache;
use Cake\Core\Configure;
use Cake\Core\Plugin;
use Cake\View\View;
use Croogo\TestSuite\CroogoTestCase;
use Nodes\Controller\NodesController;
use Users\Controller\UsersController;
use Croogo\Croogo\Croogo;
use Croogo\Croogo\Event\CroogoEventManager;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use Croogo\Extensions\CroogoPlugin;

use Croogo\Nodes\Controller\NodesController;
use Croogo\Users\Controller\UsersController;
class TestUsersEventController extends UsersController {
}

@@ -14,16 +21,17 @@ class TestNodesEventController extends NodesController {
class CroogoEventManagerTest extends CroogoTestCase {

public $fixtures = array(
'plugin.settings.setting',
'plugin.croogo/settings.setting',
);

public function setUp() {
parent::setUp();

CroogoPlugin::unload('Example');
CroogoPlugin::load('Shops');
CroogoPlugin::load('Shops', ['autoload' => true]);
CroogoEventManager::loadListeners();
$request = $this->getMock('Request');
$response = $this->getMock('Response');
$request = $this->getMock('\\Cake\\Network\\Request');
$response = $this->getMock('\\Cake\\Network\\Response');
$this->Users = new TestUsersEventController($request, $response);
$this->Nodes = new TestNodesEventController($request, $response);
}
@@ -80,7 +88,7 @@ public function testAliasingEventListener() {

$listeners = $eventManager->listeners('Controller.Nodes.afterAdd');
foreach ($listeners as $listener) {
$this->assertInstanceOf('ShopsNodesEventHandler', $listener['callable'][0]);
$this->assertInstanceOf('\\Shops\\Event\\ShopsNodesEventHandler', $listener['callable'][0]);
}
}

@@ -103,7 +111,7 @@ public function testDispatchUsersEvents() {
'Controller.Users.registrationFailure',
'Controller.Users.registrationSuccessful',
);
$Auth = $this->getMock('AuthComponent', array(), array($this->Users->Components));
$Auth = $this->getMock('\\Cake\\Controller\\Component\\AuthComponent', array(), array($this->Users->components()));
$Auth->authenticate = array(
'all' => array(
'userModel' => 'User',
@@ -114,7 +122,7 @@ public function testDispatchUsersEvents() {
foreach ($eventNames as $name) {
$event = Croogo::dispatchEvent($name, $this->Users);
$this->assertTrue($event->result, sprintf('Event: %s', $name));
$this->assertInstanceOf('UsersController', $event->subject());
$this->assertInstanceOf('\\Croogo\\Croogo\\Test\\TestCase\\Event\\TestUsersEventController', $event->subject());
}
}

@@ -134,7 +142,7 @@ public function testDispatchNodesEvents() {
foreach ($eventNames as $name) {
$event = Croogo::dispatchEvent($name, $this->Nodes);
$this->assertTrue($event->result, sprintf('Event: %s', $name));
$this->assertInstanceOf('NodesController', $event->subject());
$this->assertInstanceOf('\\Croogo\\Croogo\\Test\\TestCase\\Event\\TestNodesEventController', $event->subject());
}
}

@@ -150,7 +158,7 @@ public function testDispatchHelperEvents() {
foreach ($eventNames as $name) {
$event = Croogo::dispatchEvent($name, $View);
$this->assertTrue($event->result, sprintf('Event: %s', $name));
$this->assertInstanceOf('View', $event->subject());
$this->assertInstanceOf('\\Cake\\View\\View', $event->subject());
}
}

21 ...ase/Model/Behavior/CachedBehaviorTest.php → ...ase/Model/Behavior/CachedBehaviorTest.php
View file
@@ -1,14 +1,15 @@
<?php
namespace Croogo\Croogo\Test\TestCase\Model\Behavior;

use Croogo\TestSuite\CroogoTestCase;
use Users\Model\User;
use Cake\Cache\Cache;
use Cake\Core\Configure;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class CachedBehaviorTest extends CroogoTestCase {

public $fixtures = array(
'plugin.users.role',
'plugin.users.user',
'plugin.settings.setting',
'plugin.croogo/users.role',
'plugin.croogo/users.user',
'plugin.croogo/settings.setting',
);

/**
@@ -18,9 +19,9 @@ class CachedBehaviorTest extends CroogoTestCase {
*/
public function setUp() {
parent::setUp();
$this->User = ClassRegistry::init('Users.User');
$this->User->Behaviors->unload('Acl');
$this->User->Behaviors->unload('Searchable');
// $this->User = ClassRegistry::init('Users.User');
// $this->User->Behaviors->unload('Acl');
// $this->User->Behaviors->unload('Searchable');
$this->defaultPrefix = Configure::read('Cache.defaultPrefix');
}

@@ -32,13 +33,15 @@ public function setUp() {
public function tearDown() {
parent::tearDown();
unset($this->User);
ClassRegistry::flush();
// ClassRegistry::flush();
}

/**
* testClearCache
*/
public function testClearCache() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$cacheName = 'users';
$prefixed = $cacheName . '_' . Configure::read('Config.language');
Cache::delete($cacheName . '_eng', 'users_login');
69 Croogo/tests/TestCase/Model/Behavior/EncoderBehaviorTest.php
View file
@@ -0,0 +1,69 @@
<?php
namespace Croogo\Croogo\Test\TestCase\Model\Behavior;

use Cake\ORM\TableRegistry;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use Croogo\Nodes\Model\Table\NodesTable;
class EncoderBehaviorTest extends CroogoTestCase {

/**
* @var NodesTable
*/
private $nodesTable;

/**
* setUp
*
* @return void
*/
public function setUp() {
parent::setUp();

$this->nodesTable = TableRegistry::get('Croogo/Nodes.Nodes');
}

/**
* tearDown
*
* @return void
*/
public function tearDown() {
parent::tearDown();

unset($this->nodesTable);
}

public function testEncodeWithoutKeys() {
$array = array('hello', 'world');
$encoded = $this->nodesTable->encodeData($array);
$this->assertEquals('["hello","world"]', $encoded);
}

public function testEncodeWithKeys() {
$array = array(
'first' => 'hello',
'second' => 'world',
);
$encoded = $this->nodesTable->encodeData($array, array(
'json' => true,
'trim' => false,
));
$this->assertEquals('{"first":"hello","second":"world"}', $encoded);
}

public function testDecodeWithoutKeys() {
$encoded = '["hello","world"]';
$array = $this->nodesTable->decodeData($encoded);
$this->assertEquals(array('hello', 'world'), $array);
}

public function testDecodeWithKeys() {
$encoded = '{"first":"hello","second":"world"}';
$array = $this->nodesTable->decodeData($encoded);
$this->assertEquals(array(
'first' => 'hello',
'second' => 'world',
), $array);
}

}
27 ...se/Model/Behavior/OrderedBehaviorTest.php → ...se/Model/Behavior/OrderedBehaviorTest.php
View file
@@ -2,18 +2,19 @@

namespace Croogo\Croogo\Test\TestCase\Model\Behavior;

use Blocks\Model\Block;
use Croogo\Model\Behavior\OrderedBehavior;
use Croogo\TestSuite\CroogoTestCase;
use Cake\Core\Configure;
use Croogo\Croogo\Test\Fixture\OrderRecordFixture;
use Croogo\Croogo\TestSuite\CroogoTestCase;

class OrderedBehaviorTest extends CroogoTestCase {

/**
* Fixtures
*/
public $fixtures = array(
'plugin.croogo.order_record',
'plugin.blocks.block',
'plugin.blocks.region',
'plugin.croogo/croogo.order_record',
// 'plugin.blocks.block',
// 'plugin.blocks.region',
);

/**
@@ -23,10 +24,10 @@ class OrderedBehaviorTest extends CroogoTestCase {
*/
public function setUp() {
parent::setUp();
$this->OrderRecord = ClassRegistry::init('OrderRecord');
$this->OrderRecord->Behaviors->attach('Ordered', array('field' => 'weight', 'foreign_key' => null));
// $this->OrderRecord = ClassRegistry::init('OrderRecord');
// $this->OrderRecord->Behaviors->attach('Ordered', array('field' => 'weight', 'foreign_key' => null));
$this->defaultPrefix = Configure::read('Cache.defaultPrefix');
$this->Block = ClassRegistry::init('Blocks.Block');
// $this->Block = ClassRegistry::init('Blocks.Block');
}

/**
@@ -37,10 +38,12 @@ public function setUp() {
public function tearDown() {
parent::tearDown();
unset($this->OrderRecord);
ClassRegistry::flush();
// ClassRegistry::flush();
}

public function testNewRecordAddedShouldHaveAWeightSet() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$data = array(
'id' => '',
'title' => 'Some title',
@@ -57,6 +60,8 @@ public function testNewRecordAddedShouldHaveAWeightSet() {
* testWeightMustBeSet
*/
public function testWeightMustBeSet() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$result = $this->Block->save(array(
'Block' => array(
'id' => '',
@@ -72,6 +77,8 @@ public function testWeightMustBeSet() {
* testInsertOnEmptyTable
*/
public function testInsertOnEmptyTable() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->Block->deleteAll('1 = 1');
$count = $this->Block->find('count');
$this->assertEquals(0, $count);
60 ...ase/Model/Behavior/ParamsBehaviorTest.php → ...ase/Model/Behavior/ParamsBehaviorTest.php
View file
@@ -1,34 +1,34 @@
<?php
namespace Croogo\Croogo\Test\TestCase\Model\Behavior;

use Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use Taxonomy\Model\Type;
class ParamsBehaviorTest extends CroogoTestCase {

public $fixtures = array(
'plugin.users.aco',
'plugin.users.aro',
'plugin.users.aros_aco',
'plugin.blocks.block',
'plugin.comments.comment',
'plugin.contacts.contact',
'plugin.translate.i18n',
'plugin.settings.language',
'plugin.menus.link',
'plugin.menus.menu',
'plugin.contacts.message',
'plugin.meta.meta',
'plugin.nodes.node',
'plugin.taxonomy.model_taxonomy',
'plugin.blocks.region',
'plugin.users.role',
'plugin.settings.setting',
'plugin.taxonomy.taxonomy',
'plugin.taxonomy.term',
'plugin.taxonomy.type',
'plugin.taxonomy.types_vocabulary',
'plugin.users.user',
'plugin.taxonomy.vocabulary',
'plugin.croogo\users.aco',
'plugin.croogo\users.aro',
'plugin.croogo\users.aros_aco',
// 'plugin.blocks.block',
// 'plugin.comments.comment',
// 'plugin.contacts.contact',
// 'plugin.translate.i18n',
'plugin.croogo\settings.language',
// 'plugin.menus.link',
// 'plugin.menus.menu',
// 'plugin.contacts.message',
// 'plugin.meta.meta',
'plugin.croogo\nodes.node',
// 'plugin.taxonomy.model_taxonomy',
// 'plugin.blocks.region',
'plugin.croogo\users.role',
'plugin.croogo\settings.setting',
// 'plugin.taxonomy.taxonomy',
// 'plugin.taxonomy.term',
// 'plugin.taxonomy.type',
// 'plugin.taxonomy.types_vocabulary',
'plugin.croogo\users.user',
// 'plugin.taxonomy.vocabulary',
);

public $Type = null;
@@ -40,7 +40,7 @@ class ParamsBehaviorTest extends CroogoTestCase {
*/
public function setUp() {
parent::setUp();
$this->Type = ClassRegistry::init('Taxonomy.Type');
// $this->Type = ClassRegistry::init('Taxonomy.Type');
}

/**
@@ -51,10 +51,12 @@ public function setUp() {
public function tearDown() {
parent::tearDown();
unset($this->Type);
ClassRegistry::flush();
// ClassRegistry::flush();
}

public function testSingle() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->Type->save(array(
'title' => 'Article',
'alias' => 'article',
@@ -69,6 +71,8 @@ public function testSingle() {
}

public function testMultiple() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->Type->save(array(
'title' => 'Article',
'alias' => 'article',
@@ -84,6 +88,8 @@ public function testMultiple() {
}

public function testMixedLineEndings() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->Type->save(array(
'title' => 'Article',
'alias' => 'article',
@@ -101,6 +107,8 @@ public function testMixedLineEndings() {
}

public function testEmbeddedOptions() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->Type->save(array(
'title' => 'Article',
'alias' => 'article',
24 ...odel/Behavior/PublishableBehaviorTest.php → ...odel/Behavior/PublishableBehaviorTest.php
View file
@@ -2,12 +2,12 @@

namespace Croogo\Croogo\Test\TestCase\Model\Behavior;

use Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class PublishableBehaviorTest extends CroogoTestCase {

public $fixtures = array(
'plugin.settings.setting',
'plugin.croogo.order_record',
'plugin.croogo\settings.setting',
'plugin.croogo\croogo.order_record',
);

/**
@@ -17,13 +17,13 @@ class PublishableBehaviorTest extends CroogoTestCase {
*/
public function setUp() {
parent::setUp();
$this->OrderRecord = ClassRegistry::init('OrderRecord');
$this->OrderRecord->Behaviors->load('Croogo.Publishable', array(
'fields' => array(
'publish_start' => 'start',
'publish_end' => 'end',
),
));
// $this->OrderRecord = ClassRegistry::init('OrderRecord');
// $this->OrderRecord->Behaviors->load('Croogo.Publishable', array(
// 'fields' => array(
// 'publish_start' => 'start',
// 'publish_end' => 'end',
// ),
// ));
}

/**
@@ -34,13 +34,15 @@ public function setUp() {
public function tearDown() {
parent::tearDown();
unset($this->OrderRecord);
ClassRegistry::flush();
// ClassRegistry::flush();
}

/**
* testPeriodFilter
*/
public function testPeriodFilter() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$results = $this->OrderRecord->find('all', array(
'date' => '2014-01-31 06:59:59',
));
63 .../Model/Behavior/TrackableBehaviorTest.php → .../Model/Behavior/TrackableBehaviorTest.php
View file
@@ -2,58 +2,63 @@

namespace Croogo\Croogo\Test\TestCase\Model\Behavior;

use Croogo\TestSuite\CroogoTestCase;
use Users\Model\User;
class TrackableUserModel extends User {

public $useTable = 'users';

public $order = 'TrackableUserModel.name';

public $actsAs = array(
'Croogo.Trackable' => array(
'userModel' => 'TrackableUserModel',
),
);
}
use Cake\Core\Configure;
use Cake\Network\Session;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use Croogo\Users\Model\User;

//class TrackableUserModel extends User {
//
// public $useTable = 'users';
//
// public $order = 'TrackableUserModel.name';
//
// public $actsAs = array(
// 'Croogo.Trackable' => array(
// 'userModel' => 'TrackableUserModel',
// ),
// );
//}

class TrackableBehaviorTest extends CroogoTestCase {

public $fixtures = array(
'plugin.croogo.trackable',
'plugin.users.user',
'plugin.users.role',
'plugin.settings.setting',
'plugin.croogo/croogo.trackable',
'plugin.croogo/users.user',
'plugin.croogo/users.role',
'plugin.croogo/settings.setting',
);

public function setUp() {
parent::setUp();
$this->loadFixtures('Trackable');
$this->model = ClassRegistry::init(array(
'class' => 'TestModel',
'alias' => 'TestModel',
'table' => 'trackables',
));
$this->model->Behaviors->attach('Croogo.Trackable');
// $this->model = ClassRegistry::init(array(
// 'class' => 'TestModel',
// 'alias' => 'TestModel',
// 'table' => 'trackables',
// ));
// $this->model->Behaviors->attach('Croogo.Trackable');
}

public function tearDown() {
Configure::delete('Trackable.Auth');
Session::delete('Auth.User');
// Session::delete('Auth.User');
}

protected function _authTrackable($userIdField = 'id', $userId = 1) {
Configure::write('Trackable.Auth.User', array($userIdField => $userId));
}

protected function _authSession($userIdField = 'id', $userId = 1) {
Session::write('Auth.User', array($userIdField => $userId));
// Session::write('Auth.User', array($userIdField => $userId));
}

/**
* testFieldPopulation
*/
protected function _testFieldPopulation($authCallback) {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->{$authCallback}();

$this->model->create(array('id' => 1, 'title' => 'foobar'));
@@ -99,6 +104,8 @@ public function testUserDataFromTrackable() {
* Test auth data override
*/
public function testAuthDataOverride() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->_authTrackable('id', '3');
$this->_authSession('id', '1');

@@ -115,6 +122,8 @@ public function testAuthDataOverride() {
* Test with uncommon/inherited User model
*/
public function testUncommonInheritedUserModel() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$User = ClassRegistry::init('TrackableUserModel');
$User->Behaviors->detach('UserAro');
$User->Behaviors->detach('Acl');
@@ -140,6 +149,8 @@ public function testUncommonInheritedUserModel() {
* Test Trackable saveField
*/
public function testTrackableSaveField() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$User = ClassRegistry::init('TrackableUserModel');
$User->Behaviors->detach('UserAro');
$User->Behaviors->detach('Acl');
83 Croogo/tests/TestCase/Model/Behavior/UrlBehaviorTest.php
View file
@@ -0,0 +1,83 @@
<?php
namespace Croogo\Croogo\Test\TestCase\Model\Behavior;

use Croogo\Croogo\TestSuite\CroogoTestCase;
use Nodes\Model\Node;
class UrlBehaviorTest extends CroogoTestCase {

public $fixtures = array(
'plugin.croogo\users.aco',
'plugin.croogo\users.aro',
'plugin.croogo\users.aros_aco',
// 'plugin.blocks.block',
// 'plugin.comments.comment',
// 'plugin.contacts.contact',
// 'plugin.translate.i18n',
'plugin.croogo\settings.language',
// 'plugin.menus.link',
// 'plugin.menus.menu',
// 'plugin.contacts.message',
// 'plugin.croogo\nodes.node',
// 'plugin.meta.meta',
// 'plugin.taxonomy.model_taxonomy',
// 'plugin.blocks.region',
'plugin.croogo\users.role',
'plugin.croogo\settings.setting',
// 'plugin.taxonomy.taxonomy',
// 'plugin.taxonomy.term',
// 'plugin.taxonomy.type',
// 'plugin.taxonomy.types_vocabulary',
'plugin.croogo\users.user',
// 'plugin.taxonomy.vocabulary',
);

public $Node = null;

/**
* setUp
*
* @return void
*/
public function setUp() {
parent::setUp();
// $this->Node = ClassRegistry::init('Nodes.Node');
}

/**
* tearDown
*
* @return void
*/
public function tearDown() {
parent::tearDown();
unset($this->Node);
// ClassRegistry::flush();
}

public function testSingle() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$helloWorld = $this->Node->findBySlug('hello-world');
$this->assertEqual($helloWorld['Node']['url'], array(
'plugin' => 'nodes',
'controller' => 'nodes',
'action' => 'view',
'type' => 'blog',
'slug' => 'hello-world',
));
}

public function testMultiple() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$result = $this->Node->find('all');
$this->assertEqual($result['0']['Node']['url'], array(
'plugin' => 'nodes',
'controller' => 'nodes',
'action' => 'view',
'type' => $result['0']['Node']['type'],
'slug' => $result['0']['Node']['slug'],
));
}

}
35 ...est/TestCase/Model/CroogoAppModelTest.php → ...sts/TestCase/Model/CroogoAppModelTest.php
View file
@@ -4,8 +4,11 @@
use App\Controller\Component\AuthComponent;
use App\Model\Model;
use App\Model\User;
use Cake\ORM\TableRegistry;
use Croogo\Model\CroogoAppModel;
use Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use Croogo\Users\Model\Table\UsersTable;

/**
* CroogoAppModelTest file
*
@@ -26,12 +29,12 @@ class CroogoAppModelTest extends CroogoTestCase {
* @var array
*/
public $fixtures = array(
'plugin.users.aco',
'plugin.users.aro',
'plugin.users.aros_aco',
'plugin.users.role',
'plugin.users.user',
'plugin.settings.setting',
'plugin.croogo\users.aco',
'plugin.croogo\users.aro',
'plugin.croogo\users.aros_aco',
'plugin.croogo\users.role',
'plugin.croogo\users.user',
'plugin.croogo\settings.setting',
);

/**
@@ -41,14 +44,20 @@ class CroogoAppModelTest extends CroogoTestCase {
*/
public $User;

/**
* @var UsersTable
*/
public $usersTable;

/**
* setUp method
*
* @return void
*/
public function setUp() {
parent::setUp();
$this->User = ClassRegistry::init('Users.User');
// $this->User = ClassRegistry::init('Users.User');
$this->usersTable = TableRegistry::get('Croogo/Users.Users');
}

/**
@@ -65,16 +74,16 @@ public function tearDown() {
* testValidName
*/
public function testValidName() {
$this->assertTrue($this->User->validName(array('name' => 'Kyle')));
$this->assertFalse($this->User->validName(array('name' => 'what%is@this#i*dont!even')));
$this->assertTrue($this->usersTable->validName(array('name' => 'Kyle')));
$this->assertFalse($this->usersTable->validName(array('name' => 'what%is@this#i*dont!even')));
}

/**
* testValidAlias
*/
public function testValidAlias() {
$this->assertTrue($this->User->validAlias(array('name' => 'Kyle')));
$this->assertFalse($this->User->validAlias(array('name' => 'Not an Alias')));
$this->assertTrue($this->usersTable->validAlias(array('name' => 'Kyle')));
$this->assertFalse($this->usersTable->validAlias(array('name' => 'Not an Alias')));
}

}
}
11 ...t/TestCase/Routing/Route/ApiRouteTest.php → ...s/TestCase/Routing/Route/ApiRouteTest.php
View file
@@ -2,15 +2,18 @@

namespace Croogo\Croogo\Test\TestCase\Routing\Route;

use Croogo\Routing\Route\ApiRoute;
use Croogo\TestSuite\CroogoTestCase;
use Cake\Core\Configure;
use Croogo\Croogo\Routing\Route\ApiRoute;
use Croogo\Croogo\TestSuite\CroogoTestCase;
class ApiRouteTest extends CroogoTestCase {

public $fixtures = array(
'plugin.settings.setting',
'plugin.croogo\settings.setting',
);

public function testParse() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$apiPath = Configure::read('Croogo.Api.path');
$url = '/' . $apiPath . '/v1.0/users/';

@@ -54,6 +57,8 @@ public function testParse() {
}

public function testMatch() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$apiPath = Configure::read('Croogo.Api.path');
$url = '/' . $apiPath . '/v1.0/users/';

62 ...TestCase/Console/Command/ExtShellTest.php → Croogo/tests/TestCase/Shell/ExtShellTest.php
View file
@@ -1,13 +1,12 @@
<?php

namespace Croogo\Croogo\Test\TestCase\Console\Command;
namespace Croogo\Croogo\Test\TestCase\Shell;

use App\Console\Command\AppShell;
use Cake\Console\Shell;
use Cake\Console\ShellDispatcher;
use Cake\Utility\Folder;
use Croogo\Console\Command\ExtShell;
use Croogo\TestSuite\CroogoTestCase;
use Cake\Core\Plugin;
use Cake\Filesystem\Folder;
use Croogo\Croogo\TestSuite\CroogoTestCase;
/**
* Ext Shell Test
*
@@ -26,25 +25,25 @@ class ExtShellTest extends CroogoTestCase {
* @var array
*/
public $fixtures = array(
'plugin.comments.comment',
'plugin.menus.menu',
'plugin.blocks.block',
'plugin.menus.link',
'plugin.meta.meta',
'plugin.nodes.node',
'plugin.taxonomy.model_taxonomy',
'plugin.blocks.region',
'plugin.users.role',
'plugin.settings.setting',
'plugin.taxonomy.taxonomy',
'plugin.taxonomy.term',
'plugin.taxonomy.type',
'plugin.taxonomy.types_vocabulary',
'plugin.users.user',
'plugin.taxonomy.vocabulary',
'plugin.users.aro',
'plugin.users.aco',
'plugin.users.aros_aco',
// 'plugin.comments.comment',
// 'plugin.menus.menu',
// 'plugin.blocks.block',
// 'plugin.menus.link',
// 'plugin.meta.meta',
'plugin.croogo\nodes.node',
// 'plugin.taxonomy.model_taxonomy',
// 'plugin.blocks.region',
'plugin.croogo\users.role',
'plugin.croogo/settings.setting',
// 'plugin.taxonomy.taxonomy',
// 'plugin.taxonomy.term',
// 'plugin.taxonomy.type',
// 'plugin.taxonomy.types_vocabulary',
'plugin.croogo\users.user',
// 'plugin.taxonomy.vocabulary',
'plugin.croogo\users.aro',
'plugin.croogo\users.aco',
'plugin.croogo\users.aros_aco',
);

/**
@@ -55,8 +54,8 @@ class ExtShellTest extends CroogoTestCase {
public function setUp() {
parent::setUp();
$Folder = new Folder(APP . 'Plugin' . DS . 'Example');
$Folder->copy(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'Example');
$this->Setting = ClassRegistry::init('Settings.Setting');
$Folder->copy(Plugin::path('Croogo/Croogo') . 'tests' . DS . 'test_app' . DS . 'Plugin' . DS . 'Example');
// $this->Setting = ClassRegistry::init('Settings.Setting');
}

/**
@@ -66,7 +65,7 @@ public function setUp() {
*/
public function tearDown() {
parent::tearDown();
$Folder = new Folder(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'Example');
$Folder = new Folder(Plugin::path('Croogo/Croogo') . 'tests' . DS . 'test_app' . DS . 'Plugin' . DS . 'Example');
$Folder->delete();
}

@@ -76,6 +75,8 @@ public function tearDown() {
* @return void
*/
public function testPlugin() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$Link = ClassRegistry::init('Menus.Link');
$Shell = $this->getMock('ExtShell', array('out', 'err'));

@@ -105,6 +106,8 @@ public function testPlugin() {
* testForceActivation
*/
public function testForceActivation() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$Shell = $this->getMock('ExtShell', array('out', 'err'));

$Shell->args = array('activate', 'plugin', 'TestPlugin');
@@ -123,6 +126,8 @@ public function testForceActivation() {
* testForceDeactivation
*/
public function testForceDeactivation() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$Shell = $this->getMock('ExtShell', array('out', 'err'));

$result = $this->Setting->findByKey('Hook.bootstraps');
@@ -143,6 +148,8 @@ public function testForceDeactivation() {
* @return void
*/
public function testTheme() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$Shell = $this->getMock('ExtShell', array('out', 'err'));
$Shell->args = array('activate', 'theme', 'Mytheme');
$Shell->main();
@@ -173,4 +180,5 @@ public function testTheme() {
$result = $this->Setting->findByKey('Site.theme');
$this->assertEquals('', $result['Setting']['value']);
}

}
40 ...Case/Console/Command/InstallShellTest.php → ...tests/TestCase/Shell/InstallShellTest.php
View file
@@ -1,13 +1,15 @@
<?php

namespace Croogo\Croogo\Test\TestCase\Console\Command;
namespace Croogo\Croogo\Test\TestCase\Shell;

use App\Console\Command\AppShell;
use Cake\Console\Shell;
use Cake\Console\ShellDispatcher;
use Cake\Utility\Folder;
use Croogo\Console\Command\InstallShell;
use Croogo\TestSuite\CroogoTestCase;
use Cake\Core\Plugin;
use Cake\Filesystem\Folder;
use Croogo\Croogo\Shell\InstallShell;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use ReflectionClass;

/**
* TestInstallShell class
*/
@@ -49,7 +51,7 @@ class InstallShellTest extends CroogoTestCase {
* @var array
*/
public $fixtures = array(
'plugin.settings.setting',
'plugin.croogo\settings.setting',
);

/**
@@ -59,10 +61,10 @@ class InstallShellTest extends CroogoTestCase {
*/
public function setUp() {
parent::setUp();
App::build(array(
'Plugin' => array(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'View' . DS),
), App::PREPEND);
// App::build(array(
// 'Plugin' => array(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
// 'View' => array(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'View' . DS),
// ), App::PREPEND);
}

/**
@@ -77,9 +79,9 @@ public function tearDown() {
foreach ($files as $file) {
unlink(TMP . $file);
}
$Folder = new Folder(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'Example');
$Folder = new Folder(Plugin::path('Croogo/Croogo') . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'Example');
$Folder->delete();
$Folder = new Folder(Plugin::path('Croogo') . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'Minimal');
$Folder = new Folder(Plugin::path('Croogo/Croogo') . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'Minimal');
$Folder->delete();
}

@@ -89,7 +91,7 @@ public function tearDown() {
* @return void
*/
public function testInstallPlugin() {
$Shell = $this->getMock('InstallShell', array('out', 'err', '_shellExec', 'dispatchShell'));
$Shell = $this->getMock('\\Croogo\\Croogo\\Shell\\InstallShell', array('out', 'err', '_shellExec', 'dispatchShell'));
$Shell->expects($this->once())
->method('_shellExec')
->will($this->returnCallback(array($this, 'callbackDownloadPlugin')));
@@ -112,7 +114,7 @@ public function testInstallPlugin() {
* @return void
*/
public function testInstallTheme() {
$Shell = $this->getMock('InstallShell', array('out', 'err', '_shellExec', 'dispatchShell'));
$Shell = $this->getMock('\\Croogo\\Croogo\\Shell\\InstallShell', array('out', 'err', '_shellExec', 'dispatchShell'));
$Shell->expects($this->once())
->method('_shellExec')
->will($this->returnCallback(array($this, 'callbackDownloadTheme')));
@@ -153,10 +155,10 @@ public function testGithubUrl() {
public function testComposerInstall() {
$this->skipIf(version_compare(PHP_VERSION, '5.3.0', '<'), 'PHP >= 5.3.0 required to run this test.');

$Shell = new ReflectionClass('InstallShell');
$Shell = new ReflectionClass('\\Croogo\\Croogo\\Shell\\InstallShell');
$prop = $Shell->getProperty('_ExtensionsInstaller');
$prop->setAccessible(true);
$ShellMock = $this->getMock('InstallShell', array('dispatchShell', 'out', 'err'));
$ShellMock = $this->getMock('\\Croogo\\Croogo\\Shell\\InstallShell', array('dispatchShell', 'out', 'err'));

$ExtensionsInstaller = $this->getMock('ExtensionsInstaller', array('composerInstall'));
$prop->setValue($ShellMock, $ExtensionsInstaller);
@@ -174,7 +176,7 @@ public function testComposerInstall() {

$prop = $Shell->getProperty('_CroogoPlugin');
$prop->setAccessible(true);
$CroogoPlugin = $this->getMock('CroogoPlugin');
$CroogoPlugin = $this->getMock('\\Croogo\Extensions\\CroogoPlugin');
$prop->setValue($ShellMock, $CroogoPlugin);

$CroogoPlugin->expects($this->once())
@@ -203,7 +205,7 @@ public function callbackDownloadPlugin() {
$argOne = func_get_arg(0);
preg_match('/ -o (.+) /', $argOne, $zip);
$dest = $zip[1];
$src = Plugin::path('Extensions') . 'Test' . DS . 'test_files' . DS . 'example_plugin.zip';
$src = Plugin::path('Croogo/Extensions') . 'tests' . DS . 'test_files' . DS . 'example_plugin.zip';
copy($src, $dest);
return 'Here is that thing you wanted';
}
@@ -215,7 +217,7 @@ public function callbackDownloadTheme() {
$argOne = func_get_arg(0);
preg_match('/ -o (.+) /', $argOne, $zip);
$dest = $zip[1];
$src = Plugin::path('Extensions') . 'Test' . DS . 'test_files' . DS . 'example_theme.zip';
$src = Plugin::path('Croogo/Extensions') . 'tests' . DS . 'test_files' . DS . 'example_theme.zip';
copy($src, $dest);
return 'Here is that thing you wanted';
}
58 .../TestCase/Utility/StringConverterTest.php → .../TestCase/Utility/StringConverterTest.php
View file
@@ -2,12 +2,18 @@

namespace Croogo\Croogo\Test\TestCase\Utility;

use Croogo\TestSuite\CroogoTestCase;
use Croogo\Utility\StringConverter;
use Cake\Core\Configure;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\Utility\StringConverter;
class StringConverterTest extends CroogoTestCase {

public $setupSettings = false;

/**
* @var StringConverter
*/
private $Converter;

public function setUp() {
parent::setUp();
$this->Converter = new StringConverter();
@@ -17,15 +23,15 @@ public function setUp() {
* testLinkStringToArray
*/
public function testLinkStringToArray() {
$this->assertEqual($this->Converter->linkStringToArray('controller:nodes/action:index'), array_merge(
$this->assertEquals(array_merge(
array_fill_keys((array)Configure::read('Routing.prefixes'), false),
array(
'plugin' => null,
'controller' => 'nodes',
'action' => 'index',
)
));
$this->assertEqual($this->Converter->linkStringToArray('controller:nodes/action:index/pass/pass2'), array_merge(
), $this->Converter->linkStringToArray('controller:nodes/action:index'));
$this->assertEquals(array_merge(
array_fill_keys((array)Configure::read('Routing.prefixes'), false),
array(
'plugin' => null,
@@ -34,25 +40,25 @@ public function testLinkStringToArray() {
'pass',
'pass2',
)
));
$this->assertEqual($this->Converter->linkStringToArray('controller:nodes/action:index/param:value'), array_merge(
), $this->Converter->linkStringToArray('controller:nodes/action:index/pass/pass2'));
$this->assertEquals(array_merge(
array_fill_keys((array)Configure::read('Routing.prefixes'), false),
array(
'plugin' => null,
'controller' => 'nodes',
'action' => 'index',
'param' => 'value',
)
));
$this->assertEqual($this->Converter->linkStringToArray('controller:nodes/action:index/with-slash/'), array_merge(
), $this->Converter->linkStringToArray('controller:nodes/action:index/param:value'));
$this->assertEquals(array_merge(
array_fill_keys((array)Configure::read('Routing.prefixes'), false),
array(
'plugin' => null,
'controller' => 'nodes',
'action' => 'index',
'with-slash',
)
));
), $this->Converter->linkStringToArray('controller:nodes/action:index/with-slash/'));

$expected = array_merge(
array_fill_keys((array)Configure::read('Routing.prefixes'), false),
@@ -64,18 +70,18 @@ public function testLinkStringToArray() {
)
);
$string = 'plugin:contacts/controller:contacts/action:view/contact';
$this->assertEqual($expected, $this->Converter->linkStringToArray($string));
$this->assertEquals($expected, $this->Converter->linkStringToArray($string));

$string = '/plugin:contacts/controller:contacts/action:view/contact';
$this->assertEqual($expected, $this->Converter->linkStringToArray($string));
$this->assertEquals($expected, $this->Converter->linkStringToArray($string));
}

/**
* testLinkStringToArrayWithQueryString
*/
public function testLinkStringToArrayWithQueryString() {
$expected = array(
'admin' => true,
'prefix' => 'admin',
'plugin' => 'nodes',
'controller' => 'nodes',
'action' => 'index',
@@ -84,7 +90,7 @@ public function testLinkStringToArrayWithQueryString() {
),
);
$result = $this->Converter->linkStringToArray(
'admin:true/plugin:nodes/controller:nodes/action:index?foo=bar'
'prefix:admin/plugin:nodes/controller:nodes/action:index?foo=bar'
);
$this->assertEquals($expected, $result);
}
@@ -94,7 +100,7 @@ public function testLinkStringToArrayWithQueryString() {
*/
public function testLinkStringToArrayWithQueryStringAndPassedArgs() {
$expected = array(
'admin' => true,
'prefix' => 'admin',
'plugin' => 'settings',
'controller' => 'settings',
'action' => 'prefix',
@@ -104,7 +110,7 @@ public function testLinkStringToArrayWithQueryStringAndPassedArgs() {
),
);
$result = $this->Converter->linkStringToArray(
'admin:true/plugin:settings/controller:settings/action:prefix/Site?key=Site.title'
'prefix:admin/plugin:settings/controller:settings/action:prefix/Site?key=Site.title'
);
$this->assertEquals($expected, $result);
}
@@ -114,7 +120,7 @@ public function testLinkStringToArrayWithQueryStringAndPassedArgs() {
*/
public function testLinkStringToArrayWithQueryStringAndPassedAndNamedArgs() {
$expected = array(
'admin' => false,
'prefix' => false,
'plugin' => 'nodes',
'controller' => 'nodes',
'action' => 'index',
@@ -124,7 +130,7 @@ public function testLinkStringToArrayWithQueryStringAndPassedAndNamedArgs() {
),
);
$result = $this->Converter->linkStringToArray(
'admin:false/plugin:nodes/controller:nodes/action:index/type:blog?slug=hello-world'
'prefix:false/plugin:nodes/controller:nodes/action:index/type:blog?slug=hello-world'
);
$this->assertEquals($expected, $result);
}
@@ -134,15 +140,15 @@ public function testLinkStringToArrayWithQueryStringAndPassedAndNamedArgs() {
*/
public function testLinkStringToArrayWithUtf8() {
$expected = array(
'admin' => false,
'prefix' => false,
'plugin' => 'nodes',
'controller' => 'nodes',
'action' => 'view',
'type' => 'blog',
'slug' => 'ハローワールド',
);
$result = $this->Converter->linkStringToArray(
'admin:false/plugin:nodes/controller:nodes/action:view/type:blog/slug:ハローワールド'
'prefix:false/plugin:nodes/controller:nodes/action:view/type:blog/slug:ハローワールド'
);
$this->assertEquals($expected, $result);
}
@@ -152,15 +158,15 @@ public function testLinkStringToArrayWithUtf8() {
*/
public function testLinkStringToArrayWithUtf8PassedArgs() {
$expected = array(
'admin' => false,
'prefix' => false,
'plugin' => 'nodes',
'controller' => 'nodes',
'action' => 'view',
'ハローワールド',
'좋은 아침',
);
$result = $this->Converter->linkStringToArray(
'admin:false/plugin:nodes/controller:nodes/action:view/ハローワールド/좋은 아침'
'prefix:false/plugin:nodes/controller:nodes/action:view/ハローワールド/좋은 아침'
);
$this->assertEquals($expected, $result);
}
@@ -170,7 +176,7 @@ public function testLinkStringToArrayWithUtf8PassedArgs() {
*/
public function testLinkStringToArrayWithUtf8InQueryString() {
$expected = array(
'admin' => false,
'prefix' => false,
'plugin' => 'nodes',
'controller' => 'nodes',
'action' => 'view',
@@ -180,7 +186,7 @@ public function testLinkStringToArrayWithUtf8InQueryString() {
),
);
$result = $this->Converter->linkStringToArray(
'admin:false/plugin:nodes/controller:nodes/action:view/?slug=ハローワールド&page=8'
'prefix:false/plugin:nodes/controller:nodes/action:view/?slug=ハローワールド&page=8'
);
$this->assertEquals($expected, $result);
}
@@ -190,15 +196,15 @@ public function testLinkStringToArrayWithUtf8InQueryString() {
*/
public function testLinkStringToArrayWithEncodedUtf8() {
$expected = array(
'admin' => false,
'prefix' => false,
'plugin' => 'nodes',
'controller' => 'nodes',
'action' => 'view',
'type' => 'blog',
'slug' => 'ハローワールド',
);
$result = $this->Converter->linkStringToArray(
'admin:false/plugin:nodes/controller:nodes/action:view/type:blog/slug:%E3%83%8F%E3%83%AD%E3%83%BC%E3%83%AF%E3%83%BC%E3%83%AB%E3%83%89'
'prefix:false/plugin:nodes/controller:nodes/action:view/type:blog/slug:%E3%83%8F%E3%83%AD%E3%83%BC%E3%83%AF%E3%83%BC%E3%83%AB%E3%83%89'
);
$this->assertEquals($expected, $result);
}
7 ...TestCase/Utility/VisibilityFilterTest.php → ...TestCase/Utility/VisibilityFilterTest.php
View file
@@ -2,8 +2,11 @@

namespace Croogo\Croogo\Test\TestCase\Utility;

use Croogo\TestSuite\CroogoTestCase;
use Croogo\Utility\VisibilityFilter;
use Cake\Core\Configure;
use Cake\Network\Request;
use Cake\Utility\Hash;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\Utility\VisibilityFilter;
class VisibilityFilterTest extends CroogoTestCase {

public $setupSettings = false;
46 ...tCase/View/Helper/CroogoAppHelperTest.php → ...tCase/View/Helper/CroogoAppHelperTest.php
View file
@@ -1,10 +1,13 @@
<?php
namespace Croogo\Croogo\Test\TestCase\View\Helper;

use Cake\Core\Plugin;
use Cake\Network\Request;
use Cake\Network\Response;
use Cake\Routing\Router;
use Cake\View\View;
use Croogo\TestSuite\CroogoTestCase;
use Croogo\View\Helper\CroogoAppHelper;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\View\Helper\CroogoAppHelper;
class CroogoAppHelperTest extends CroogoTestCase {

/**
@@ -17,56 +20,69 @@ class CroogoAppHelperTest extends CroogoTestCase {
/**
* AppHelper instance
*
* @var AppHelper
* @var CroogoAppHelper
*/
public $AppHelper;

public $fixtures = array(
'plugin.settings.setting',
'plugin.taxonomy.type',
'plugin.taxonomy.vocabulary',
'plugin.taxonomy.types_vocabulary',
'plugin.croogo\settings.setting',
// 'plugin.taxonomy.type',
// 'plugin.taxonomy.vocabulary',
// 'plugin.taxonomy.types_vocabulary',
);

public function setUp() {
parent::setUp();
Plugin::load('Translate');
$this->View = new View(null);

Plugin::load('Croogo/Translate', ['autoload' => true, 'path' => '../Translate/']);

$request = new Request();
$this->View = new View($request, new Response());
$this->AppHelper = new CroogoAppHelper($this->View);
$this->AppHelper->request = new Request(null, false);
$this->AppHelper->request = $request;
}

public function tearDown() {
parent::tearDown();

Plugin::unload('Translate');

unset($this->AppHelper->request, $this->AppHelper, $this->View);
}

public function testUrlWithoutLocale() {
$url = $this->AppHelper->url();
$this->assertEqual($url, Router::url('/'));
$this->assertEquals($url, Router::url('/'));
}

public function testUrlWithLocale() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$url = $this->AppHelper->url(array('locale' => 'por'));
$this->assertEqual($url, Router::url('/por/index'));
$this->assertEquals($url, Router::url('/por/index'));
}

public function testFullUrlWithLocale() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$url = $this->AppHelper->url(array('locale' => 'por'), true);
$this->assertEqual($url, Router::url('/por/index', true));
$this->assertEquals($url, Router::url('/por/index', true));
}

public function testUrlWithRequestParams() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->AppHelper->request->params['locale'] = 'por';
$url = $this->AppHelper->url();
$this->assertEqual($url, Router::url('/por/index'));
$this->assertEquals($url, Router::url('/por/index'));
}

public function testFullUrlWithRequestParams() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->AppHelper->request->params['locale'] = 'por';
$url = $this->AppHelper->url(null, true);
$this->assertEqual($url, Router::url('/por/index', true));
$this->assertEquals($url, Router::url('/por/index', true));
}

}
53 ...Case/View/Helper/CroogoFormHelperTest.php → ...Case/View/Helper/CroogoFormHelperTest.php
View file
@@ -3,10 +3,15 @@

use Cake\Controller\Controller;
use Cake\View\View;
use Croogo\TestSuite\CroogoTestCase;
use Croogo\View\Helper\CroogoFormHelper;
use Croogo\Croogo\TestSuite\CroogoTestCase;
use Croogo\Croogo\View\Helper\CroogoFormHelper;
class CroogoFormHelperTest extends CroogoTestCase {

/**
* @var CroogoFormHelper
*/
private $CroogoForm;

public function setUp() {
$controller = null;
$this->View = new View($controller);
@@ -19,6 +24,8 @@ public function tearDown() {
}

public function testInputTooltips() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$result = $this->CroogoForm->input('username', array(
'tooltip' => 'Username',
));
@@ -39,7 +46,7 @@ public function testInputTooltips() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);

$result = $this->CroogoForm->input('username', array(
'tooltip' => array(
@@ -65,7 +72,7 @@ public function testInputTooltips() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);

$result = $this->CroogoForm->input('username', array(
'hiddenField' => false,
@@ -94,7 +101,7 @@ public function testInputTooltips() {
'/label',
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

/**
@@ -121,7 +128,7 @@ public function testInputAutoTooltips() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);

// disable auto tooltips
$result = $this->CroogoForm->input('username', array(
@@ -141,7 +148,7 @@ public function testInputAutoTooltips() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

public function testButtonDefault() {
@@ -154,7 +161,7 @@ public function testButtonDefault() {
'Button',
'/button',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

public function testButtonDanger() {
@@ -168,7 +175,7 @@ public function testButtonDanger() {
'Button',
'/button',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

public function testButtonWithIcon() {
@@ -188,7 +195,7 @@ public function testButtonWithIcon() {
' Button',
'/button',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

public function testSubmitDefault() {
@@ -207,7 +214,7 @@ public function testSubmitDefault() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

public function testSubmitDanger() {
@@ -226,7 +233,7 @@ public function testSubmitDanger() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

public function testInputPlaceholders() {
@@ -251,7 +258,7 @@ public function testInputPlaceholders() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);

$result = $this->CroogoForm->input('username', array(
'placeholder' => 'User/Email',
@@ -274,7 +281,7 @@ public function testInputPlaceholders() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);

$tip = 'Enter your username or email address';
$result = $this->CroogoForm->input('username', array(
@@ -299,7 +306,7 @@ public function testInputPlaceholders() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);

$result = $this->CroogoForm->input('username', array(
'placeholder' => false,
@@ -322,13 +329,15 @@ public function testInputPlaceholders() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

/**
* testAutocomplete
*/
public function testAutocomplete() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$result = $this->CroogoForm->autocomplete('user_id', array(
'autocomplete' => array(
'data-relatedField' => '#user_id',
@@ -362,13 +371,15 @@ public function testAutocomplete() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

/**
* testAutocompleteWithDefault
*/
public function testAutocompleteWithDefault() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->skipIf(env('TRAVIS') == 'true');
$result = $this->CroogoForm->autocomplete('user_id', array(
'default' => 3,
@@ -407,13 +418,15 @@ public function testAutocompleteWithDefault() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

/**
* testAutocompleteWithDefaultFromViewVars
*/
public function testAutocompleteWithDefaultFromViewVars() {
$this->markTestIncomplete('This test needs to be ported to CakePHP 3.0');

$this->skipIf(env('TRAVIS') == 'true');
$this->CroogoForm->defaultModel = 'Node';
$this->View->set('users', array(
@@ -462,7 +475,7 @@ public function testAutocompleteWithDefaultFromViewVars() {
),
'/div',
);
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

/**
@@ -492,7 +505,7 @@ public function testInputPlaceholderNestedModel() {
$result = $this->CroogoForm->input('User.Comment.node_id', array(
'placeholder' => true,
));
$this->assertTags($result, $expected);
$this->assertHtml($expected, $result);
}

}