| - "", + | + + | + + |
';
- $page->add_block(new Block("PicLens", $foo, "left", 20));
- }
- }
-}
-add_event_listener(new PicLens());
-?>
diff --git a/contrib/simpletest/main.php b/contrib/simpletest/main.php
index da656203..4747045d 100644
--- a/contrib/simpletest/main.php
+++ b/contrib/simpletest/main.php
@@ -15,13 +15,17 @@ define('USER_PASS', "test");
define('ADMIN_NAME', "demo");
define('ADMIN_PASS', "demo");
-class ShimmieWebTestCase extends WebTestCase {
+class SCoreWebTestCase extends WebTestCase {
protected function get_page($page) {
$url = "http://".$_SERVER["HTTP_HOST"].get_base_href().'/'.make_link($page);
$url = str_replace("/./", "/", $url);
$this->get($url);
- $this->assertNoText(".php on line");
+ $this->assertNoText("Exception:");
+ $this->assertNoText("Error:");
+ $this->assertNoText("Warning:");
+ $this->assertNoText("Notice:");
}
+
protected function log_in_as_user() {
$this->get_page('post/list');
$this->assertText("Login");
@@ -42,7 +46,9 @@ class ShimmieWebTestCase extends WebTestCase {
$this->get_page('post/list');
$this->click('Log Out');
}
+}
+class ShimmieWebTestCase extends SCoreWebTestCase {
protected function post_image($filename, $tags) {
$image_id = -1;
$this->setMaximumRedirects(0);
diff --git a/contrib/site_description/test.php b/contrib/site_description/test.php
new file mode 100644
index 00000000..ee20d2ec
--- /dev/null
+++ b/contrib/site_description/test.php
@@ -0,0 +1,17 @@
+log_in_as_admin();
+ $this->get_page('setup');
+ $this->assertTitle("Shimmie Setup");
+ $this->setField("_config_site_description", "A Shimmie testbed");
+ $this->click("Save Settings")
+
+ $raw_headers = $this->getBrowser()->getHeaders();
+ $header = '';
+ $this->assertTrue(strpos($raw_headers, $header) > 0);
+
+ $this->log_out();
+ }
+}
+?>
diff --git a/contrib/word_filter/test.php b/contrib/word_filter/test.php
index e84c8882..ef9fe30b 100644
--- a/contrib/word_filter/test.php
+++ b/contrib/word_filter/test.php
@@ -53,21 +53,4 @@ class WordFilterTest extends ShimmieWebTestCase {
$this->log_out();
}
}
-
-if(!defined(VERSION)) return;
-
-class WordFilterUnitTest extends UnitTestCase {
- public function testURL() {
- $this->assertEqual(
- $this->filter("whore"),
- "nice lady");
- }
-
- private function filter($in) {
- $bb = new WordFilter();
- $tfe = new TextFormattingEvent($in);
- $bb->receive_event($tfe);
- return $tfe->formatted;
- }
-}
?>
diff --git a/core/page.class.php b/core/page.class.php
index 9e294a19..3686d3a9 100644
--- a/core/page.class.php
+++ b/core/page.class.php
@@ -123,10 +123,7 @@ class GenericPage {
case "page":
header("Cache-control: no-cache");
usort($this->blocks, "blockcmp");
- $data_href = get_base_href();
- foreach(glob("lib/*.js") as $js) {
- $this->add_header("");
- }
+ $this->add_auto_headers();
$layout = new Layout();
$layout->display_page($page);
break;
@@ -145,5 +142,26 @@ class GenericPage {
break;
}
}
+
+ private function add_auto_headers() {
+ $data_href = get_base_href();
+ foreach(glob("lib/*.js") as $js) {
+ $this->add_header("");
+ }
+
+ $css_files = glob("ext/*/style.css");
+ if($css_files) {
+ foreach($css_files as $css_file) {
+ $this->add_header("");
+ }
+ }
+
+ $js_files = glob("ext/*/script.js");
+ if($js_files) {
+ foreach($js_files as $js_file) {
+ $this->add_header("");
+ }
+ }
+ }
}
?>
diff --git a/ext/load_ext_data/main.php b/ext/load_ext_data/main.php
deleted file mode 100644
index 82681786..00000000
--- a/ext/load_ext_data/main.php
+++ /dev/null
@@ -1,22 +0,0 @@
-add_header("");
- }
- }
-
- $js_files = glob("ext/*/script.js");
- if($js_files) {
- foreach($js_files as $js_file) {
- $page->add_header("");
- }
- }
- }
-}
-?>
diff --git a/ext/tag_edit/test.php b/ext/tag_edit/test.php
new file mode 100644
index 00000000..48b5b1a5
--- /dev/null
+++ b/ext/tag_edit/test.php
@@ -0,0 +1,18 @@
+log_in_as_user();
+ $image_id = $this->post_image("ext/simpletest/data/pbx_screenshot.jpg", "pbx");
+ $this->get_page("post/view/$image_id");
+ $this->assertTitle("Image $image_id: pbx");
+ $this->setField("tag_edit__tags", "new");
+ $this->click("Set");
+ $this->assertTitle("Image $image_id: new");
+ $this->log_out();
+
+ $this->log_in_as_admin();
+ $this->delete_image($image_id);
+ $this->log_out();
+ }
+}
+?>