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
463ae8f5
Commit
463ae8f5
authored
Aug 12, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Force notes poll after commands have been executed
parent
0afb9601
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
33 deletions
+35
-33
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+21
-19
app/services/notes/create_service.rb
app/services/notes/create_service.rb
+1
-1
spec/features/issues/user_uses_slash_commands_spec.rb
spec/features/issues/user_uses_slash_commands_spec.rb
+2
-2
spec/support/issuable_slash_commands_shared_examples.rb
spec/support/issuable_slash_commands_shared_examples.rb
+11
-11
No files found.
app/assets/javascripts/notes.js
View file @
463ae8f5
...
@@ -236,6 +236,7 @@
...
@@ -236,6 +236,7 @@
else
{
else
{
if
(
note
.
errors
.
commands_only
)
{
if
(
note
.
errors
.
commands_only
)
{
new
Flash
(
note
.
errors
.
commands_only
,
'
notice
'
,
this
.
parentTimeline
);
new
Flash
(
note
.
errors
.
commands_only
,
'
notice
'
,
this
.
parentTimeline
);
this
.
refresh
();
}
}
}
}
return
;
return
;
...
@@ -250,6 +251,7 @@
...
@@ -250,6 +251,7 @@
$notesList
.
append
(
note
.
html
).
syntaxHighlight
();
$notesList
.
append
(
note
.
html
).
syntaxHighlight
();
gl
.
utils
.
localTimeAgo
(
$notesList
.
find
(
"
#note_
"
+
note
.
id
+
"
.js-timeago
"
),
false
);
gl
.
utils
.
localTimeAgo
(
$notesList
.
find
(
"
#note_
"
+
note
.
id
+
"
.js-timeago
"
),
false
);
this
.
initTaskList
();
this
.
initTaskList
();
this
.
refresh
();
return
this
.
updateNotesCount
(
1
);
return
this
.
updateNotesCount
(
1
);
}
}
};
};
...
...
app/services/notes/create_service.rb
View file @
463ae8f5
...
@@ -28,7 +28,7 @@ module Notes
...
@@ -28,7 +28,7 @@ module Notes
# We must add the error after we call #save because errors are reset
# We must add the error after we call #save because errors are reset
# when #save is called
# when #save is called
if
slash_commands_service
.
execute
(
command_params
,
note
)
&&
note
.
note
.
blank?
if
slash_commands_service
.
execute
(
command_params
,
note
)
&&
note
.
note
.
blank?
note
.
errors
.
add
(
:commands_only
,
'Your commands
are being executed.
'
)
note
.
errors
.
add
(
:commands_only
,
'Your commands
have been executed!
'
)
end
end
note
note
...
...
spec/features/issues/user_uses_slash_commands_spec.rb
View file @
463ae8f5
...
@@ -27,7 +27,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
...
@@ -27,7 +27,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
end
end
expect
(
page
).
not_to
have_content
'/due_date 2016-08-28'
expect
(
page
).
not_to
have_content
'/due_date 2016-08-28'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
issue
.
reload
issue
.
reload
...
@@ -47,7 +47,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
...
@@ -47,7 +47,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
end
end
expect
(
page
).
not_to
have_content
'/clear_due_date'
expect
(
page
).
not_to
have_content
'/clear_due_date'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
issue
.
reload
issue
.
reload
...
...
spec/support/issuable_slash_commands_shared_examples.rb
View file @
463ae8f5
...
@@ -74,7 +74,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -74,7 +74,7 @@ shared_examples 'issuable record that supports slash commands in its description
expect
(
page
).
not_to
have_content
'/assign @bob'
expect
(
page
).
not_to
have_content
'/assign @bob'
expect
(
page
).
not_to
have_content
'/label ~bug'
expect
(
page
).
not_to
have_content
'/label ~bug'
expect
(
page
).
not_to
have_content
'/milestone %"ASAP"'
expect
(
page
).
not_to
have_content
'/milestone %"ASAP"'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
issuable
.
reload
issuable
.
reload
...
@@ -98,7 +98,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -98,7 +98,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/close'
expect
(
page
).
not_to
have_content
'/close'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
expect
(
issuable
.
reload
).
to
be_closed
expect
(
issuable
.
reload
).
to
be_closed
end
end
...
@@ -118,7 +118,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -118,7 +118,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/close'
expect
(
page
).
not_to
have_content
'/close'
expect
(
page
).
not_to
have_content
'Your commands
are being executed.
'
expect
(
page
).
not_to
have_content
'Your commands
have been executed!
'
expect
(
issuable
).
to
be_open
expect
(
issuable
).
to
be_open
end
end
...
@@ -139,7 +139,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -139,7 +139,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/reopen'
expect
(
page
).
not_to
have_content
'/reopen'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
expect
(
issuable
.
reload
).
to
be_open
expect
(
issuable
.
reload
).
to
be_open
end
end
...
@@ -159,7 +159,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -159,7 +159,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/reopen'
expect
(
page
).
not_to
have_content
'/reopen'
expect
(
page
).
not_to
have_content
'Your commands
are being executed.
'
expect
(
page
).
not_to
have_content
'Your commands
have been executed!
'
expect
(
issuable
).
to
be_closed
expect
(
issuable
).
to
be_closed
end
end
...
@@ -175,7 +175,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -175,7 +175,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/title'
expect
(
page
).
not_to
have_content
'/title'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
expect
(
issuable
.
reload
.
title
).
to
eq
'Awesome new title'
expect
(
issuable
.
reload
.
title
).
to
eq
'Awesome new title'
end
end
...
@@ -195,7 +195,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -195,7 +195,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/title'
expect
(
page
).
not_to
have_content
'/title'
expect
(
page
).
not_to
have_content
'Your commands
are being executed.
'
expect
(
page
).
not_to
have_content
'Your commands
have been executed!
'
expect
(
issuable
.
reload
.
title
).
not_to
eq
'Awesome new title'
expect
(
issuable
.
reload
.
title
).
not_to
eq
'Awesome new title'
end
end
...
@@ -210,7 +210,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -210,7 +210,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/todo'
expect
(
page
).
not_to
have_content
'/todo'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
todos
=
TodosFinder
.
new
(
master
).
execute
todos
=
TodosFinder
.
new
(
master
).
execute
todo
=
todos
.
first
todo
=
todos
.
first
...
@@ -244,7 +244,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -244,7 +244,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/done'
expect
(
page
).
not_to
have_content
'/done'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
expect
(
todo
.
reload
).
to
be_done
expect
(
todo
.
reload
).
to
be_done
end
end
...
@@ -260,7 +260,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -260,7 +260,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/subscribe'
expect
(
page
).
not_to
have_content
'/subscribe'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
expect
(
issuable
.
subscribed?
(
master
)).
to
be_truthy
expect
(
issuable
.
subscribed?
(
master
)).
to
be_truthy
end
end
...
@@ -280,7 +280,7 @@ shared_examples 'issuable record that supports slash commands in its description
...
@@ -280,7 +280,7 @@ shared_examples 'issuable record that supports slash commands in its description
end
end
expect
(
page
).
not_to
have_content
'/unsubscribe'
expect
(
page
).
not_to
have_content
'/unsubscribe'
expect
(
page
).
to
have_content
'Your commands
are being executed.
'
expect
(
page
).
to
have_content
'Your commands
have been executed!
'
expect
(
issuable
.
subscribed?
(
master
)).
to
be_falsy
expect
(
issuable
.
subscribed?
(
master
)).
to
be_falsy
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