fixing LoadFiles

Author: drdrew42

t/db/002_course_settings.t

@@ -31,13 +31,11 @@ use WeBWorK3::Utils::Settings qw/getDefaultCourseSettings getDefaultCourseValues
 
 use DB::TestUtils qw/loadCSV removeIDs loadSchema/;
 
-my $config;
 my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-if (-e $config_file) {
-	$config = LoadFile($config_file);
-} else {
-	die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?";
-}
+die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?"
+	unless (-e $config_file);
+
+my $config = LoadFile($config_file);
 
 my $schema =
 	DB::Schema->connect($config->{test_database_dsn}, $config->{database_user}, $config->{database_password});

t/db/004_course_users.t

@@ -26,13 +26,11 @@ use DB::Schema;
 use DB::TestUtils qw/loadCSV removeIDs loadSchema/;
 use DB::Utils qw/removeLoginParams/;
 
-my $config;
 my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-if (-e $config_file) {
-	$config = LoadFile($config_file);
-} else {
-	die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?";
-}
+die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?"
+	unless (-e $config_file);
+
+my $config = LoadFile($config_file);
 
 my $schema =
 	DB::Schema->connect($config->{test_database_dsn}, $config->{database_user}, $config->{database_password});

t/db/005_hwsets.t

@@ -29,13 +29,11 @@ use DB::WithDates;
 use DB::Schema;
 use DB::TestUtils qw/loadCSV removeIDs filterBySetType loadSchema/;
 
-my $config;
 my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-if (-e $config_file) {
-	$config = LoadFile($config_file);
-} else {
-	die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?";
-}
+die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?"
+	unless (-e $config_file);
+
+my $config = LoadFile($config_file);
 
 my $schema =
 	DB::Schema->connect($config->{test_database_dsn}, $config->{database_user}, $config->{database_password});

t/db/006_quizzes.t

@@ -28,13 +28,11 @@ use DB::Schema;
 use DB::TestUtils qw/loadCSV removeIDs filterBySetType loadSchema/;
 
 # load the database
-my $config;
 my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-if (-e $config_file) {
-	$config = LoadFile($config_file);
-} else {
-	die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?";
-}
+die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?"
+	unless (-e $config_file);
+
+my $config = LoadFile($config_file);
 
 my $schema =
 	DB::Schema->connect($config->{test_database_dsn}, $config->{database_user}, $config->{database_password});

t/db/007_user_set.t

@@ -30,13 +30,11 @@ use DB::TestUtils qw/loadCSV removeIDs loadSchema/;
 
 ## get the database
 
-my $config;
 my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-if (-e $config_file) {
-	$config = LoadFile($config_file);
-} else {
-	die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?";
-}
+die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?"
+	unless (-e $config_file);
+
+my $config = LoadFile($config_file);
 
 my $schema =
 	DB::Schema->connect($config->{test_database_dsn}, $config->{database_user}, $config->{database_password});

t/db/008_problem_pools.t

@@ -27,13 +27,11 @@ use DB::Schema;
 use DB::TestUtils qw/loadCSV removeIDs loadSchema/;
 
 # Set up the database
-my $config;
 my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-if (-e $config_file) {
-	$config = LoadFile($config_file);
-} else {
-	die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?";
-}
+die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?"
+	unless (-e $config_file);
+
+my $config = LoadFile($config_file);
 
 my $schema =
 	DB::Schema->connect($config->{test_database_dsn}, $config->{database_user}, $config->{database_password});

t/db/009_problems.t

@@ -28,13 +28,11 @@ use DB::Schema;
 use DB::TestUtils qw/loadCSV removeIDs loadSchema/;
 
 # set up the database
-my $config;
 my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-if (-e $config_file) {
-	$config = LoadFile($config_file);
-} else {
-	die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?";
-}
+die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?"
+	unless (-e $config_file);
+
+my $config = LoadFile($config_file);
 
 my $schema =
 	DB::Schema->connect($config->{test_database_dsn}, $config->{database_user}, $config->{database_password});

t/db/010_set_versions.t

@@ -28,13 +28,11 @@ use DB::Schema;
 use DB::TestUtils qw/loadCSV removeIDs filterBySetType loadSchema/;
 
 # setup the database
-my $config;
 my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-if (-e $config_file) {
-	$config = LoadFile($config_file);
-} else {
-	die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?";
-}
+die "The file $config_file does not exist.  Did you make a copy of it from ww3-dev.dist.yml ?"
+	unless (-e $config_file);
+
+my $config = LoadFile($config_file);
 
 my $schema =
 	DB::Schema->connect($config->{test_database_dsn}, $config->{database_user}, $config->{database_password});