diff --git a/src/Handler/Health.hs b/src/Handler/Health.hs index ed31be102..d4c7194cd 100644 --- a/src/Handler/Health.hs +++ b/src/Handler/Health.hs @@ -113,7 +113,7 @@ getStatusR = do

Current Time #{show currtime}

- Compile Time #{show comptime} + Compile Time #{comptime} $maybe ctime <- readMay comptime

Build is #{show $ ddays ctime currtime} days old diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs index 4a8d93618..5d87e8989 100644 --- a/test/Database/Fill.hs +++ b/test/Database/Fill.hs @@ -138,8 +138,8 @@ fillDb = do , userCsvOptions = def { csvFormat = csvPreset # CsvPresetExcel } , userSex = Just SexMale , userShowSex = userDefaultShowSex - , userTelephone = Nothing , userMobile = Nothing + , userTelephone = Nothing , userCompanyPersonalNumber = Nothing , userCompanyDepartment = Nothing } diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs index 66b90b480..314acd80a 100644 --- a/test/ModelSpec.hs +++ b/test/ModelSpec.hs @@ -128,6 +128,10 @@ instance Arbitrary User where userNotificationSettings <- arbitrary userCsvOptions <- arbitrary userShowSex <- arbitrary + userMobile <- fmap pack . assertM' (not . null) <$> listOf (elements $ [' ', '+', '-', '/', '_'] ++ ['0'..'9']) + userTelephone <- fmap pack . assertM' (not . null) <$> listOf (elements $ [' ', '+', '-', '/', '_'] ++ ['0'..'9']) + userCompanyPersonalNumber <- fmap pack . assertM' (not . null) <$> listOf (elements ['0'..'9']) + userCompanyDepartment <- arbitrary userCreated <- arbitrary userLastLdapSynchronisation <- arbitrary diff --git a/test/User.hs b/test/User.hs index 35ba6a848..35c195870 100644 --- a/test/User.hs +++ b/test/User.hs @@ -43,3 +43,7 @@ fakeUser adjUser = adjUser User{..} userCreated = unsafePerformIO getCurrentTime userLastLdapSynchronisation = Nothing userLdapPrimaryKey = Nothing + userMobile = Nothing + userTelephone = Nothing + userCompanyPersonalNumber = Nothing + userCompanyDepartment = Nothing