Merge branch 'bw-move-readonly-logic' into 'master'
Refactor rspec matchers in read_only_spec.rb See merge request gitlab-org/gitlab-ce!20414
This commit is contained in:
commit
270580f97c
|
@ -69,6 +69,7 @@ module Gitlab
|
|||
@route_hash ||= Rails.application.routes.recognize_path(request.url, { method: request.request_method }) rescue {}
|
||||
end
|
||||
|
||||
# Overridden in EE module
|
||||
def whitelisted_routes
|
||||
grack_route || ReadOnly.internal_routes.any? { |path| request.path.include?(path) } || lfs_route || sidekiq_route
|
||||
end
|
||||
|
|
|
@ -4,28 +4,6 @@ describe Gitlab::Middleware::ReadOnly do
|
|||
include Rack::Test::Methods
|
||||
using RSpec::Parameterized::TableSyntax
|
||||
|
||||
RSpec::Matchers.define :be_a_redirect do
|
||||
match do |response|
|
||||
response.status == 301
|
||||
end
|
||||
end
|
||||
|
||||
RSpec::Matchers.define :disallow_request do
|
||||
match do |middleware|
|
||||
alert = middleware.env['rack.session'].to_hash
|
||||
.dig('flash', 'flashes', 'alert')
|
||||
|
||||
alert&.include?('You cannot perform write operations')
|
||||
end
|
||||
end
|
||||
|
||||
RSpec::Matchers.define :disallow_request_in_json do
|
||||
match do |response|
|
||||
json_response = JSON.parse(response.body)
|
||||
response.body.include?('You cannot perform write operations') && json_response.key?('message')
|
||||
end
|
||||
end
|
||||
|
||||
let(:rack_stack) do
|
||||
rack = Rack::Builder.new do
|
||||
use ActionDispatch::Session::CacheStore
|
||||
|
@ -66,38 +44,38 @@ describe Gitlab::Middleware::ReadOnly do
|
|||
it 'expects PATCH requests to be disallowed' do
|
||||
response = request.patch('/test_request')
|
||||
|
||||
expect(response).to be_a_redirect
|
||||
expect(response).to be_redirect
|
||||
expect(subject).to disallow_request
|
||||
end
|
||||
|
||||
it 'expects PUT requests to be disallowed' do
|
||||
response = request.put('/test_request')
|
||||
|
||||
expect(response).to be_a_redirect
|
||||
expect(response).to be_redirect
|
||||
expect(subject).to disallow_request
|
||||
end
|
||||
|
||||
it 'expects POST requests to be disallowed' do
|
||||
response = request.post('/test_request')
|
||||
|
||||
expect(response).to be_a_redirect
|
||||
expect(response).to be_redirect
|
||||
expect(subject).to disallow_request
|
||||
end
|
||||
|
||||
it 'expects a internal POST request to be allowed after a disallowed request' do
|
||||
response = request.post('/test_request')
|
||||
|
||||
expect(response).to be_a_redirect
|
||||
expect(response).to be_redirect
|
||||
|
||||
response = request.post("/api/#{API::API.version}/internal")
|
||||
|
||||
expect(response).not_to be_a_redirect
|
||||
expect(response).not_to be_redirect
|
||||
end
|
||||
|
||||
it 'expects DELETE requests to be disallowed' do
|
||||
response = request.delete('/test_request')
|
||||
|
||||
expect(response).to be_a_redirect
|
||||
expect(response).to be_redirect
|
||||
expect(subject).to disallow_request
|
||||
end
|
||||
|
||||
|
@ -105,7 +83,7 @@ describe Gitlab::Middleware::ReadOnly do
|
|||
expect(Rails.application.routes).to receive(:recognize_path).and_call_original
|
||||
response = request.post('/root/gitlab-ce/new/master/app/info/lfs/objects/batch')
|
||||
|
||||
expect(response).to be_a_redirect
|
||||
expect(response).to be_redirect
|
||||
expect(subject).to disallow_request
|
||||
end
|
||||
|
||||
|
@ -120,19 +98,19 @@ describe Gitlab::Middleware::ReadOnly do
|
|||
expect(Rails.application.routes).not_to receive(:recognize_path)
|
||||
response = request.post("/api/#{API::API.version}/internal")
|
||||
|
||||
expect(response).not_to be_a_redirect
|
||||
expect(response).not_to be_redirect
|
||||
expect(subject).not_to disallow_request
|
||||
end
|
||||
|
||||
it 'expects requests to sidekiq admin to be allowed' do
|
||||
response = request.post('/admin/sidekiq')
|
||||
|
||||
expect(response).not_to be_a_redirect
|
||||
expect(response).not_to be_redirect
|
||||
expect(subject).not_to disallow_request
|
||||
|
||||
response = request.get('/admin/sidekiq')
|
||||
|
||||
expect(response).not_to be_a_redirect
|
||||
expect(response).not_to be_redirect
|
||||
expect(subject).not_to disallow_request
|
||||
end
|
||||
|
||||
|
@ -150,7 +128,7 @@ describe Gitlab::Middleware::ReadOnly do
|
|||
expect(Rails.application.routes).to receive(:recognize_path).and_call_original
|
||||
response = request.post(path)
|
||||
|
||||
expect(response).not_to be_a_redirect
|
||||
expect(response).not_to be_redirect
|
||||
expect(subject).not_to disallow_request
|
||||
end
|
||||
end
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
RSpec::Matchers.define :disallow_request do
|
||||
match do |middleware|
|
||||
alert = middleware.env['rack.session'].to_hash
|
||||
.dig('flash', 'flashes', 'alert')
|
||||
|
||||
alert&.include?('You cannot perform write operations')
|
||||
end
|
||||
end
|
||||
|
||||
RSpec::Matchers.define :disallow_request_in_json do
|
||||
match do |response|
|
||||
json_response = JSON.parse(response.body)
|
||||
response.body.include?('You cannot perform write operations') && json_response.key?('message')
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue