Commit 94258a65 authored by Timothy Andrew's avatar Timothy Andrew

Fix build for !12300.

- The `/users` and `/users/:id` APIs are now accessible without
  authentication (!12445), and so scopes are not relevant for these endpoints.

- Previously, we were testing our scope declaration against these two methods.
  This commit moves these tests to other `GET` user endpoints which still
  require authentication.
parent 5e2f7f25
...@@ -113,13 +113,6 @@ describe API::Users do ...@@ -113,13 +113,6 @@ describe API::Users do
expect(json_response.first.keys).not_to include 'is_admin' expect(json_response.first.keys).not_to include 'is_admin'
end end
context "scopes" do
let(:path) { "/users" }
let(:api_call) { method(:api) }
include_examples 'allows the "read_user" scope'
end
end end
context "when admin" do context "when admin" do
...@@ -216,13 +209,6 @@ describe API::Users do ...@@ -216,13 +209,6 @@ describe API::Users do
expect(response).to have_http_status(404) expect(response).to have_http_status(404)
end end
context "scopes" do
let(:path) { "/users/#{user.id}" }
let(:api_call) { method(:api) }
include_examples 'allows the "read_user" scope'
end
end end
describe "POST /users" do describe "POST /users" do
...@@ -909,6 +895,13 @@ describe API::Users do ...@@ -909,6 +895,13 @@ describe API::Users do
expect(response).to match_response_schema('public_api/v4/user/public') expect(response).to match_response_schema('public_api/v4/user/public')
expect(json_response['id']).to eq(user.id) expect(json_response['id']).to eq(user.id)
end end
context "scopes" do
let(:path) { "/user" }
let(:api_call) { method(:api) }
include_examples 'allows the "read_user" scope'
end
end end
context 'with admin' do context 'with admin' do
...@@ -978,6 +971,13 @@ describe API::Users do ...@@ -978,6 +971,13 @@ describe API::Users do
expect(json_response).to be_an Array expect(json_response).to be_an Array
expect(json_response.first["title"]).to eq(key.title) expect(json_response.first["title"]).to eq(key.title)
end end
context "scopes" do
let(:path) { "/user/keys" }
let(:api_call) { method(:api) }
include_examples 'allows the "read_user" scope'
end
end end
end end
...@@ -1011,6 +1011,13 @@ describe API::Users do ...@@ -1011,6 +1011,13 @@ describe API::Users do
expect(response).to have_http_status(404) expect(response).to have_http_status(404)
end end
context "scopes" do
let(:path) { "/user/keys/#{key.id}" }
let(:api_call) { method(:api) }
include_examples 'allows the "read_user" scope'
end
end end
describe "POST /user/keys" do describe "POST /user/keys" do
...@@ -1100,6 +1107,13 @@ describe API::Users do ...@@ -1100,6 +1107,13 @@ describe API::Users do
expect(json_response).to be_an Array expect(json_response).to be_an Array
expect(json_response.first["email"]).to eq(email.email) expect(json_response.first["email"]).to eq(email.email)
end end
context "scopes" do
let(:path) { "/user/emails" }
let(:api_call) { method(:api) }
include_examples 'allows the "read_user" scope'
end
end end
end end
...@@ -1132,6 +1146,13 @@ describe API::Users do ...@@ -1132,6 +1146,13 @@ describe API::Users do
expect(response).to have_http_status(404) expect(response).to have_http_status(404)
end end
context "scopes" do
let(:path) { "/user/emails/#{email.id}" }
let(:api_call) { method(:api) }
include_examples 'allows the "read_user" scope'
end
end end
describe "POST /user/emails" do describe "POST /user/emails" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment