summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWalmyr <walmyr@gitlab.com>2019-07-11 17:30:53 +0000
committerWalmyr <walmyr@gitlab.com>2019-07-11 17:30:53 +0000
commit03756a312bea2966d9f6ff26c798679fff87d731 (patch)
treebb2287c2575b4ce5e7cb04847bb37659ceb00f7f
parent86b07736488b61f2c5ed37369cad615320289a43 (diff)
parent0b69edc1713dc0ac4dbaab7f6d900dfc8f4d9217 (diff)
downloadgitlab-ce-03756a312bea2966d9f6ff26c798679fff87d731.tar.gz
Merge branch 'qa/e2e-test-issue-comment' into 'master'63572-saml-authorize-screen-does-not-show-user-account
Add end-to-end test for creating and editing issue comments See merge request gitlab-org/gitlab-ce!30571
-rw-r--r--app/assets/javascripts/notes/components/note_actions.vue2
-rw-r--r--qa/qa/page/component/note.rb10
-rw-r--r--qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb31
3 files changed, 42 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue
index 844d0c3e376..6cc873359da 100644
--- a/app/assets/javascripts/notes/components/note_actions.vue
+++ b/app/assets/javascripts/notes/components/note_actions.vue
@@ -165,7 +165,7 @@ export default {
v-gl-tooltip
type="button"
title="Edit comment"
- class="note-action-button js-note-edit btn btn-transparent"
+ class="note-action-button js-note-edit btn btn-transparent qa-note-edit-button"
@click="onEdit"
>
<icon name="pencil" css-classes="link-highlight" />
diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb
index 07e191f1c9b..fe324574f4d 100644
--- a/qa/qa/page/component/note.rb
+++ b/qa/qa/page/component/note.rb
@@ -10,6 +10,10 @@ module QA
element :discussion_option
end
+ base.view 'app/assets/javascripts/notes/components/note_actions.vue' do
+ element :note_edit_button
+ end
+
base.view 'app/assets/javascripts/notes/components/note_form.vue' do
element :reply_input
element :reply_comment_button
@@ -49,6 +53,12 @@ module QA
def expand_replies
click_element :expand_replies
end
+
+ def edit_comment(text)
+ click_element :note_edit_button
+ fill_element :reply_input, text
+ click_element :reply_comment_button
+ end
end
end
end
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
new file mode 100644
index 00000000000..a62a51b11f4
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module QA
+ context 'Plan' do
+ describe 'Issue comments' do
+ it 'user comments on an issue and edits the comment' do
+ Runtime::Browser.visit(:gitlab, Page::Main::Login)
+ Page::Main::Login.act { sign_in_using_credentials }
+
+ issue = Resource::Issue.fabricate_via_api! do |issue|
+ issue.title = 'issue title'
+ end
+ issue.visit!
+
+ Page::Project::Issue::Show.perform do |issue_show_page|
+ first_version_of_comment = 'First version of the comment'
+ second_version_of_comment = 'Second version of the comment'
+
+ issue_show_page.comment(first_version_of_comment)
+
+ expect(issue_show_page).to have_content(first_version_of_comment)
+
+ issue_show_page.edit_comment(second_version_of_comment)
+
+ expect(issue_show_page).to have_content(second_version_of_comment)
+ expect(issue_show_page).not_to have_content(first_version_of_comment)
+ end
+ end
+ end
+ end
+end