summaryrefslogtreecommitdiff
path: root/spec/lib/mattermost/session_spec.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-06-01 12:12:18 +0100
committerPhil Hughes <me@iamphill.com>2018-06-01 12:12:18 +0100
commit9ffb60acd8ab646eabfa32e6faaa3802c2aef2a6 (patch)
tree71322166368986c869e5607ec9f2f1066d0c4e3e /spec/lib/mattermost/session_spec.rb
parent8868c919a3c798f7d5753e250723df6d285de7b0 (diff)
parente206e32881e4fbfcbe647d7b2ee713c99ef1bf99 (diff)
downloadgitlab-ce-9ffb60acd8ab646eabfa32e6faaa3802c2aef2a6.tar.gz
Merge branch 'master' into ide-list-merge-requests
Diffstat (limited to 'spec/lib/mattermost/session_spec.rb')
-rw-r--r--spec/lib/mattermost/session_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/mattermost/session_spec.rb b/spec/lib/mattermost/session_spec.rb
index c855643c4d8..5410bfbeb31 100644
--- a/spec/lib/mattermost/session_spec.rb
+++ b/spec/lib/mattermost/session_spec.rb
@@ -22,8 +22,8 @@ describe Mattermost::Session, type: :request do
let(:location) { 'http://location.tld' }
let(:cookie_header) {'MMOAUTH=taskik8az7rq8k6rkpuas7htia; Path=/;'}
let!(:stub) do
- WebMock.stub_request(:get, "#{mattermost_url}/api/v3/oauth/gitlab/login")
- .to_return(headers: { 'location' => location, 'Set-Cookie' => cookie_header }, status: 307)
+ WebMock.stub_request(:get, "#{mattermost_url}/oauth/gitlab/login")
+ .to_return(headers: { 'location' => location, 'Set-Cookie' => cookie_header }, status: 302)
end
context 'without oauth uri' do
@@ -76,7 +76,7 @@ describe Mattermost::Session, type: :request do
end
end
- WebMock.stub_request(:post, "#{mattermost_url}/api/v3/users/logout")
+ WebMock.stub_request(:post, "#{mattermost_url}/api/v4/users/logout")
.to_return(headers: { Authorization: 'token thisworksnow' }, status: 200)
end