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
b84c6fb1
Commit
b84c6fb1
authored
Apr 05, 2018
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
031aca80
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
app/models/milestone.rb
app/models/milestone.rb
+2
-2
spec/features/labels_hierarchy_spec.rb
spec/features/labels_hierarchy_spec.rb
+5
-5
spec/javascripts/boards/issue_card_spec.js
spec/javascripts/boards/issue_card_spec.js
+2
-0
No files found.
app/models/milestone.rb
View file @
b84c6fb1
...
@@ -38,8 +38,8 @@ class Milestone < ActiveRecord::Base
...
@@ -38,8 +38,8 @@ class Milestone < ActiveRecord::Base
scope
:for_projects_and_groups
,
->
(
project_ids
,
group_ids
)
do
scope
:for_projects_and_groups
,
->
(
project_ids
,
group_ids
)
do
conditions
=
[]
conditions
=
[]
conditions
<<
arel_table
[
:project_id
].
in
(
project_ids
)
if
project_ids
.
compact
.
any?
conditions
<<
arel_table
[
:project_id
].
in
(
project_ids
)
if
project_ids
&
.
compact
&
.
any?
conditions
<<
arel_table
[
:group_id
].
in
(
group_ids
)
if
group_ids
.
compact
.
any?
conditions
<<
arel_table
[
:group_id
].
in
(
group_ids
)
if
group_ids
&
.
compact
&
.
any?
where
(
conditions
.
reduce
(
:or
))
where
(
conditions
.
reduce
(
:or
))
end
end
...
...
spec/features/labels_hierarchy_spec.rb
View file @
b84c6fb1
...
@@ -115,17 +115,17 @@ feature 'Labels Hierarchy', :js, :nested_groups do
...
@@ -115,17 +115,17 @@ feature 'Labels Hierarchy', :js, :nested_groups do
it
'filters by descendant group labels'
do
it
'filters by descendant group labels'
do
wait_for_requests
wait_for_requests
if
board
pending
(
"Waiting for https://gitlab.com/gitlab-org/gitlab-ce/issues/44270"
)
select_label_on_dropdown
(
group_label_3
.
title
)
select_label_on_dropdown
(
group_label_3
.
title
)
if
board
expect
(
page
).
to
have_selector
(
'.card-title'
)
do
|
card
|
expect
(
card
).
not_to
have_selector
(
'a'
,
text:
labeled_issue_2
.
title
)
end
expect
(
page
).
to
have_selector
(
'.card-title'
)
do
|
card
|
expect
(
page
).
to
have_selector
(
'.card-title'
)
do
|
card
|
expect
(
card
).
to
have_selector
(
'a'
,
text:
labeled_issue_3
.
title
)
expect
(
card
).
to
have_selector
(
'a'
,
text:
labeled_issue_3
.
title
)
end
end
else
else
select_label_on_dropdown
(
group_label_3
.
title
)
expect_issues_list_count
(
1
)
expect_issues_list_count
(
1
)
expect
(
page
).
to
have_selector
(
'span.issue-title-text'
,
text:
labeled_issue_3
.
title
)
expect
(
page
).
to
have_selector
(
'span.issue-title-text'
,
text:
labeled_issue_3
.
title
)
end
end
...
...
spec/javascripts/boards/issue_card_spec.js
View file @
b84c6fb1
...
@@ -42,6 +42,8 @@ describe('Issue card component', () => {
...
@@ -42,6 +42,8 @@ describe('Issue card component', () => {
confidential
:
false
,
confidential
:
false
,
labels
:
[
list
.
label
],
labels
:
[
list
.
label
],
assignees
:
[],
assignees
:
[],
reference_path
:
'
#1
'
,
real_path
:
'
/test/1
'
});
});
component
=
new
Vue
({
component
=
new
Vue
({
...
...
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