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
8b9dd104
Commit
8b9dd104
authored
Dec 29, 2021
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failing specs due to renaming
parent
d6721845
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
app/presenters/service_hook_presenter.rb
app/presenters/service_hook_presenter.rb
+2
-2
ee/spec/helpers/vulnerabilities_helper_spec.rb
ee/spec/helpers/vulnerabilities_helper_spec.rb
+1
-1
spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
.../components/__snapshots__/dashboard_template_spec.js.snap
+1
-1
spec/presenters/service_hook_presenter_spec.rb
spec/presenters/service_hook_presenter_spec.rb
+2
-2
spec/presenters/web_hook_log_presenter_spec.rb
spec/presenters/web_hook_log_presenter_spec.rb
+2
-2
No files found.
app/presenters/service_hook_presenter.rb
View file @
8b9dd104
...
...
@@ -4,10 +4,10 @@ class ServiceHookPresenter < Gitlab::View::Presenter::Delegated
presents
::
ServiceHook
,
as: :service_hook
def
logs_details_path
(
log
)
project_
service
_hook_log_path
(
integration
.
project
,
integration
,
log
)
project_
integration
_hook_log_path
(
integration
.
project
,
integration
,
log
)
end
def
logs_retry_path
(
log
)
retry_project_
service
_hook_log_path
(
integration
.
project
,
integration
,
log
)
retry_project_
integration
_hook_log_path
(
integration
.
project
,
integration
,
log
)
end
end
ee/spec/helpers/vulnerabilities_helper_spec.rb
View file @
8b9dd104
...
...
@@ -66,7 +66,7 @@ RSpec.describe VulnerabilitiesHelper do
new_issue_url:
"/
#{
project
.
full_path
}
/-/issues/new?vulnerability_id=
#{
vulnerability
.
id
}
"
,
create_jira_issue_url:
nil
,
related_jira_issues_path:
"/
#{
project
.
full_path
}
/-/integrations/jira/issues?vulnerability_ids%5B%5D=
#{
vulnerability
.
id
}
"
,
jira_integration_settings_path:
"/
#{
project
.
full_path
}
/-/
service
s/jira/edit"
,
jira_integration_settings_path:
"/
#{
project
.
full_path
}
/-/
integration
s/jira/edit"
,
has_mr:
anything
,
create_mr_url:
"/
#{
project
.
full_path
}
/-/vulnerability_feedback"
,
discussions_url:
"/
#{
project
.
full_path
}
/-/security/vulnerabilities/
#{
vulnerability
.
id
}
/discussions"
,
...
...
spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
View file @
8b9dd104
...
...
@@ -128,7 +128,7 @@ exports[`Dashboard template matches the default snapshot 1`] = `
emptynodatasvgpath="/images/illustrations/monitoring/no_data.svg"
emptyunabletoconnectsvgpath="/images/illustrations/monitoring/unable_to_connect.svg"
selectedstate="gettingStarted"
settingspath="/monitoring/monitor-project/-/
service
s/prometheus/edit"
settingspath="/monitoring/monitor-project/-/
integration
s/prometheus/edit"
/>
</div>
`;
spec/presenters/service_hook_presenter_spec.rb
View file @
8b9dd104
...
...
@@ -12,7 +12,7 @@ RSpec.describe ServiceHookPresenter do
subject
{
service_hook
.
present
.
logs_details_path
(
web_hook_log
)
}
let
(
:expected_path
)
do
"/
#{
project
.
namespace
.
path
}
/
#{
project
.
name
}
/-/
service
s/
#{
integration
.
to_param
}
/hook_logs/
#{
web_hook_log
.
id
}
"
"/
#{
project
.
namespace
.
path
}
/
#{
project
.
name
}
/-/
integration
s/
#{
integration
.
to_param
}
/hook_logs/
#{
web_hook_log
.
id
}
"
end
it
{
is_expected
.
to
eq
(
expected_path
)
}
...
...
@@ -22,7 +22,7 @@ RSpec.describe ServiceHookPresenter do
subject
{
service_hook
.
present
.
logs_retry_path
(
web_hook_log
)
}
let
(
:expected_path
)
do
"/
#{
project
.
namespace
.
path
}
/
#{
project
.
name
}
/-/
service
s/
#{
integration
.
to_param
}
/hook_logs/
#{
web_hook_log
.
id
}
/retry"
"/
#{
project
.
namespace
.
path
}
/
#{
project
.
name
}
/-/
integration
s/
#{
integration
.
to_param
}
/hook_logs/
#{
web_hook_log
.
id
}
/retry"
end
it
{
is_expected
.
to
eq
(
expected_path
)
}
...
...
spec/presenters/web_hook_log_presenter_spec.rb
View file @
8b9dd104
...
...
@@ -21,7 +21,7 @@ RSpec.describe WebHookLogPresenter do
let
(
:web_hook
)
{
create
(
:service_hook
,
integration:
integration
)
}
let
(
:integration
)
{
create
(
:drone_ci_integration
,
project:
project
)
}
it
{
is_expected
.
to
eq
(
project_
service
_hook_log_path
(
project
,
integration
,
web_hook_log
))
}
it
{
is_expected
.
to
eq
(
project_
integration
_hook_log_path
(
project
,
integration
,
web_hook_log
))
}
end
end
...
...
@@ -41,7 +41,7 @@ RSpec.describe WebHookLogPresenter do
let
(
:web_hook
)
{
create
(
:service_hook
,
integration:
integration
)
}
let
(
:integration
)
{
create
(
:drone_ci_integration
,
project:
project
)
}
it
{
is_expected
.
to
eq
(
retry_project_
service
_hook_log_path
(
project
,
integration
,
web_hook_log
))
}
it
{
is_expected
.
to
eq
(
retry_project_
integration
_hook_log_path
(
project
,
integration
,
web_hook_log
))
}
end
end
end
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