Cavemanon/cavepaintings
7
Fork 2
Code Issues 3 Pull Requests Projects Releases Wiki Activity

a load more tests

Browse Source
This commit is contained in:
Shish
2009-07-19 04:48:25 +01:00
parent fd044838f3
commit d8e027b776
18 changed files with 265 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/pm/main.php
View File

@ -65,6 +65,7 @@ class PM extends SimpleExtension {
}
public function onPageRequest($event) {
global $database, $page, $user;
if($event->page_matches("pm")) {
if(!$user->is_anonymous()) {
switch($event->get_arg(0)) {
@ -93,7 +94,7 @@ class PM extends SimpleExtension {
$database->execute("DELETE FROM private_message WHERE id = ?", array($pm_id));
log_info("pm", "Deleted PM #$pm_id");
$page->set_mode("redirect");
$page->set_redirect(make_link("user"));
$page->set_redirect(make_link($_SERVER["REFERER"]));
}
else {
// permission denied
@ -108,12 +109,16 @@ class PM extends SimpleExtension {
$page->set_mode("redirect");
$page->set_redirect(make_link($_SERVER["REFERER"]));
break;
default:
$this->theme->display_error($page, "Invalid action", "That's not something you can do with a PM");
break;
}
}
}
}
public function onSendPM($event) {
global $database;
$database->execute("
INSERT INTO private_message(
from_id, from_ip, to_id,
@ -122,7 +127,7 @@ class PM extends SimpleExtension {
array($event->from_id, $event->from_ip,
$event->to_id, $event->subject, $event->message)
);
log_info("pm", "Sent PM to User #$to_id");
log_info("pm", "Sent PM to User #{$event->to_id}");
}

42
contrib/pm/test.php Normal file
View File

@ -0,0 +1,42 @@
<?php
class PMTest extends ShimmieWebTestCase {
function testPM() {
$this->log_in_as_admin();
$this->get_page("user/test");
$this->setField('subject', "message demo to test");
$this->setField('message', "message contents");
$this->click("Send");
$this->log_out();
$this->log_in_as_user();
$this->get_page("user");
$this->assertText("message demo to test");
$this->click("message demo to test");
$this->assertText("message contents");
$this->back();
$this->click("Delete");
$this->assertNoText("message demo to test");
$this->log_out();
}
function testAdminAccess() {
$this->log_in_as_admin();
$this->get_page("user/test");
$this->setField('subject', "message demo to test");
$this->setField('message', "message contents");
$this->click("Send");
$this->get_page("user/test");
$this->assertText("message demo to test");
$this->click("message demo to test");
$this->assertText("message contents");
$this->back();
$this->click("Delete");
# Test for bug: after an admin deletes a user's PM, they were
# redirected to their own (the admin's) PM list
$this->assertTitle("test's page");
$this->assertNoText("message demo to test");
$this->log_out();
}
}
?>

5
contrib/pm/theme.php
View File

@ -24,7 +24,10 @@ class PMTheme extends Themelet {
if($pm["is_read"] == "N") $h_subject = "<b>$h_subject</b>";
$html .= "<tr class='$oe'><td><a href='$pm_url'>$h_subject</a></td>
<td><a href='$from_url'>$h_from</a></td><td>$h_date</td>
<td><form action='$del_url'><input type='submit' value='Delete'></form></td></tr>";
<td><form action='$del_url'>
<input type='hidden' name='q' value='/pm/delete/{$pm["id"]}'>
<input type='submit' value='Delete'>
</form></td></tr>";
}
$html .= "
</tbody>