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
iv
gitlab-ce
Commits
74c82ae3
Commit
74c82ae3
authored
Oct 18, 2014
by
Vinnie Okada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix houndci warnings
parent
f9e423b4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
features/steps/shared/diff_note.rb
features/steps/shared/diff_note.rb
+2
-2
features/steps/shared/markdown.rb
features/steps/shared/markdown.rb
+3
-3
features/steps/shared/note.rb
features/steps/shared/note.rb
+1
-1
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_merge_requests_spec.rb
+4
-4
No files found.
features/steps/shared/diff_note.rb
View file @
74c82ae3
...
@@ -152,8 +152,8 @@ module SharedDiffNote
...
@@ -152,8 +152,8 @@ module SharedDiffNote
step
'I should see two separate previews'
do
step
'I should see two separate previews'
do
within
(
diff_file_selector
)
do
within
(
diff_file_selector
)
do
expect
(
page
).
to
have_css
(
'.js-md-preview'
,
count:
2
)
expect
(
page
).
to
have_css
(
'.js-md-preview'
,
count:
2
)
expect
(
page
).
to
have_content
(
"Should fix it"
)
expect
(
page
).
to
have_content
(
'Should fix it'
)
expect
(
page
).
to
have_content
(
"DRY this up"
)
expect
(
page
).
to
have_content
(
'DRY this up'
)
end
end
end
end
...
...
features/steps/shared/markdown.rb
View file @
74c82ae3
...
@@ -60,7 +60,7 @@ EOT
...
@@ -60,7 +60,7 @@ EOT
end
end
step
'The Markdown preview tab should say there is nothing to do'
do
step
'The Markdown preview tab should say there is nothing to do'
do
within
(
".gfm-form"
)
do
within
(
'.gfm-form'
)
do
find
(
'.js-md-preview-button'
).
click
find
(
'.js-md-preview-button'
).
click
expect
(
find
(
'.js-md-preview'
)).
to
have_content
(
'Nothing to preview.'
)
expect
(
find
(
'.js-md-preview'
)).
to
have_content
(
'Nothing to preview.'
)
end
end
...
@@ -79,7 +79,7 @@ EOT
...
@@ -79,7 +79,7 @@ EOT
end
end
step
'The Markdown preview tab should display rendered Markdown'
do
step
'The Markdown preview tab should display rendered Markdown'
do
within
(
".gfm-form"
)
do
within
(
'.gfm-form'
)
do
find
(
'.js-md-preview-button'
).
click
find
(
'.js-md-preview-button'
).
click
expect
(
find
(
'.js-md-preview'
)).
to
have_css
(
'img.emoji'
)
expect
(
find
(
'.js-md-preview'
)).
to
have_css
(
'img.emoji'
)
end
end
...
@@ -92,7 +92,7 @@ EOT
...
@@ -92,7 +92,7 @@ EOT
step
'I preview a description text like "Bug fixed :smile:"'
do
step
'I preview a description text like "Bug fixed :smile:"'
do
within
(
'.gfm-form'
)
do
within
(
'.gfm-form'
)
do
fill_in
'Description'
,
with:
'Bug fixed :smile:'
fill_in
'Description'
,
with:
'Bug fixed :smile:'
find
(
'.js-md-preview-button'
).
click
()
find
(
'.js-md-preview-button'
).
click
end
end
end
end
...
...
features/steps/shared/note.rb
View file @
74c82ae3
...
@@ -35,7 +35,7 @@ module SharedNote
...
@@ -35,7 +35,7 @@ module SharedNote
step
'I write a comment like ":+1: Nice"'
do
step
'I write a comment like ":+1: Nice"'
do
within
(
".js-main-target-form"
)
do
within
(
".js-main-target-form"
)
do
fill_in
"note[note]"
,
with:
":+1: Nice"
fill_in
'note[note]'
,
with:
':+1: Nice'
end
end
end
end
...
...
spec/features/notes_on_merge_requests_spec.rb
View file @
74c82ae3
...
@@ -32,8 +32,8 @@ describe 'Comments' do
...
@@ -32,8 +32,8 @@ describe 'Comments' do
end
end
it
'should have enable submit button and preview button'
do
it
'should have enable submit button and preview button'
do
within
(
".js-main-target-form"
)
do
within
(
'.js-main-target-form'
)
do
expect
(
page
).
not_to
have_css
(
".js-comment-button[disabled]"
)
expect
(
page
).
not_to
have_css
(
'.js-comment-button[disabled]'
)
expect
(
page
).
to
have_css
(
'.js-md-preview-button'
)
expect
(
page
).
to
have_css
(
'.js-md-preview-button'
)
end
end
end
end
...
@@ -51,8 +51,8 @@ describe 'Comments' do
...
@@ -51,8 +51,8 @@ describe 'Comments' do
it
'should be added and form reset'
do
it
'should be added and form reset'
do
should
have_content
(
"This is awsome!"
)
should
have_content
(
"This is awsome!"
)
within
(
".js-main-target-form"
)
do
within
(
'.js-main-target-form'
)
do
expect
(
page
).
to
have_no_field
(
"note[note]"
,
with:
"This is awesome!"
)
expect
(
page
).
to
have_no_field
(
'note[note]'
,
with:
'This is awesome!'
)
expect
(
page
).
not_to
have_css
(
'.js-md-preview'
,
visible:
true
)
expect
(
page
).
not_to
have_css
(
'.js-md-preview'
,
visible:
true
)
end
end
within
(
".js-main-target-form"
)
{
should
have_css
(
".js-note-text"
,
visible:
true
)
}
within
(
".js-main-target-form"
)
{
should
have_css
(
".js-note-text"
,
visible:
true
)
}
...
...
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