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
Jérome Perrin
gitlab-ce
Commits
f1235491
Commit
f1235491
authored
Sep 08, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move write_note into SlashCommandsHelper and update other dependent specs
parent
65eadf98
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
21 deletions
+24
-21
spec/features/issues/user_uses_slash_commands_spec.rb
spec/features/issues/user_uses_slash_commands_spec.rb
+7
-8
spec/features/merge_requests/user_uses_slash_commands_spec.rb
.../features/merge_requests/user_uses_slash_commands_spec.rb
+6
-4
spec/support/issuable_slash_commands_shared_examples.rb
spec/support/issuable_slash_commands_shared_examples.rb
+1
-9
spec/support/slash_commands_helpers.rb
spec/support/slash_commands_helpers.rb
+10
-0
No files found.
spec/features/issues/user_uses_slash_commands_spec.rb
View file @
f1235491
require
'rails_helper'
require
'rails_helper'
feature
'Issues > User uses slash commands'
,
feature:
true
,
js:
true
do
feature
'Issues > User uses slash commands'
,
feature:
true
,
js:
true
do
include
SlashCommandsHelpers
include
WaitForAjax
include
WaitForAjax
it_behaves_like
'issuable record that supports slash commands in its description and notes'
,
:issue
do
it_behaves_like
'issuable record that supports slash commands in its description and notes'
,
:issue
do
...
@@ -17,14 +18,15 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
...
@@ -17,14 +18,15 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
end
end
after
do
wait_for_ajax
end
describe
'adding a due date from note'
do
describe
'adding a due date from note'
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
it
'does not create a note, and sets the due date accordingly'
do
it
'does not create a note, and sets the due date accordingly'
do
page
.
within
(
'.js-main-target-form'
)
do
write_note
(
"/due 2016-08-28"
)
fill_in
'note[note]'
,
with:
"/due 2016-08-28"
click_button
'Comment'
end
expect
(
page
).
not_to
have_content
'/due 2016-08-28'
expect
(
page
).
not_to
have_content
'/due 2016-08-28'
expect
(
page
).
to
have_content
'Your commands have been executed!'
expect
(
page
).
to
have_content
'Your commands have been executed!'
...
@@ -41,10 +43,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
...
@@ -41,10 +43,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
it
'does not create a note, and removes the due date accordingly'
do
it
'does not create a note, and removes the due date accordingly'
do
expect
(
issue
.
due_date
).
to
eq
Date
.
new
(
2016
,
8
,
28
)
expect
(
issue
.
due_date
).
to
eq
Date
.
new
(
2016
,
8
,
28
)
page
.
within
(
'.js-main-target-form'
)
do
write_note
(
"/remove_due_date"
)
fill_in
'note[note]'
,
with:
"/remove_due_date"
click_button
'Comment'
end
expect
(
page
).
not_to
have_content
'/remove_due_date'
expect
(
page
).
not_to
have_content
'/remove_due_date'
expect
(
page
).
to
have_content
'Your commands have been executed!'
expect
(
page
).
to
have_content
'Your commands have been executed!'
...
...
spec/features/merge_requests/user_uses_slash_commands_spec.rb
View file @
f1235491
require
'rails_helper'
require
'rails_helper'
feature
'Merge Requests > User uses slash commands'
,
feature:
true
,
js:
true
do
feature
'Merge Requests > User uses slash commands'
,
feature:
true
,
js:
true
do
include
SlashCommandsHelpers
include
WaitForAjax
include
WaitForAjax
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
...
@@ -20,12 +21,13 @@ feature 'Merge Requests > User uses slash commands', feature: true, js: true do
...
@@ -20,12 +21,13 @@ feature 'Merge Requests > User uses slash commands', feature: true, js: true do
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
end
it
'does not recognize the command nor create a note'
do
after
do
page
.
within
(
'.js-main-target-form'
)
do
wait_for_ajax
fill_in
'note[note]'
,
with:
"/due 2016-08-28"
click_button
'Comment'
end
end
it
'does not recognize the command nor create a note'
do
write_note
(
"/due 2016-08-28"
)
expect
(
page
).
not_to
have_content
'/due 2016-08-28'
expect
(
page
).
not_to
have_content
'/due 2016-08-28'
end
end
end
end
...
...
spec/support/issuable_slash_commands_shared_examples.rb
View file @
f1235491
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
# It takes a `issuable_type`, and expect an `issuable`.
# It takes a `issuable_type`, and expect an `issuable`.
shared_examples
'issuable record that supports slash commands in its description and notes'
do
|
issuable_type
|
shared_examples
'issuable record that supports slash commands in its description and notes'
do
|
issuable_type
|
include
SlashCommandsHelpers
include
WaitForAjax
include
WaitForAjax
let
(
:master
)
{
create
(
:user
)
}
let
(
:master
)
{
create
(
:user
)
}
...
@@ -25,15 +26,6 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -25,15 +26,6 @@ shared_examples 'issuable record that supports slash commands in its description
wait_for_ajax
wait_for_ajax
end
end
def
write_note
(
text
)
Sidekiq
::
Testing
.
fake!
do
page
.
within
(
'.js-main-target-form'
)
do
fill_in
'note[note]'
,
with:
text
click_button
'Comment'
end
end
end
describe
"new
#{
issuable_type
}
"
do
describe
"new
#{
issuable_type
}
"
do
context
'with commands in the description'
do
context
'with commands in the description'
do
it
"creates the
#{
issuable_type
}
and interpret commands accordingly"
do
it
"creates the
#{
issuable_type
}
and interpret commands accordingly"
do
...
...
spec/support/slash_commands_helpers.rb
0 → 100644
View file @
f1235491
module
SlashCommandsHelpers
def
write_note
(
text
)
Sidekiq
::
Testing
.
fake!
do
page
.
within
(
'.js-main-target-form'
)
do
fill_in
'note[note]'
,
with:
text
click_button
'Comment'
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