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
c5619d23
Commit
c5619d23
authored
Jun 12, 2019
by
Michel Engelen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated tests for change in !29553
parent
5320e595
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
...eate_issue_for_single_discussion_in_merge_request_spec.rb
+3
-3
No files found.
spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
View file @
c5619d23
...
@@ -7,7 +7,7 @@ describe 'Resolve an open discussion in a merge request by creating an issue', :
...
@@ -7,7 +7,7 @@ describe 'Resolve an open discussion in a merge request by creating an issue', :
let!
(
:discussion
)
{
create
(
:diff_note_on_merge_request
,
noteable:
merge_request
,
project:
project
).
to_discussion
}
let!
(
:discussion
)
{
create
(
:diff_note_on_merge_request
,
noteable:
merge_request
,
project:
project
).
to_discussion
}
def
resolve_discussion_selector
def
resolve_discussion_selector
title
=
'Resolve this
discussion
in a new issue'
title
=
'Resolve this
thread
in a new issue'
url
=
new_project_issue_path
(
project
,
discussion_to_resolve:
discussion
.
id
,
merge_request_to_resolve_discussions_of:
merge_request
.
iid
)
url
=
new_project_issue_path
(
project
,
discussion_to_resolve:
discussion
.
id
,
merge_request_to_resolve_discussions_of:
merge_request
.
iid
)
"a[data-original-title=
\"
#{
title
}
\"
][href=
\"
#{
url
}
\"
]"
"a[data-original-title=
\"
#{
title
}
\"
][href=
\"
#{
url
}
\"
]"
end
end
...
@@ -32,7 +32,7 @@ describe 'Resolve an open discussion in a merge request by creating an issue', :
...
@@ -32,7 +32,7 @@ describe 'Resolve an open discussion in a merge request by creating an issue', :
context
'resolving the discussion'
do
context
'resolving the discussion'
do
before
do
before
do
click_button
'Resolve
discussion
'
click_button
'Resolve
thread
'
end
end
it
'hides the link for creating a new issue'
do
it
'hides the link for creating a new issue'
do
...
@@ -41,7 +41,7 @@ describe 'Resolve an open discussion in a merge request by creating an issue', :
...
@@ -41,7 +41,7 @@ describe 'Resolve an open discussion in a merge request by creating an issue', :
it
'shows the link for creating a new issue when unresolving a discussion'
do
it
'shows the link for creating a new issue when unresolving a discussion'
do
page
.
within
'.diff-content'
do
page
.
within
'.diff-content'
do
click_button
'Unresolve
discussion
'
click_button
'Unresolve
thread
'
end
end
expect
(
page
).
to
have_css
resolve_discussion_selector
expect
(
page
).
to
have_css
resolve_discussion_selector
...
...
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