about summary refs log tree commit diff
path: root/t
diff options
context:
space:
mode:
authorJonathan "Duke" Leto <jonathan@leto.net>2011-04-28 12:04:48 -0700
committerJonathan "Duke" Leto <jonathan@leto.net>2011-04-28 12:04:48 -0700
commit2d8ded73a3ac395839ce4abe0ec59dabfdfba0bf (patch)
tree98402ccc9cc8db654a942ef27b20c844bf0232d8 /t
parentAdd on_failure_to_email and on_pass_to_email config keys (diff)
parentPrevent a use of uninitialized value warning (diff)
downloadjitterbug-2d8ded73a3ac395839ce4abe0ec59dabfdfba0bf.tar.gz
Merge branch 'reuse_repo'
Diffstat (limited to 't')
-rw-r--r--t/004_project.t7
-rw-r--r--t/lib/jitterbug/Test.pm7
2 files changed, 8 insertions, 6 deletions
diff --git a/t/004_project.t b/t/004_project.t
index 4d00338..568ffc0 100644
--- a/t/004_project.t
+++ b/t/004_project.t
@@ -10,9 +10,10 @@ use Dancer::Test;
 
 jitterbug::Test->init();
 
-my $response;
+my $r;
 
 {
-    $response = dancer_response(GET => '/project/Dancer');
-    is $response->status, 404;
+    local $TODO = "non-existent project gives a 500 instead of a 404";
+    $r = dancer_response(GET => '/project/Dancer');
+    is $r->status, 404 or diag $r->content;
 }
diff --git a/t/lib/jitterbug/Test.pm b/t/lib/jitterbug/Test.pm
index ee6a13d..2326e83 100644
--- a/t/lib/jitterbug/Test.pm
+++ b/t/lib/jitterbug/Test.pm
@@ -10,12 +10,13 @@ use File::Spec;
 use File::Temp qw/tempdir/;
 
 sub init {
-    my $db_dir = tempdir( CLEANUP => 1 );
-    my $db_file = File::Spec->catfile( $db_dir, 'jitterbug.db' );
+    #my $db_dir = tempdir( CLEANUP => 1 );
+    # TODO: this should be pulled from the config file
+    my $db_file = File::Spec->catfile( qw/t data jitterbug.db/ );
     my $dsn     = 'dbi:SQLite:dbname=' . $db_file;
     my $schema  = jitterbug::Schema->connect($dsn);
     _setting($dsn);
-    $schema->deploy;
+    $schema->deploy unless -s $db_file;
 }
 
 sub _setting {