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
37946c88
Commit
37946c88
authored
Dec 08, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed karma
parent
b9aa6772
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
app/assets/javascripts/boards/components/board_form.vue
app/assets/javascripts/boards/components/board_form.vue
+3
-2
spec/javascripts/epics/epic_show/components/epic_show_app_spec.js
...ascripts/epics/epic_show/components/epic_show_app_spec.js
+2
-2
No files found.
app/assets/javascripts/boards/components/board_form.vue
View file @
37946c88
...
...
@@ -3,6 +3,7 @@
import
Flash
from
'
~/flash
'
;
import
PopupDialog
from
'
~/vue_shared/components/popup_dialog.vue
'
;
import
{
visitUrl
}
from
'
../../lib/utils/url_utility
'
;
import
BoardMilestoneSelect
from
'
./milestone_select.vue
'
;
import
BoardWeightSelect
from
'
./weight_select.vue
'
;
import
BoardLabelsSelect
from
'
./labels_select.vue
'
;
...
...
@@ -138,7 +139,7 @@ export default {
if
(
this
.
isDeleteForm
)
{
gl
.
boardService
.
deleteBoard
(
this
.
currentBoard
)
.
then
(()
=>
{
gl
.
utils
.
visitUrl
(
Store
.
rootPath
);
visitUrl
(
Store
.
rootPath
);
})
.
catch
(()
=>
{
Flash
(
'
Failed to delete board. Please try again.
'
);
...
...
@@ -148,7 +149,7 @@ export default {
gl
.
boardService
.
createBoard
(
this
.
board
)
.
then
(
resp
=>
resp
.
json
())
.
then
((
data
)
=>
{
gl
.
utils
.
visitUrl
(
data
.
board_path
);
visitUrl
(
data
.
board_path
);
})
.
catch
(()
=>
{
Flash
(
'
Unable to save your changes. Please try again.
'
);
...
...
spec/javascripts/epics/epic_show/components/epic_show_app_spec.js
View file @
37946c88
...
...
@@ -4,7 +4,7 @@ import epicHeader from 'ee/epics/epic_show/components/epic_header.vue';
import
epicSidebar
from
'
ee/epics/sidebar/components/sidebar_app.vue
'
;
import
issuableApp
from
'
~/issue_show/components/app.vue
'
;
import
issuableAppEventHub
from
'
~/issue_show/event_hub
'
;
import
'
~/lib/utils/url_utility
'
;
import
*
as
urlUtils
from
'
~/lib/utils/url_utility
'
;
import
mountComponent
from
'
../../../helpers/vue_mount_component_helper
'
;
import
{
props
}
from
'
../mock_data
'
;
import
issueShowData
from
'
../../../issue_show/mock_data
'
;
...
...
@@ -102,7 +102,7 @@ describe('EpicShowApp', () => {
const
deleteIssuable
=
jasmine
.
createSpy
();
issuableAppEventHub
.
$on
(
'
delete.issuable
'
,
deleteIssuable
);
spyOn
(
window
,
'
confirm
'
).
and
.
returnValue
(
true
);
spyOn
(
gl
.
u
tils
,
'
visitUrl
'
).
and
.
callFake
(()
=>
{});
spyOn
(
urlU
tils
,
'
visitUrl
'
).
and
.
callFake
(()
=>
{});
vm
.
$el
.
querySelector
(
'
.detail-page-header .btn-remove
'
).
click
();
expect
(
deleteIssuable
).
toHaveBeenCalled
();
...
...
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