Commit ceaef888 authored by Michael Kozono's avatar Michael Kozono
Browse files

WIP

parent 632c395e
......@@ -745,14 +745,18 @@ test:
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
region: us-east-1
uploads:
storage_path: tmp/tests/public
object_store:
enabled: false
enabled: true
remote_directory: uploads
direct_upload: true # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
connection:
provider: AWS # Only AWS supported at the moment
aws_access_key_id: AWS_ACCESS_KEY_ID
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
region: us-east-1
provider: AWS
aws_access_key_id: minio
aws_secret_access_key: gdk-minio
aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
region: gdk
endpoint: 'https://60c5d141.ngrok.io'
path_style: true
gitlab:
host: localhost
port: 80
......
require 'webmock'
require 'webmock/rspec'
WebMock.disable_net_connect!(allow_localhost: true)
WebMock.disable_net_connect!(allow_localhost: true, allow: %r{https://\w+.ngrok.io/})
......@@ -77,7 +77,7 @@ describe 'Unicorn' do
end
after(:all) do
WebMock.disable_net_connect!(allow_localhost: true)
WebMock.disable_net_connect!(allow_localhost: true, allow: %r{https://\w+.ngrok.io/})
Process.kill('TERM', @unicorn_master_pid)
end
......
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