Skip to content

Commit

Permalink
Reformatting long lines.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Aug 5, 2010
1 parent 43bf1c5 commit 8119f77
Showing 1 changed file with 30 additions and 10 deletions.
40 changes: 30 additions & 10 deletions cake/tests/cases/libs/object.test.php
Expand Up @@ -697,7 +697,6 @@ function testRequestAction() {
$expected = 5;
$this->assertEqual($result, $expected);


$result = $this->object->requestAction('/request_action/paginate_request_action');
$this->assertTrue($result);

Expand Down Expand Up @@ -728,15 +727,19 @@ function testRequestActionPlugins() {
$expected = 'test plugin index';
$this->assertEqual($result, $expected);

$result = $this->object->requestAction(array('controller' => 'tests', 'action' => 'index', 'plugin' => 'test_plugin'), array('return'));
$result = $this->object->requestAction(
array('controller' => 'tests', 'action' => 'index', 'plugin' => 'test_plugin'), array('return')
);
$expected = 'test plugin index';
$this->assertEqual($result, $expected);

$result = $this->object->requestAction('/test_plugin/tests/some_method');
$expected = 25;
$this->assertEqual($result, $expected);

$result = $this->object->requestAction(array('controller' => 'tests', 'action' => 'some_method', 'plugin' => 'test_plugin'));
$result = $this->object->requestAction(
array('controller' => 'tests', 'action' => 'some_method', 'plugin' => 'test_plugin')
);
$expected = 25;
$this->assertEqual($result, $expected);

Expand All @@ -756,30 +759,44 @@ function testRequestActionArray() {
'controllers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
));

$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'test_request_action'));
$result = $this->object->requestAction(
array('controller' => 'request_action', 'action' => 'test_request_action')
);
$expected = 'This is a test';
$this->assertEqual($result, $expected);

$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'another_ra_test'), array('pass' => array('5', '7')));
$result = $this->object->requestAction(
array('controller' => 'request_action', 'action' => 'another_ra_test'),
array('pass' => array('5', '7'))
);
$expected = 12;
$this->assertEqual($result, $expected);

$result = $this->object->requestAction(array('controller' => 'tests_apps', 'action' => 'index'), array('return'));
$result = $this->object->requestAction(
array('controller' => 'tests_apps', 'action' => 'index'), array('return')
);
$expected = 'This is the TestsAppsController index view';
$this->assertEqual($result, $expected);

$result = $this->object->requestAction(array('controller' => 'tests_apps', 'action' => 'some_method'));
$expected = 5;
$this->assertEqual($result, $expected);

$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'normal_request_action'));
$result = $this->object->requestAction(
array('controller' => 'request_action', 'action' => 'normal_request_action')
);
$expected = 'Hello World';
$this->assertEqual($result, $expected);

$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'paginate_request_action'));
$result = $this->object->requestAction(
array('controller' => 'request_action', 'action' => 'paginate_request_action')
);
$this->assertTrue($result);

$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'paginate_request_action'), array('pass' => array(5), 'named' => array('param' => 'value')));
$result = $this->object->requestAction(
array('controller' => 'request_action', 'action' => 'paginate_request_action'),
array('pass' => array(5), 'named' => array('param' => 'value'))
);
$this->assertTrue($result);

App::build();
Expand All @@ -804,7 +821,10 @@ function testRequestActionParamParseAndPass() {
$expected = array('sort' => 'desc', 'limit' => 5,);
$this->assertEqual($result['named'], $expected);

$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'params_pass'), array('named' => array('sort' => 'desc', 'limit' => 5)));
$result = $this->object->requestAction(
array('controller' => 'request_action', 'action' => 'params_pass'),
array('named' => array('sort' => 'desc', 'limit' => 5))
);
$this->assertEqual($result['named'], $expected);
}

Expand Down

0 comments on commit 8119f77

Please sign in to comment.