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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
fbdc02ad
Commit
fbdc02ad
authored
Jul 22, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IssueNotesRefactor: Temp workaround for a failing test.
parent
33c20468
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
spec/features/merge_requests/user_uses_slash_commands_spec.rb
.../features/merge_requests/user_uses_slash_commands_spec.rb
+1
-1
spec/support/quick_actions_helpers.rb
spec/support/quick_actions_helpers.rb
+5
-2
No files found.
spec/features/merge_requests/user_uses_slash_commands_spec.rb
View file @
fbdc02ad
...
@@ -78,7 +78,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
...
@@ -78,7 +78,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
describe
'merging the MR from the note'
do
describe
'merging the MR from the note'
do
context
'when the current user can merge the MR'
do
context
'when the current user can merge the MR'
do
it
'merges the MR'
do
it
'merges the MR'
do
write_note
(
"/merge"
)
write_note
(
"/merge"
,
false
)
expect
(
page
).
to
have_content
'Commands applied'
expect
(
page
).
to
have_content
'Commands applied'
...
...
spec/support/quick_actions_helpers.rb
View file @
fbdc02ad
module
QuickActionsHelpers
module
QuickActionsHelpers
def
write_note
(
text
)
def
write_note
(
text
,
wait
=
true
)
Sidekiq
::
Testing
.
fake!
do
Sidekiq
::
Testing
.
fake!
do
page
.
within
(
'.js-main-target-form'
)
do
page
.
within
(
'.js-main-target-form'
)
do
fill_in
'note[note]'
,
with:
text
fill_in
'note[note]'
,
with:
text
find
(
'.js-comment-submit-button'
).
trigger
(
'click'
)
find
(
'.js-comment-submit-button'
).
trigger
(
'click'
)
if
wait
wait_for_requests
wait_for_requests
end
end
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