Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
af1dad5b
Commit
af1dad5b
authored
Jan 08, 2021
by
Markus Koller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reenable WebMock with correct settings
parent
93233c54
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
spec/rack_servers/puma_spec.rb
spec/rack_servers/puma_spec.rb
+1
-1
spec/rack_servers/unicorn_spec.rb
spec/rack_servers/unicorn_spec.rb
+1
-1
spec/views/admin/application_settings/general.html.haml_spec.rb
...iews/admin/application_settings/general.html.haml_spec.rb
+1
-1
No files found.
spec/rack_servers/puma_spec.rb
View file @
af1dad5b
...
@@ -44,7 +44,7 @@ RSpec.describe 'Puma' do
...
@@ -44,7 +44,7 @@ RSpec.describe 'Puma' do
end
end
after
(
:all
)
do
after
(
:all
)
do
WebMock
.
disable_net_connect!
(
allow_localhost:
true
)
webmock_enable!
Process
.
kill
(
'TERM'
,
@puma_master_pid
)
Process
.
kill
(
'TERM'
,
@puma_master_pid
)
rescue
Errno
::
ESRCH
rescue
Errno
::
ESRCH
end
end
...
...
spec/rack_servers/unicorn_spec.rb
View file @
af1dad5b
...
@@ -68,7 +68,7 @@ RSpec.describe 'Unicorn' do
...
@@ -68,7 +68,7 @@ RSpec.describe 'Unicorn' do
end
end
after
(
:all
)
do
after
(
:all
)
do
WebMock
.
disable_net_connect!
(
allow_localhost:
true
)
webmock_enable!
Process
.
kill
(
'TERM'
,
@unicorn_master_pid
)
Process
.
kill
(
'TERM'
,
@unicorn_master_pid
)
end
end
...
...
spec/views/admin/application_settings/general.html.haml_spec.rb
View file @
af1dad5b
...
@@ -6,7 +6,7 @@ RSpec.describe 'admin/application_settings/general.html.haml' do
...
@@ -6,7 +6,7 @@ RSpec.describe 'admin/application_settings/general.html.haml' do
let
(
:app_settings
)
{
build
(
:application_setting
)
}
let
(
:app_settings
)
{
build
(
:application_setting
)
}
let
(
:user
)
{
create
(
:admin
)
}
let
(
:user
)
{
create
(
:admin
)
}
describe
'sourcegraph integration'
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/296933'
}
do
describe
'sourcegraph integration'
do
let
(
:sourcegraph_flag
)
{
true
}
let
(
:sourcegraph_flag
)
{
true
}
before
do
before
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment