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
8f5da962
Commit
8f5da962
authored
Jun 01, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed boards specs
added key to assignee avatar loop
parent
3a4b3a19
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
8 deletions
+9
-8
app/assets/javascripts/boards/boards_bundle.js
app/assets/javascripts/boards/boards_bundle.js
+1
-1
app/assets/javascripts/boards/components/issue_card_inner.js
app/assets/javascripts/boards/components/issue_card_inner.js
+1
-0
app/assets/javascripts/boards/components/modal/footer.js
app/assets/javascripts/boards/components/modal/footer.js
+1
-1
spec/features/boards/add_issues_modal_spec.rb
spec/features/boards/add_issues_modal_spec.rb
+2
-2
spec/features/boards/sidebar_spec.rb
spec/features/boards/sidebar_spec.rb
+4
-4
No files found.
app/assets/javascripts/boards/boards_bundle.js
View file @
8f5da962
...
...
@@ -128,7 +128,7 @@ $(() => {
},
computed
:
{
disabled
()
{
return
!
this
.
store
.
lists
.
filter
(
list
=>
list
.
type
!==
'
blank
'
&&
list
.
type
!==
'
done
'
).
length
;
return
!
this
.
store
.
lists
.
filter
(
list
=>
!
list
.
preset
).
length
;
},
tooltipTitle
()
{
if
(
this
.
disabled
)
{
...
...
app/assets/javascripts/boards/components/issue_card_inner.js
View file @
8f5da962
...
...
@@ -152,6 +152,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
<div class="card-assignee">
<user-avatar-link
v-for="(assignee, index) in issue.assignees"
:key="assignee.id"
v-if="shouldRenderAssignee(index)"
class="js-no-trigger"
:link-href="assigneeUrl(assignee)"
...
...
app/assets/javascripts/boards/components/modal/footer.js
View file @
8f5da962
...
...
@@ -26,7 +26,7 @@ gl.issueBoards.ModalFooter = Vue.extend({
},
methods
:
{
addIssues
()
{
const
list
=
this
.
modal
.
selectedList
||
this
.
state
.
lists
[
0
];
const
list
=
this
.
modal
.
selectedList
||
this
.
state
.
lists
[
1
];
const
selectedIssues
=
ModalStore
.
getSelectedIssues
();
const
issueIds
=
selectedIssues
.
map
(
issue
=>
issue
.
globalId
);
...
...
spec/features/boards/add_issues_modal_spec.rb
View file @
8f5da962
...
...
@@ -231,7 +231,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
click_button
'Add 1 issue'
end
page
.
within
(
fi
rst
(
'.board
'
))
do
page
.
within
(
fi
nd
(
'.board:nth-child(2)
'
))
do
expect
(
page
).
to
have_selector
(
'.card'
)
end
end
...
...
@@ -247,7 +247,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
click_button
'Add 1 issue'
end
page
.
within
(
find
(
'.board:nth-child(
2
)'
))
do
page
.
within
(
find
(
'.board:nth-child(
3
)'
))
do
expect
(
page
).
to
have_selector
(
'.card'
)
end
end
...
...
spec/features/boards/sidebar_spec.rb
View file @
8f5da962
...
...
@@ -13,7 +13,7 @@ describe 'Issue Boards', feature: true, js: true do
let!
(
:issue2
)
{
create
(
:labeled_issue
,
project:
project
,
labels:
[
development
,
stretch
],
relative_position:
1
)
}
let
(
:board
)
{
create
(
:board
,
project:
project
)
}
let!
(
:list
)
{
create
(
:list
,
board:
board
,
label:
development
,
position:
0
)
}
let
(
:card
)
{
fi
rst
(
'.board
'
).
first
(
'.card'
)
}
let
(
:card
)
{
fi
nd
(
'.board:nth-child(2)
'
).
first
(
'.card'
)
}
before
do
Timecop
.
freeze
...
...
@@ -74,7 +74,7 @@ describe 'Issue Boards', feature: true, js: true do
wait_for_requests
page
.
within
(
fi
rst
(
'.board
'
))
do
page
.
within
(
fi
nd
(
'.board:nth-child(2)
'
))
do
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
end
end
...
...
@@ -101,7 +101,7 @@ describe 'Issue Boards', feature: true, js: true do
end
it
'removes the assignee'
do
card_two
=
fi
rst
(
'.board
'
).
find
(
'.card:nth-child(2)'
)
card_two
=
fi
nd
(
'.board:nth-child(2)
'
).
find
(
'.card:nth-child(2)'
)
click_card
(
card_two
)
page
.
within
(
'.assignee'
)
do
...
...
@@ -154,7 +154,7 @@ describe 'Issue Boards', feature: true, js: true do
expect
(
page
).
to
have_content
(
user
.
name
)
end
page
.
within
(
fi
rst
(
'.board
'
))
do
page
.
within
(
fi
nd
(
'.board:nth-child(2)
'
))
do
find
(
'.card:nth-child(2)'
).
trigger
(
'click'
)
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