summaryrefslogtreecommitdiff
path: root/spec/controllers/application_controller_spec.rb
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-05-11 10:16:23 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-05-11 10:16:23 +0530
commitd915e7d5cad99b8971e65d30accc8bc7a05fecbc (patch)
tree0583e9d36fb2d38101737d0a891ac29b7d87c373 /spec/controllers/application_controller_spec.rb
parent2e9742997ddbfaeff350eb5334b7f641a779550c (diff)
downloadgitlab-ce-d915e7d5cad99b8971e65d30accc8bc7a05fecbc.tar.gz
Reuse the private token param and header for personal access tokens.
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3749#note_11626427 - Personal access tokens are still a separate entity as far as the codebase is concerned - they just happen to use the same entry point as private tokens. - Update tests and documentation to reflect this change
Diffstat (limited to 'spec/controllers/application_controller_spec.rb')
-rw-r--r--spec/controllers/application_controller_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index e8bdbf1afb7..d7835dc6e2b 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -72,20 +72,20 @@ describe ApplicationController do
let(:personal_access_token) { create(:personal_access_token, user: user) }
it "logs the user in when the 'personal_access_token' param is populated with the personal access token" do
- get :index, personal_access_token: personal_access_token.token
+ get :index, private_token: personal_access_token.token
expect(response.status).to eq(200)
expect(response.body).to eq('authenticated')
end
it "logs the user in when the 'PERSONAL_ACCESS_TOKEN' header is populated with the personal access token" do
- @request.headers["PERSONAL_ACCESS_TOKEN"] = personal_access_token.token
+ @request.headers["PRIVATE-TOKEN"] = personal_access_token.token
get :index
expect(response.status).to eq(200)
expect(response.body).to eq('authenticated')
end
it "doesn't log the user in otherwise" do
- get :index, personal_access_token: "token"
+ get :index, private_token: "token"
expect(response.status).to_not eq(200)
expect(response.body).to_not eq('authenticated')
end