FIX: errors after rebasing.

Author: pstaabp

lib/WeBWorK3/Utils/Settings.pm

@@ -23,8 +23,8 @@ use DateTime::TimeZone;
 use JSON::PP;
 use Array::Utils qw/array_minus/;
 
-my @allowed_fields  = qw/var category subcategory doc doc2 default type options/;
-my @required_fields = qw/var doc type default/;
+my @allowed_fields  = qw/setting_name category subcategory description doc default_value type options/;
+my @required_fields = qw/setting_name description type default_value/;
 
 =head1 loadDefaultCourseSettings
 
@@ -167,6 +167,7 @@ sub validateMultilist ($setting, $value) {
 	throw DB::Exception::InvalidCourseFieldType->throw(
 		message => "The values for $setting->{setting_name} must be a subset of the options field")
 		unless scalar(@diff) == 0;
+	return 1;
 }
 
 # Test for an integer.

t/db/002_course_settings.t

@@ -24,7 +24,7 @@ use DB::Schema;
 use WeBWorK3::Utils::Settings qw/isInteger isTimeString isTimeDuration isDecimal mergeCourseSettings
 	isValidSetting/;
 
-use DB::TestUtils qw/removeIDs loadCSV/;
+use TestUtils qw/removeIDs loadCSV/;
 
 # Load the database
 my $config_file = "$main::ww3_dir/conf/webwork3-test.yml";

t/db/build_db.pl

@@ -28,8 +28,8 @@ BEGIN
 my $verbose = 1;
 
 # Load the configuration for the database settings.
-my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-$config_file = "$main::ww3_dir/conf/ww3-dev.dist.yml" unless (-e $config_file);
+my $config_file = "$main::ww3_dir/conf/webwork3-test.yml";
+$config_file = "$main::ww3_dir/conf/webwork3-test.dist.yml" unless (-e $config_file);
 
 # the YAML true/false will be loaded a JSON booleans.
 local $YAML::XS::Boolean = "JSON::PP";

t/mojolicious/015_course_settings.t

@@ -15,16 +15,17 @@ BEGIN {
 }
 
 use lib "$main::ww3_dir/lib";
+use lib "$main::ww3_dir/t/lib";
 
 use Clone qw/clone/;
 use YAML::XS qw/LoadFile/;
 use List::MoreUtils qw/firstval/;
 
-use DB::TestUtils qw/loadCSV removeIDs/;
+use TestUtils qw/loadCSV removeIDs/;
 
 # Load the config file.
-my $config_file = "$main::ww3_dir/conf/ww3-dev.yml";
-$config_file = "$main::ww3_dir/conf/ww3-dev.dist.yml" unless (-e $config_file);
+my $config_file = "$main::ww3_dir/conf/webwork3-test.yml";
+$config_file = "$main::ww3_dir/conf/webwork3-test.dist.yml" unless (-e $config_file);
 
 # the YAML true/false will be loaded a JSON booleans.
 local $YAML::XS::Boolean = "JSON::PP";