diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-05-03 14:10:36 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-03 14:10:36 -0400 |
| commit | 87989b8afd4666a72940389db716b6500d0a9ec3 (patch) | |
| tree | d4b0270eb4a9adbff0dd1b6f527ddcccbc9a83d9 /api/post_test.go | |
| parent | e76a30bca0690bad53a4cabd6c7c629e89c17268 (diff) | |
| download | chat-87989b8afd4666a72940389db716b6500d0a9ec3.tar.gz chat-87989b8afd4666a72940389db716b6500d0a9ec3.tar.bz2 chat-87989b8afd4666a72940389db716b6500d0a9ec3.zip | |
PLT-2258 Unified login screen and related APIs (#2820)
* Unified login screen and related APIs
* Refactored login API call to be less convoluted
* Removed LDAP login prompt from invite process
* Fixed existing LDAP users being able to log in if LDAP was configured, but disabled
* Gofmt
* Future proofed login API
* Updated login APIs based on feedback
* Added additional auditing to login API
* Actually removed loginById
Diffstat (limited to 'api/post_test.go')
| -rw-r--r-- | api/post_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/post_test.go b/api/post_test.go index 8556d66b6..529cc6e4d 100644 --- a/api/post_test.go +++ b/api/post_test.go @@ -91,7 +91,7 @@ func TestCreatePost(t *testing.T) { t.Fatal("Should have been forbidden") } - Client.LoginByEmail(team2.Name, user3.Email, user3.Password) + Client.Login(user3.Email, user3.Password) Client.SetTeamId(team2.Id) channel3 := th.CreateChannel(Client, team2) @@ -512,7 +512,7 @@ func TestSearchPostsFromUser(t *testing.T) { t.Fatalf("wrong number of posts returned %v", len(result.Order)) } - Client.LoginByEmail(team.Name, user3.Email, user3.Password) + Client.Login(user3.Email, user3.Password) // wait for the join/leave messages to be created for user3 since they're done asynchronously time.Sleep(100 * time.Millisecond) @@ -741,7 +741,7 @@ func TestGetOutOfChannelMentions(t *testing.T) { user4 := th.CreateUser(Client) LinkUserToTeam(user4, team2) - Client.Must(Client.LoginByEmail(team2.Name, user4.Email, user4.Password)) + Client.Must(Client.Login(user4.Email, user4.Password)) Client.SetTeamId(team2.Id) channel2 := &model.Channel{DisplayName: "Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team2.Id} |