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
Léo-Paul Géneau
gitlab-ce
Commits
953db847
Commit
953db847
authored
Jan 15, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More fixes for test
parent
211c06e4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+4
-6
features/steps/shared/diff_note.rb
features/steps/shared/diff_note.rb
+2
-0
features/steps/shared/note.rb
features/steps/shared/note.rb
+6
-2
No files found.
features/steps/project/project_merge_requests.rb
View file @
953db847
...
...
@@ -103,21 +103,19 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
And
'I leave a comment on the diff page'
do
within
(
:xpath
,
"//div[@class='note-form-holder']"
)
do
within
(
'.js-temp-notes-holder'
)
do
fill_in
"note_note"
,
with:
"One comment to rule them all"
click_button
"Add Comment"
end
end
And
'I leave a comment like "Line is wrong" on line 185 of the first file'
do
save_and_open_page
within
(
:xpath
,
"//div[@class='diff_file'][1]"
)
do
click_link
"add-diff-line-note-0_185_185"
end
find
(
"#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185 .add-diff-note"
).
click
within
(
:xpath
,
"//div[@class='line-note-form-holder']
"
)
do
within
(
".js-temp-notes-holder
"
)
do
fill_in
"note_note"
,
with:
"Line is wrong"
click_button
"Add Comment"
sleep
0.05
end
end
...
...
features/steps/shared/diff_note.rb
View file @
953db847
...
...
@@ -8,6 +8,7 @@ module SharedDiffNote
end
Given
'I delete a diff comment'
do
sleep
1
within
(
".diff_file"
)
do
first
(
".js-note-delete"
).
trigger
(
"click"
)
end
...
...
@@ -25,6 +26,7 @@ module SharedDiffNote
fill_in
"note[note]"
,
with:
"Typo, please fix"
#click_button("Add Comment")
find
(
".js-comment-button"
).
trigger
(
"click"
)
sleep
0.05
end
end
...
...
features/steps/shared/note.rb
View file @
953db847
...
...
@@ -39,8 +39,6 @@ module SharedNote
end
end
Then
'I should not see a comment saying "XML attached"'
do
page
.
should_not
have_css
(
".note"
)
end
...
...
@@ -113,4 +111,10 @@ module SharedNote
Then
'I should see project wall note "my special test message"'
do
page
.
should
have_content
"my special test message"
end
Then
'I should see comment "XML attached"'
do
within
(
".note"
)
do
page
.
should
have_content
(
"XML attached"
)
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