summaryrefslogtreecommitdiffstats
path: root/api/user_test.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-21 17:34:13 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-21 17:34:13 -0700
commit0529a494ae6b541f917522a20de92e3d36615f65 (patch)
tree401c6faf7ca0eb90fdc9a88910d792c28b82ac02 /api/user_test.go
parente863096358dd64ecf2de6efeec3db132cdc8d6b9 (diff)
downloadchat-0529a494ae6b541f917522a20de92e3d36615f65.tar.gz
chat-0529a494ae6b541f917522a20de92e3d36615f65.tar.bz2
chat-0529a494ae6b541f917522a20de92e3d36615f65.zip
Adding image properties
Diffstat (limited to 'api/user_test.go')
-rw-r--r--api/user_test.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/api/user_test.go b/api/user_test.go
index 986365bd0..a9529e937 100644
--- a/api/user_test.go
+++ b/api/user_test.go
@@ -354,11 +354,11 @@ func TestUserCreateImage(t *testing.T) {
if utils.IsS3Configured() && !utils.Cfg.ServiceSettings.UseLocalStorage {
var auth aws.Auth
- auth.AccessKey = utils.Cfg.AWSSettings.S3AccessKeyId
- auth.SecretKey = utils.Cfg.AWSSettings.S3SecretAccessKey
+ auth.AccessKey = utils.Cfg.AWSSettings.AmazonS3AccessKeyId
+ auth.SecretKey = utils.Cfg.AWSSettingsAmazonS3SecretAccessKey
- s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettings.S3Region])
- bucket := s.Bucket(utils.Cfg.AWSSettings.S3Bucket)
+ s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettingsAmazonS3Region])
+ bucket := s.Bucket(utils.Cfg.AWSSettingsAmazonS3Bucket)
if err := bucket.Del("teams/" + user.TeamId + "/users/" + user.Id + "/profile.png"); err != nil {
t.Fatal(err)
@@ -452,11 +452,11 @@ func TestUserUploadProfileImage(t *testing.T) {
if utils.IsS3Configured() && !utils.Cfg.ServiceSettings.UseLocalStorage {
var auth aws.Auth
- auth.AccessKey = utils.Cfg.AWSSettings.S3AccessKeyId
- auth.SecretKey = utils.Cfg.AWSSettings.S3SecretAccessKey
+ auth.AccessKey = utils.Cfg.AWSSettings.AmazonS3AccessKeyId
+ auth.SecretKey = utils.Cfg.AWSSettingsAmazonS3SecretAccessKey
- s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettings.S3Region])
- bucket := s.Bucket(utils.Cfg.AWSSettings.S3Bucket)
+ s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettingsAmazonS3Region])
+ bucket := s.Bucket(utils.Cfg.AWSSettingsAmazonS3Bucket)
if err := bucket.Del("teams/" + user.TeamId + "/users/" + user.Id + "/profile.png"); err != nil {
t.Fatal(err)