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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
890b9f3a
Commit
890b9f3a
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MR comment tests
parent
c3bbbff6
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
11 deletions
+3
-11
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+3
-11
No files found.
features/steps/project/project_merge_requests.rb
View file @
890b9f3a
...
...
@@ -116,29 +116,21 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
Then
'I should see a discussion has started on line 185'
do
first_commit
=
merge_request
.
commits
.
first
first_diff
=
first_commit
.
diffs
.
first
page
.
should
have_content
"
#{
current_user
.
name
}
started a discussion on this merge request diff"
page
.
should
have_content
"
#{
first_diff
.
b_path
}
:L185"
page
.
should
have_content
"
app/assets/stylesheets/tree.scss
:L185"
page
.
should
have_content
"Line is wrong"
end
Then
'I should see a discussion has started on commit bcf03b5de6c:L185'
do
first_commit
=
merge_request
.
commits
.
first
first_diff
=
first_commit
.
diffs
.
first
page
.
should
have_content
"
#{
current_user
.
name
}
started a discussion on commit"
page
.
should
have_content
first_commit
.
short_id
(
8
)
page
.
should
have_content
"
#{
first_diff
.
b_path
}
:L185"
page
.
should
have_content
"app/assets/stylesheets/tree.scss:L185"
page
.
should
have_content
"Line is wrong"
end
Then
'I should see a discussion has started on commit bcf03b5de6c'
do
first_commit
=
merge_request
.
st_commits
.
first
first_diff
=
first_commit
.
diffs
.
first
page
.
should
have_content
"
#{
current_user
.
name
}
started a discussion on commit bcf03b5de6c"
page
.
should
have_content
first_commit
.
short_id
(
8
)
page
.
should
have_content
"One comment to rule them all"
page
.
should
have_content
"
#{
first_diff
.
b_path
}
:L185"
page
.
should
have_content
"
app/assets/stylesheets/tree.scss
:L185"
end
def
project
...
...
This diff is collapsed.
Click to expand it.
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