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
9e6c4e2c
Commit
9e6c4e2c
authored
Jul 10, 2020
by
Fernando
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pipeline failure
* Flip unit test names * Add custom error for apiApprovalsPath not being provided
parent
e238ceee
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
ee/app/assets/javascripts/vue_shared/license_compliance/store/actions.js
...avascripts/vue_shared/license_compliance/store/actions.js
+4
-1
ee/spec/frontend/vue_shared/license_compliance/store/actions_spec.js
...ntend/vue_shared/license_compliance/store/actions_spec.js
+3
-3
No files found.
ee/app/assets/javascripts/vue_shared/license_compliance/store/actions.js
View file @
9e6c4e2c
...
@@ -121,7 +121,10 @@ export const fetchLicenseCheckApprovalRule = ({ dispatch, state }) => {
...
@@ -121,7 +121,10 @@ export const fetchLicenseCheckApprovalRule = ({ dispatch, state }) => {
Pipelines cannot have approval rules.
Pipelines cannot have approval rules.
*/
*/
if
(
!
state
.
approvalsApiPath
)
{
if
(
!
state
.
approvalsApiPath
)
{
return
dispatch
(
'
receiveLicenseCheckApprovalRuleError
'
);
return
dispatch
(
'
receiveLicenseCheckApprovalRuleError
'
,
new
Error
(
'
approvalsApiPath not provided
'
),
);
}
}
return
axios
return
axios
...
...
ee/spec/frontend/vue_shared/license_compliance/store/actions_spec.js
View file @
9e6c4e2c
...
@@ -530,8 +530,8 @@ describe('License store actions', () => {
...
@@ -530,8 +530,8 @@ describe('License store actions', () => {
);
);
});
});
it
(
'
dispatches request/receive
on error
'
,
done
=>
{
it
(
'
dispatches request/receive
error when no approvalsAPiPath is provided
'
,
done
=>
{
const
error
=
new
Error
(
'
Request failed with status code 500
'
);
const
error
=
new
Error
(
'
approvalsApiPath not provided
'
);
axiosMock
.
onGet
(
approvalsApiPath
).
replyOnce
(
500
);
axiosMock
.
onGet
(
approvalsApiPath
).
replyOnce
(
500
);
testAction
(
testAction
(
...
@@ -547,7 +547,7 @@ describe('License store actions', () => {
...
@@ -547,7 +547,7 @@ describe('License store actions', () => {
);
);
});
});
it
(
'
dispatches request/receive
error when no approvalsAPiPath is provided
'
,
done
=>
{
it
(
'
dispatches request/receive
on error
'
,
done
=>
{
const
error
=
new
Error
(
'
Request failed with status code 500
'
);
const
error
=
new
Error
(
'
Request failed with status code 500
'
);
axiosMock
.
onGet
(
approvalsApiPath
).
replyOnce
(
500
);
axiosMock
.
onGet
(
approvalsApiPath
).
replyOnce
(
500
);
...
...
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