From 3d0ad546d1cd8d7cbd89727c630e525cf13ca8ee Mon Sep 17 00:00:00 2001 From: nitroflap Date: Wed, 16 Feb 2022 16:38:21 +0300 Subject: [PATCH] feat(discord_test#init): check for oauth2 token --- discord_test.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/discord_test.go b/discord_test.go index 973e3a6..f353185 100644 --- a/discord_test.go +++ b/discord_test.go @@ -15,11 +15,11 @@ var ( dg *Session // Stores a global discordgo user session dgBot *Session // Stores a global discordgo bot session - envToken = os.Getenv("DGU_TOKEN") // Token to use when authenticating the user account - envBotToken = os.Getenv("DGB_TOKEN") // Token to use when authenticating the bot account - envGuild = os.Getenv("DG_GUILD") // Guild ID to use for tests - envChannel = os.Getenv("DG_CHANNEL") // Channel ID to use for tests - envAdmin = os.Getenv("DG_ADMIN") // User ID of admin user to use for tests + envOAuth2Token = os.Getenv("DG_OAUTH2_TOKEN") // Token to use when authenticating using OAuth2 token + envBotToken = os.Getenv("DGB_TOKEN") // Token to use when authenticating the bot account + envGuild = os.Getenv("DG_GUILD") // Guild ID to use for tests + envChannel = os.Getenv("DG_CHANNEL") // Channel ID to use for tests + envAdmin = os.Getenv("DG_ADMIN") // User ID of admin user to use for tests ) func init() { @@ -30,10 +30,10 @@ func init() { } } - if d, err := New(envToken); err == nil { - dg = d - } else { - fmt.Println("dg is nil, error", err) + if envOAuth2Token != "" { + if d, err := New(envOAuth2Token); err == nil { + dg = d + } } } @@ -43,11 +43,11 @@ func init() { // TestNewToken tests the New() function with a Token. func TestNewToken(t *testing.T) { - if envToken == "" { + if envOAuth2Token == "" { t.Skip("Skipping New(token), DGU_TOKEN not set") } - d, err := New(envToken) + d, err := New(envOAuth2Token) if err != nil { t.Fatalf("New(envToken) returned error: %+v", err) } @@ -62,11 +62,11 @@ func TestNewToken(t *testing.T) { } func TestOpenClose(t *testing.T) { - if envToken == "" { + if envOAuth2Token == "" { t.Skip("Skipping TestClose, DGU_TOKEN not set") } - d, err := New(envToken) + d, err := New(envOAuth2Token) if err != nil { t.Fatalf("TestClose, New(envToken) returned error: %+v", err) }