+ Shimmie Installer
+ Things are OK \o/
+ If you aren't redirected, click here to Continue.
+
+EOD;
+ }
+ else {
$h_file_content = htmlentities($file_content);
print <<
@@ -448,12 +459,12 @@ function write_config() { // {{{
-
Once done, Click here to Continue.
+
Once done, click here to Continue.
EOD;
- exit;
}
+ echo "\n";
} // }}}
?>
diff --git a/tests/all.php b/tests/all.php
deleted file mode 100644
index 2d82e8e9..00000000
--- a/tests/all.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @copyright Copyright (c) 2014, jgen
- */
-
-if(PHP_SAPI !== 'cli') die('cli only');
-
-require_once('lib/simpletest/unit_tester.php');
-require_once('lib/simpletest/web_tester.php');
-require_once('lib/simpletest/reporter.php');
-
-// Enable all errors.
-error_reporting(E_ALL);
-define("CLI_LOG_LEVEL", -100); // output everything.
-
-// Get the command line option telling us where the webserver is.
-$options = getopt("h:");
-$host = rtrim(trim(trim($options["h"], '"')), "/");
-
-if (empty($host)){ $host = "http://127.0.0.1"; }
-
-define("_TRAVIS_WEBHOST", $host);
-
-// The code below is based on the code in index.php
-//--------------------------------------------------
-
-require_once('core/_bootstrap.inc.php');
-require_once('ext/simpletest/main.php');
-
-// Fire off the InitExtEvent()
-$page = class_exists("CustomPage") ? new CustomPage() : new Page();
-$user = _get_user();
-send_event(new InitExtEvent());
-
-// Create the necessary users for the tests.
-$userPage = new UserPage();
-$userPage->onUserCreation(new UserCreationEvent("demo", "demo", ""));
-$userPage->onUserCreation(new UserCreationEvent("test", "test", ""));
-
-// Commit the users.
-$database->commit();
-
-// Fire off the InitExtEvent() again after we have made the users.
-$page = class_exists("CustomPage") ? new CustomPage() : new Page();
-$user = _get_user();
-send_event(new InitExtEvent());
-
-// Now we can actually run all the tests.
-$all = new TestFinder("");
-$results = $all->run(new TextReporter());
-
-// Travis-CI needs to know the results of the tests.
-exit ($results ? 0 : 1);
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 00000000..35384597
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,115 @@
+onUserCreation(new UserCreationEvent("demo", "demo", ""));
+ $userPage->onUserCreation(new UserCreationEvent("test", "test", ""));
+}
+
+abstract class ShimmiePHPUnitTestCase extends PHPUnit_Framework_TestCase {
+ protected $backupGlobalsBlacklist = array('database', 'config');
+ private $images = array();
+
+ public function setUp() {
+ // things to do after bootstrap and before request
+ // log in as anon
+ $this->log_out();
+ }
+
+ public function tearDown() {
+ foreach($this->images as $image_id) {
+ $this->delete_image($image_id);
+ }
+ }
+
+ protected function get_page($page_name) {
+ // use a fresh page
+ global $page;
+ $page = class_exists("CustomPage") ? new CustomPage() : new Page();
+ send_event(new PageRequestEvent($page_name));
+ }
+
+ // page things
+ protected function assert_title($title) {
+ global $page;
+ $this->assertEquals($title, $page->title);
+ }
+
+ protected function assert_response($code) {
+ global $page;
+ $this->assertEquals($code, $page->code);
+ }
+
+ protected function has_text($text) {
+ global $page;
+ foreach($page->blocks as $block) {
+ if(strpos($block->header, $text) !== false) return true;
+ if(strpos($block->body, $text) !== false) return true;
+ }
+ return false;
+ }
+
+ protected function assert_text($text) {
+ $this->assertTrue($this->has_text($text));
+ }
+
+ protected function assert_no_text($text) {
+ $this->assertFalse($this->has_text($text));
+ }
+
+ // user things
+ protected function log_in_as_admin() {
+ global $user;
+ $user = User::by_name('demo');
+ $this->assertNotNull($user);
+ }
+
+ protected function log_in_as_user() {
+ global $user;
+ $user = User::by_name('test');
+ $this->assertNotNull($user);
+ }
+
+ protected function log_out() {
+ global $user, $config;
+ $user = User::by_id($config->get_int("anon_id", 0));
+ $this->assertNotNull($user);
+ }
+
+ // post things
+ /**
+ * @param string $filename
+ * @param string|string[] $tags
+ * @return int
+ */
+ protected function post_image($filename, $tags) {
+ $dae = new DataUploadEvent($filename, array(
+ "filename"=>$filename,
+ "extension"=>'jpg', // fixme
+ "tags"=>$tags,
+ "source"=>null,
+ ));
+ send_event($dae);
+ $this->images[] = $dae->image_id;
+ return $dae->image_id;
+ }
+
+ /**
+ * @param int $image_id
+ */
+ protected function delete_image($image_id) {
+ $img = Image::by_id($image_id);
+ if($img) {
+ $ide = new ImageDeletionEvent($img);
+ send_event($ide);
+ }
+ }
+}
diff --git a/tests/install.php b/tests/install.php
deleted file mode 100644
index 86dddf1d..00000000
--- a/tests/install.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @copyright Copyright (c) 2014, jgen
- */
-
-if(PHP_SAPI !== 'cli') die('cli only');
-
-require_once('lib/simpletest/unit_tester.php');
-require_once('lib/simpletest/web_tester.php');
-require_once('lib/simpletest/reporter.php');
-
-// Enable all errors.
-error_reporting(E_ALL);
-
-// Get the command line option telling us what database and host to use.
-$options = getopt("d:h:");
-$db = $options["d"];
-$host = rtrim(trim(trim($options["h"], '"')), "/");
-
-// Check if they are empty.
-if (empty($db)){ die("Error: need to specify a database for the test environment."); }
-if (empty($host)){ $host = "http://127.0.0.1"; }
-
-define("_TRAVIS_DATABASE", $db);
-define("_TRAVIS_WEBHOST", $host);
-
-// Currently the tests only support MySQL and PostgreSQL.
-if ($db === "mysql") {
- define("_TRAVIS_DATABASE_USERNAME", "root");
- define("_TRAVIS_DATABASE_PASSWORD", "");
-} elseif ($db === "pgsql") {
- define("_TRAVIS_DATABASE_USERNAME", "postgres");
- define("_TRAVIS_DATABASE_PASSWORD", "");
-} else {
- die("Unsupported Database Option");
-}
-
-class ShimmieInstallerTest extends WebTestCase {
- function testInstallShimmie()
- {
- // Get the settings from the global constants.
- $db = constant("_TRAVIS_DATABASE");
- $host = constant("_TRAVIS_WEBHOST");
- $username = constant("_TRAVIS_DATABASE_USERNAME");
- $password = constant("_TRAVIS_DATABASE_PASSWORD");
-
- // Make sure that we know where the host is.
- $this->assertFalse(empty($host));
- // Make sure that we know what database to use.
- $this->assertFalse(empty($db));
-
- $this->get($host);
- $this->assertResponse(200);
- $this->assertTitle("Shimmie Installation");
- $this->assertText("Database Install");
-
- $this->setField("database_type", $db);
- $this->assertField("database_type", $db);
- $this->assertField("database_host", "localhost");
- $this->setField("database_user", $username);
- $this->setField("database_password", $password);
- $this->assertField("database_name", "shimmie");
- $this->clickSubmit("Go!");
-
- if (!$this->assertText("Installation Succeeded!")) {
- $this->showSource();
- }
- }
-}
-
-$test = new TestSuite('Install Shimmie');
-$test->add(new ShimmieInstallerTest());
-exit ($test->run(new TextReporter()) ? 0 : 1);
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
new file mode 100644
index 00000000..1fdaf756
--- /dev/null
+++ b/tests/phpunit.xml
@@ -0,0 +1,7 @@
+
+
+
+ ../ext/
+
+
+