cleanup xt tests

Tanson · Apr 14, 2016 · ecf601f · ecf601f
1 parent b60a0ba
commit ecf601f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,12 +31,6 @@ setup/log/*
 setup/latest-build
 setup/work/*
 setup/build.log
-xt/admin.db
-xt/admin
-xt/user.db
-xt/user
-xt/log
-xt/import_rep.db
-xt/import_rep_user
-xt/smart_http.db
-xt/smart_http
+xt/user/*
+xt/import_rep/*
+xt/smart_http/*
diff --git a/xt/basic.t b/xt/basic.t
@@ -9,7 +9,7 @@ use Encode qw/encode decode/;
 use Test::Mojo;
 
 # Test DB
-$ENV{GITPREP_DB_FILE} = "$FindBin::Bin/basic.db";
+$ENV{GITPREP_DB_FILE} = "$FindBin::Bin/basic/gitprep.db";
 
 # Test Repository home
 $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/../../gitprep_t_rep_home";

diff --git a/xt/basic.db → xt/basic/gitprep.db b/xt/basic.db → xt/basic/gitprep.db
diff --git a/xt/import_rep.t b/xt/import_rep.t
@@ -12,10 +12,10 @@ use Encode qw/encode decode/;
 use Test::Mojo;
 
 # Test DB
-my $db_file = $ENV{GITPREP_DB_FILE} = "$FindBin::Bin/import_rep.db";
+my $db_file = $ENV{GITPREP_DB_FILE} = "$FindBin::Bin/import_rep/gitprep.db";
 
 # Test Repository home
-my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/import_rep_user";
+my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/import_rep/rep";
 
 $ENV{GITPREP_NO_MYCONFIG} = 1;
 
@@ -52,12 +52,12 @@ note 'import_rep';
     or die "Command fail: @cmd";
 
   # Branch
-  ok(-f "$FindBin::Bin/import_rep_user/kimoto/gitprep_t.git/refs/heads/b1");
+  ok(-f "$rep_home/kimoto/gitprep_t.git/refs/heads/b1");
 
   # Tag
-  ok(-f "$FindBin::Bin/import_rep_user/kimoto/gitprep_t.git/refs/tags/t1");
+  ok(-f "$rep_home/kimoto/gitprep_t.git/refs/tags/t1");
 
   # Description
-  ok(-f "$FindBin::Bin/import_rep_user/kimoto/gitprep_t.git/description");
+  ok(-f "$rep_home/kimoto/gitprep_t.git/description");
 }
 
diff --git a/xt/smart_http.t b/xt/smart_http.t
@@ -13,10 +13,10 @@ use MIME::Base64 'encode_base64';
 use Test::Mojo;
 
 # Test DB
-my $db_file = $ENV{GITPREP_DB_FILE} = "$FindBin::Bin/smart_http.db";
+my $db_file = $ENV{GITPREP_DB_FILE} = "$FindBin::Bin/smart_http/gitprep.db";
 
 # Test Repository home
-my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/smart_http";
+my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/smart_http/rep";
 
 $ENV{GITPREP_NO_MYCONFIG} = 1;
 

diff --git a/xt/user.t b/xt/user.t
@@ -12,10 +12,10 @@ use Encode qw/encode decode/;
 use Test::Mojo;
 
 # Test DB
-my $db_file = $ENV{GITPREP_DB_FILE} = "$FindBin::Bin/user.db";
+my $db_file = $ENV{GITPREP_DB_FILE} = "$FindBin::Bin/user/gitprep.db";
 
 # Test Repository home
-my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/user";
+my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/user/rep";
 
 $ENV{GITPREP_NO_MYCONFIG} = 1;