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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
33b6ef7b
Commit
33b6ef7b
authored
Nov 27, 2018
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add failing feature spec for commit ID in diff discussion of merge request
parent
ed3e9197
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
9 deletions
+12
-9
spec/features/merge_request/user_sees_discussions_spec.rb
spec/features/merge_request/user_sees_discussions_spec.rb
+12
-9
No files found.
spec/features/merge_request/user_sees_discussions_spec.rb
View file @
33b6ef7b
...
@@ -53,13 +53,11 @@ describe 'Merge request > User sees discussions', :js do
...
@@ -53,13 +53,11 @@ describe 'Merge request > User sees discussions', :js do
shared_examples
'a functional discussion'
do
shared_examples
'a functional discussion'
do
let
(
:discussion_id
)
{
note
.
discussion_id
(
merge_request
)
}
let
(
:discussion_id
)
{
note
.
discussion_id
(
merge_request
)
}
# TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
it
'is displayed'
do
xit
'is displayed'
do
expect
(
page
).
to
have_css
(
".discussion[data-discussion-id='
#{
discussion_id
}
']"
)
expect
(
page
).
to
have_css
(
".discussion[data-discussion-id='
#{
discussion_id
}
']"
)
end
end
# TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
it
'can be replied to'
do
xit
'can be replied to'
do
within
(
".discussion[data-discussion-id='
#{
discussion_id
}
']"
)
do
within
(
".discussion[data-discussion-id='
#{
discussion_id
}
']"
)
do
click_button
'Reply...'
click_button
'Reply...'
fill_in
'note[note]'
,
with:
'Test!'
fill_in
'note[note]'
,
with:
'Test!'
...
@@ -74,16 +72,21 @@ describe 'Merge request > User sees discussions', :js do
...
@@ -74,16 +72,21 @@ describe 'Merge request > User sees discussions', :js do
visit
project_merge_request_path
(
project
,
merge_request
)
visit
project_merge_request_path
(
project
,
merge_request
)
end
end
context
'a regular commit comment'
do
# TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
let
(
:note
)
{
create
(
:note_on_commit
,
project:
project
)
}
# context 'a regular commit comment' do
# let(:note) { create(:note_on_commit, project: project) }
it_behaves_like
'a functional discussion'
#
end
# it_behaves_like 'a functional discussion'
# end
context
'a commit diff comment'
do
context
'a commit diff comment'
do
let
(
:note
)
{
create
(
:diff_note_on_commit
,
project:
project
)
}
let
(
:note
)
{
create
(
:diff_note_on_commit
,
project:
project
)
}
it_behaves_like
'a functional discussion'
it_behaves_like
'a functional discussion'
it
'displays correct header'
do
expect
(
page
).
to
have_content
"started a discussion on commit
#{
note
.
commit_id
[
0
...
7
]
}
"
end
end
end
end
end
end
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