Replace wording for slash command confirmation message
This commit is contained in:
parent
ee5cc454d7
commit
8cc5333420
5 changed files with 22 additions and 19 deletions
|
@ -41,7 +41,7 @@ module Notes
|
|||
# We must add the error after we call #save because errors are reset
|
||||
# when #save is called
|
||||
if only_commands
|
||||
note.errors.add(:commands_only, 'Your commands have been executed!')
|
||||
note.errors.add(:commands_only, 'Commands applied')
|
||||
end
|
||||
|
||||
note.commands_changes = command_params.keys
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
title: Replace wording for slash command confirmation message
|
||||
merge_request: 8123
|
|
@ -30,7 +30,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
|
|||
write_note("/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 'Commands applied'
|
||||
|
||||
issue.reload
|
||||
|
||||
|
@ -51,7 +51,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
|
|||
write_note("/due 2016-08-28")
|
||||
|
||||
expect(page).to have_content '/due 2016-08-28'
|
||||
expect(page).not_to have_content 'Your commands have been executed!'
|
||||
expect(page).not_to have_content 'Commands applied'
|
||||
|
||||
issue.reload
|
||||
|
||||
|
@ -70,7 +70,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
|
|||
write_note("/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 'Commands applied'
|
||||
|
||||
issue.reload
|
||||
|
||||
|
@ -91,7 +91,7 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
|
|||
write_note("/remove_due_date")
|
||||
|
||||
expect(page).to have_content '/remove_due_date'
|
||||
expect(page).not_to have_content 'Your commands have been executed!'
|
||||
expect(page).not_to have_content 'Commands applied'
|
||||
|
||||
issue.reload
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ feature 'Merge Requests > User uses slash commands', feature: true, js: true do
|
|||
write_note("/wip")
|
||||
|
||||
expect(page).not_to have_content '/wip'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
expect(merge_request.reload.work_in_progress?).to eq true
|
||||
end
|
||||
|
@ -42,7 +42,7 @@ feature 'Merge Requests > User uses slash commands', feature: true, js: true do
|
|||
write_note("/wip")
|
||||
|
||||
expect(page).not_to have_content '/wip'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
expect(merge_request.reload.work_in_progress?).to eq false
|
||||
end
|
||||
|
@ -61,7 +61,7 @@ feature 'Merge Requests > User uses slash commands', feature: true, js: true do
|
|||
write_note("/wip")
|
||||
|
||||
expect(page).not_to have_content '/wip'
|
||||
expect(page).not_to have_content 'Your commands have been executed!'
|
||||
expect(page).not_to have_content 'Commands applied'
|
||||
|
||||
expect(merge_request.reload.work_in_progress?).to eq false
|
||||
end
|
||||
|
|
|
@ -76,7 +76,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 '/label ~bug'
|
||||
expect(page).not_to have_content '/milestone %"ASAP"'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
issuable.reload
|
||||
|
||||
|
@ -97,7 +97,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/close")
|
||||
|
||||
expect(page).not_to have_content '/close'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
expect(issuable.reload).to be_closed
|
||||
end
|
||||
|
@ -114,7 +114,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/close")
|
||||
|
||||
expect(page).not_to have_content '/close'
|
||||
expect(page).not_to have_content 'Your commands have been executed!'
|
||||
expect(page).not_to have_content 'Commands applied'
|
||||
|
||||
expect(issuable).to be_open
|
||||
end
|
||||
|
@ -132,7 +132,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/reopen")
|
||||
|
||||
expect(page).not_to have_content '/reopen'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
expect(issuable.reload).to be_open
|
||||
end
|
||||
|
@ -149,7 +149,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/reopen")
|
||||
|
||||
expect(page).not_to have_content '/reopen'
|
||||
expect(page).not_to have_content 'Your commands have been executed!'
|
||||
expect(page).not_to have_content 'Commands applied'
|
||||
|
||||
expect(issuable).to be_closed
|
||||
end
|
||||
|
@ -162,7 +162,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/title Awesome new title")
|
||||
|
||||
expect(page).not_to have_content '/title'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
expect(issuable.reload.title).to eq 'Awesome new title'
|
||||
end
|
||||
|
@ -179,7 +179,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/title Awesome new title")
|
||||
|
||||
expect(page).not_to have_content '/title'
|
||||
expect(page).not_to have_content 'Your commands have been executed!'
|
||||
expect(page).not_to have_content 'Commands applied'
|
||||
|
||||
expect(issuable.reload.title).not_to eq 'Awesome new title'
|
||||
end
|
||||
|
@ -191,7 +191,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/todo")
|
||||
|
||||
expect(page).not_to have_content '/todo'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
todos = TodosFinder.new(master).execute
|
||||
todo = todos.first
|
||||
|
@ -222,7 +222,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/done")
|
||||
|
||||
expect(page).not_to have_content '/done'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
expect(todo.reload).to be_done
|
||||
end
|
||||
|
@ -235,7 +235,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/subscribe")
|
||||
|
||||
expect(page).not_to have_content '/subscribe'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
expect(issuable.subscribed?(master, project)).to be_truthy
|
||||
end
|
||||
|
@ -252,7 +252,7 @@ shared_examples 'issuable record that supports slash commands in its description
|
|||
write_note("/unsubscribe")
|
||||
|
||||
expect(page).not_to have_content '/unsubscribe'
|
||||
expect(page).to have_content 'Your commands have been executed!'
|
||||
expect(page).to have_content 'Commands applied'
|
||||
|
||||
expect(issuable.subscribed?(master, project)).to be_falsy
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue