diff --git a/notifiers/discord_test.go b/notifiers/discord_test.go index 5dd37a9a..5e8175a8 100644 --- a/notifiers/discord_test.go +++ b/notifiers/discord_test.go @@ -7,23 +7,19 @@ import ( "github.com/statping/statping/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "os" "testing" "time" ) var ( - DISCORD_URL = utils.Params.GetString("DISCORD_URL") - discordMessage = `{"content": "The discord notifier on Statping has been tested!"}` + DISCORD_URL string ) -func init() { - DISCORD_URL = os.Getenv("DISCORD_URL") -} - func TestDiscordNotifier(t *testing.T) { err := utils.InitLogs() require.Nil(t, err) + DISCORD_URL = utils.Params.GetString("DISCORD_URL") + db, err := database.OpenTester() require.Nil(t, err) db.AutoMigrate(¬ifications.Notification{}) diff --git a/notifiers/email_test.go b/notifiers/email_test.go index 03c46d61..8a5f24c1 100644 --- a/notifiers/email_test.go +++ b/notifiers/email_test.go @@ -21,20 +21,17 @@ var ( EMAIL_PORT int64 ) -var testEmail *emailOutgoing +func TestEmailNotifier(t *testing.T) { + err := utils.InitLogs() + require.Nil(t, err) -func init() { EMAIL_HOST = utils.Params.GetString("EMAIL_HOST") EMAIL_USER = utils.Params.GetString("EMAIL_USER") EMAIL_PASS = utils.Params.GetString("EMAIL_PASS") EMAIL_OUTGOING = utils.Params.GetString("EMAIL_OUTGOING") EMAIL_SEND_TO = utils.Params.GetString("EMAIL_SEND_TO") EMAIL_PORT = utils.ToInt(utils.Params.GetString("EMAIL_PORT")) -} -func TestEmailNotifier(t *testing.T) { - err := utils.InitLogs() - require.Nil(t, err) db, err := database.OpenTester() require.Nil(t, err) db.AutoMigrate(¬ifications.Notification{}) diff --git a/notifiers/mobile_test.go b/notifiers/mobile_test.go index 6fb292b3..21dd777b 100644 --- a/notifiers/mobile_test.go +++ b/notifiers/mobile_test.go @@ -17,16 +17,15 @@ var ( MOBILE_NUMBER string ) -func init() { - MOBILE_ID = os.Getenv("MOBILE_ID") - MOBILE_NUMBER = os.Getenv("MOBILE_NUMBER") - Mobile.Var1 = MOBILE_ID -} - func TestMobileNotifier(t *testing.T) { t.SkipNow() err := utils.InitLogs() require.Nil(t, err) + + MOBILE_ID = utils.Params.GetString("MOBILE_ID") + MOBILE_NUMBER = utils.Params.GetString("MOBILE_NUMBER") + Mobile.Var1 = MOBILE_ID + db, err := database.OpenTester() require.Nil(t, err) db.AutoMigrate(¬ifications.Notification{}) diff --git a/notifiers/pushover_test.go b/notifiers/pushover_test.go index 7552172d..1c0e6649 100644 --- a/notifiers/pushover_test.go +++ b/notifiers/pushover_test.go @@ -7,18 +7,21 @@ import ( "github.com/statping/statping/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "os" "testing" ) var ( - PUSHOVER_TOKEN = os.Getenv("PUSHOVER_TOKEN") - PUSHOVER_API = os.Getenv("PUSHOVER_API") + PUSHOVER_TOKEN string + PUSHOVER_API string ) func TestPushoverNotifier(t *testing.T) { err := utils.InitLogs() require.Nil(t, err) + + PUSHOVER_TOKEN = utils.Params.GetString("PUSHOVER_TOKEN") + PUSHOVER_API = utils.Params.GetString("PUSHOVER_API") + db, err := database.OpenTester() require.Nil(t, err) db.AutoMigrate(¬ifications.Notification{}) diff --git a/notifiers/telegram_test.go b/notifiers/telegram_test.go index 460eb981..5845e64c 100644 --- a/notifiers/telegram_test.go +++ b/notifiers/telegram_test.go @@ -7,7 +7,6 @@ import ( "github.com/statping/statping/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "os" "testing" "time" ) @@ -15,19 +14,17 @@ import ( var ( telegramToken string telegramChannel string - telegramMessage = "The Telegram notifier on Statping has been tested!" ) -func init() { - telegramToken = os.Getenv("TELEGRAM_TOKEN") - telegramChannel = os.Getenv("TELEGRAM_CHANNEL") - Telegram.ApiSecret = telegramToken - Telegram.Var1 = telegramChannel -} - func TestTelegramNotifier(t *testing.T) { err := utils.InitLogs() require.Nil(t, err) + + telegramToken = utils.Params.GetString("TELEGRAM_TOKEN") + telegramChannel = utils.Params.GetString("TELEGRAM_CHANNEL") + Telegram.ApiSecret = telegramToken + Telegram.Var1 = telegramChannel + db, err := database.OpenTester() require.Nil(t, err) db.AutoMigrate(¬ifications.Notification{}) diff --git a/notifiers/twilio_test.go b/notifiers/twilio_test.go index 5cf9cd95..5a76b456 100644 --- a/notifiers/twilio_test.go +++ b/notifiers/twilio_test.go @@ -7,26 +7,22 @@ import ( "github.com/statping/statping/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "os" "testing" "time" ) var ( - TWILIO_SID = os.Getenv("TWILIO_SID") - TWILIO_SECRET = os.Getenv("TWILIO_SECRET") - TWILIO_FROM = os.Getenv("TWILIO_FROM") - TWILIO_TO = os.Getenv("TWILIO_TO") + TWILIO_SID string + TWILIO_SECRET string ) -func init() { - TWILIO_SID = os.Getenv("TWILIO_SID") - TWILIO_SECRET = os.Getenv("TWILIO_SECRET") -} - func TestTwilioNotifier(t *testing.T) { err := utils.InitLogs() require.Nil(t, err) + + TWILIO_SID = utils.Params.GetString("TWILIO_SID") + TWILIO_SECRET = utils.Params.GetString("TWILIO_SECRET") + db, err := database.OpenTester() require.Nil(t, err) db.AutoMigrate(¬ifications.Notification{})