Skip to content
Browse files

cleaning up some tests and adding resources to gitignore

  • Loading branch information...
1 parent 89f2e37 commit 9e9375fe7c8bdda31d6d0626b9e34d40b4bce250 @gwoo gwoo committed Dec 8, 2009
View
2 .gitignore
@@ -1,3 +1,3 @@
.DS_Store
app/libraries/plugins/*
-app/tmp/*
+app/resources/tmp/*
View
6 libraries/lithium/tests/cases/console/DispatcherTest.php
@@ -82,16 +82,14 @@ public function testRunWithAction() {
}
public function testInvalidCommand() {
- ob_start();
+ $expected = (object) array('status' => "Command `\\this\\command\\is\\fake` not found\n");
$result = Dispatcher::run(new Request(array(
'args' => array(
'\this\command\is\fake',
'testAction'
)
)));
-
- $expected = "Command `\\this\\command\\is\\fake` not found\n";
- $result = ob_get_clean();
+
$this->assertEqual($expected, $result);
}
}
View
6 libraries/lithium/tests/cases/data/source/http/adapter/CouchDbTest.php
@@ -117,7 +117,7 @@ public function testReadNoConditions() {
$result = $couchdb->last->request->path;
$this->assertEqual($expected, $result);
- $expected = array();
+ $expected = '';
$result = $couchdb->last->request->params;
$this->assertEqual($expected, $result);
}
@@ -132,8 +132,8 @@ public function testReadWithConditions() {
$expected = '/posts/12345';
$result = $couchdb->last->request->path;
$this->assertEqual($expected, $result);
-
- $expected = array();
+
+ $expected = '';
$result = $couchdb->last->request->params;
$this->assertEqual($expected, $result);
}
View
1 libraries/lithium/tests/cases/g11n/catalog/adapter/GettextTest.php
@@ -37,6 +37,7 @@ public function tearDown() {
unlink($path);
}
}
+ rmdir($this->_path);
}
function testWriteReadMessageTemplate() {
View
2 libraries/lithium/tests/mocks/data/source/http/adapter/MockService.php
@@ -24,7 +24,7 @@ public function send($method, $path = null, $data = array(), $options = array())
'rev' => '1-2',
'body' => 'something'
));
- $this->last = (object)compact('request', 'response');
+ $this->last = (object) compact('request', 'response');
return ($options['return'] == 'body') ? $response->body() : $response;
}
}

0 comments on commit 9e9375f

Please sign in to comment.
Something went wrong with that request. Please try again.