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
8bf5936d
Commit
8bf5936d
authored
May 02, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Multiple issue assignees] Fix features
parent
ec6b1b0a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
app/models/global_milestone.rb
app/models/global_milestone.rb
+1
-1
features/steps/dashboard/dashboard.rb
features/steps/dashboard/dashboard.rb
+1
-1
features/steps/group/milestones.rb
features/steps/group/milestones.rb
+2
-2
features/steps/groups.rb
features/steps/groups.rb
+2
-2
spec/features/issues/form_spec.rb
spec/features/issues/form_spec.rb
+3
-3
No files found.
app/models/global_milestone.rb
View file @
8bf5936d
...
@@ -86,7 +86,7 @@ class GlobalMilestone
...
@@ -86,7 +86,7 @@ class GlobalMilestone
end
end
def
issues
def
issues
@issues
||=
Issue
.
of_milestones
(
milestoneish_ids
).
includes
(
:project
,
:assignee
,
:labels
)
@issues
||=
Issue
.
of_milestones
(
milestoneish_ids
).
includes
(
:project
,
:assignee
s
,
:labels
)
end
end
def
merge_requests
def
merge_requests
...
...
features/steps/dashboard/dashboard.rb
View file @
8bf5936d
...
@@ -77,7 +77,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
...
@@ -77,7 +77,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
step
'project "Shop" has issue "Bugfix1" with label "feature"'
do
step
'project "Shop" has issue "Bugfix1" with label "feature"'
do
project
=
Project
.
find_by
(
name:
"Shop"
)
project
=
Project
.
find_by
(
name:
"Shop"
)
issue
=
create
(
:issue
,
title:
"Bugfix1"
,
project:
project
,
assignee
:
current_user
)
issue
=
create
(
:issue
,
title:
"Bugfix1"
,
project:
project
,
assignee
s:
[
current_user
]
)
issue
.
labels
<<
project
.
labels
.
find_by
(
title:
'feature'
)
issue
.
labels
<<
project
.
labels
.
find_by
(
title:
'feature'
)
end
end
end
end
features/steps/group/milestones.rb
View file @
8bf5936d
...
@@ -110,7 +110,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
...
@@ -110,7 +110,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
create
:issue
,
create
:issue
,
project:
project
,
project:
project
,
assignee
:
current_user
,
assignee
s:
[
current_user
]
,
author:
current_user
,
author:
current_user
,
milestone:
milestone
milestone:
milestone
...
@@ -122,7 +122,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
...
@@ -122,7 +122,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
issue
=
create
:issue
,
issue
=
create
:issue
,
project:
project
,
project:
project
,
assignee
:
current_user
,
assignee
s:
[
current_user
]
,
author:
current_user
,
author:
current_user
,
milestone:
milestone
milestone:
milestone
...
...
features/steps/groups.rb
View file @
8bf5936d
...
@@ -61,7 +61,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
...
@@ -61,7 +61,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
step
'project from group "Owned" has issues assigned to me'
do
step
'project from group "Owned" has issues assigned to me'
do
create
:issue
,
create
:issue
,
project:
project
,
project:
project
,
assignee
:
current_user
,
assignee
s:
[
current_user
]
,
author:
current_user
author:
current_user
end
end
...
@@ -168,7 +168,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
...
@@ -168,7 +168,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
step
'the archived project have some issues'
do
step
'the archived project have some issues'
do
create
:issue
,
create
:issue
,
project:
@archived_project
,
project:
@archived_project
,
assignee
:
current_user
,
assignee
s:
[
current_user
]
,
author:
current_user
author:
current_user
end
end
...
...
spec/features/issues/form_spec.rb
View file @
8bf5936d
...
@@ -31,14 +31,14 @@ describe 'New/edit issue', feature: true, js: true do
...
@@ -31,14 +31,14 @@ describe 'New/edit issue', feature: true, js: true do
page
.
within
'.dropdown-menu-user'
do
page
.
within
'.dropdown-menu-user'
do
click_link
user2
.
name
click_link
user2
.
name
end
end
expect
(
find
(
'input[name="issue[assignee_id]"]'
,
visible:
false
).
value
).
to
match
(
user2
.
id
.
to_s
)
expect
(
find
(
'input[name="issue[assignee_id
s
]"]'
,
visible:
false
).
value
).
to
match
(
user2
.
id
.
to_s
)
page
.
within
'.js-assignee-search'
do
page
.
within
'.js-assignee-search'
do
expect
(
page
).
to
have_content
user2
.
name
expect
(
page
).
to
have_content
user2
.
name
end
end
expect
(
find
(
'a'
,
text:
'Assign to me'
)).
to
be_visible
expect
(
find
(
'a'
,
text:
'Assign to me'
)).
to
be_visible
click_link
'Assign to me'
click_link
'Assign to me'
expect
(
find
(
'input[name="issue[assignee_id]"]'
,
visible:
false
).
value
).
to
match
(
user
.
id
.
to_s
)
expect
(
find
(
'input[name="issue[assignee_id
s
]"]'
,
visible:
false
).
value
).
to
match
(
user
.
id
.
to_s
)
page
.
within
'.js-assignee-search'
do
page
.
within
'.js-assignee-search'
do
expect
(
page
).
to
have_content
user
.
name
expect
(
page
).
to
have_content
user
.
name
end
end
...
@@ -125,7 +125,7 @@ describe 'New/edit issue', feature: true, js: true do
...
@@ -125,7 +125,7 @@ describe 'New/edit issue', feature: true, js: true do
end
end
it
'allows user to update issue'
do
it
'allows user to update issue'
do
expect
(
find
(
'input[name="issue[assignee_id]"]'
,
visible:
false
).
value
).
to
match
(
user
.
id
.
to_s
)
expect
(
find
(
'input[name="issue[assignee_id
s
]"]'
,
visible:
false
).
value
).
to
match
(
user
.
id
.
to_s
)
expect
(
find
(
'input[name="issue[milestone_id]"]'
,
visible:
false
).
value
).
to
match
(
milestone
.
id
.
to_s
)
expect
(
find
(
'input[name="issue[milestone_id]"]'
,
visible:
false
).
value
).
to
match
(
milestone
.
id
.
to_s
)
expect
(
find
(
'a'
,
text:
'Assign to me'
,
visible:
false
)).
not_to
be_visible
expect
(
find
(
'a'
,
text:
'Assign to me'
,
visible:
false
)).
not_to
be_visible
...
...
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