diff options
author | Ramya Authappan <rauthappan@gitlab.com> | 2018-10-05 12:00:55 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-05 12:00:55 +0300 |
commit | 637df35f0823a529d985821ab232cf3d90b76a0c (patch) | |
tree | f7ba508c708c79216a58dae0383eb75c40e79c74 | |
parent | ce2207b71807db47c068a1fb3ac5b94a8bfed7d8 (diff) |
Adding qa-selectors for e2e tests
-rw-r--r-- | app/assets/javascripts/issue_show/components/edit_actions.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/issue_show/components/fields/description.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/issue_show/components/fields/title.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/issue_show/components/title.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/notes/components/comment_form.vue | 15 | ||||
-rw-r--r-- | qa/qa.rb | 3 | ||||
-rw-r--r-- | qa/qa/page/component/issuable/common.rb | 35 | ||||
-rw-r--r-- | qa/qa/page/project/issue/show.rb | 2 |
8 files changed, 58 insertions, 9 deletions
diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue index bcf8686afcc..c3d39082714 100644 --- a/app/assets/javascripts/issue_show/components/edit_actions.vue +++ b/app/assets/javascripts/issue_show/components/edit_actions.vue @@ -66,7 +66,7 @@ <button :class="{ disabled: formState.updateLoading || !isSubmitEnabled }" :disabled="formState.updateLoading || !isSubmitEnabled" - class="btn btn-success float-left" + class="btn btn-success float-left qa-save-button" type="submit" @click.prevent="updateIssuable"> Save changes @@ -86,7 +86,7 @@ v-if="shouldShowDeleteButton" :class="{ disabled: deleteLoading }" :disabled="deleteLoading" - class="btn btn-danger float-right append-right-default" + class="btn btn-danger float-right append-right-default qa-delete-button" type="button" @click="deleteIssuable"> Delete diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue index 97acc5ba385..1a78c59d715 100644 --- a/app/assets/javascripts/issue_show/components/fields/description.vue +++ b/app/assets/javascripts/issue_show/components/fields/description.vue @@ -61,7 +61,8 @@ ref="textarea" slot="textarea" v-model="formState.description" - class="note-textarea js-gfm-input js-autosize markdown-area" + class="note-textarea js-gfm-input js-autosize markdown-area + qa-description-textarea" data-supports-quick-actions="false" aria-label="Description" placeholder="Write a comment or drag your files here…" diff --git a/app/assets/javascripts/issue_show/components/fields/title.vue b/app/assets/javascripts/issue_show/components/fields/title.vue index 7d1526a64b4..b7f2b1a6050 100644 --- a/app/assets/javascripts/issue_show/components/fields/title.vue +++ b/app/assets/javascripts/issue_show/components/fields/title.vue @@ -22,7 +22,7 @@ <input id="issuable-title" v-model="formState.title" - class="form-control" + class="form-control qa-title-input" type="text" placeholder="Title" aria-label="Title" diff --git a/app/assets/javascripts/issue_show/components/title.vue b/app/assets/javascripts/issue_show/components/title.vue index cf99e9a9cd8..ed26e53ac0e 100644 --- a/app/assets/javascripts/issue_show/components/title.vue +++ b/app/assets/javascripts/issue_show/components/title.vue @@ -79,7 +79,8 @@ export default { v-if="showInlineEditButton && canUpdate" v-tooltip type="button" - class="btn btn-default btn-edit btn-svg js-issuable-edit" + class="btn btn-default btn-edit btn-svg js-issuable-edit + qa-edit-button" title="Edit title and description" data-placement="bottom" data-container="body" diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 7735133c470..b980e43b898 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -7,7 +7,11 @@ import { __, sprintf } from '~/locale'; import Flash from '../../flash'; import Autosave from '../../autosave'; import TaskList from '../../task_list'; -import { capitalizeFirstCharacter, convertToCamelCase, splitCamelCase } from '../../lib/utils/text_utility'; +import { + capitalizeFirstCharacter, + convertToCamelCase, + splitCamelCase, +} from '../../lib/utils/text_utility'; import * as constants from '../constants'; import eventHub from '../event_hub'; import issueWarning from '../../vue_shared/components/issue/issue_warning.vue'; @@ -122,7 +126,9 @@ export default { return this.getNoteableData.create_note_path; }, issuableTypeTitle() { - return this.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE ? 'merge request' : 'issue'; + return this.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE + ? 'merge request' + : 'issue'; }, }, watch: { @@ -359,7 +365,7 @@ Please check your network connection and try again.`; :disabled="isSubmitting" name="note[note]" class="note-textarea js-vue-comment-form js-note-text -js-gfm-input js-autosize markdown-area js-vue-textarea" +js-gfm-input js-autosize markdown-area js-vue-textarea qa-comment-input" data-supports-quick-actions="true" aria-label="Description" placeholder="Write a comment or drag your files here…" @@ -374,7 +380,8 @@ js-gfm-input js-autosize markdown-area js-vue-textarea" append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"> <button :disabled="isSubmitButtonDisabled" - class="btn btn-success comment-btn js-comment-button js-comment-submit-button" + class="btn btn-create comment-btn js-comment-button js-comment-submit-button + qa-comment-button" type="submit" @click.prevent="handleSave()"> {{ __(commentButtonTitle) }} @@ -257,6 +257,9 @@ module QA autoload :Dropzone, 'qa/page/component/dropzone' autoload :GroupsFilter, 'qa/page/component/groups_filter' autoload :Select2, 'qa/page/component/select2' + module Issuable + autoload :Common, 'qa/page/component/issuable/common' + end end end diff --git a/qa/qa/page/component/issuable/common.rb b/qa/qa/page/component/issuable/common.rb new file mode 100644 index 00000000000..cfd8ac1e7c8 --- /dev/null +++ b/qa/qa/page/component/issuable/common.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +module QA + module Page + module Component + module Issuable + module Common + def self.included(base) + base.view 'app/assets/javascripts/issue_show/components/title.vue' do + element :edit_button + end + + base.view 'app/assets/javascripts/issue_show/components/fields/title.vue' do + element :title_input + end + + base.view 'app/assets/javascripts/issue_show/components/fields/description.vue' do + element :description_textarea + end + + base.view 'app/assets/javascripts/issue_show/components/edit_actions.vue' do + element :save_button + element :delete_button + end + + base.view 'app/assets/javascripts/issue_show/components/edit_actions.vue' do + element :save_button + element :delete_button + end + end + end + end + end + end +end diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb index 587a02163b9..9a738f56202 100644 --- a/qa/qa/page/project/issue/show.rb +++ b/qa/qa/page/project/issue/show.rb @@ -5,6 +5,8 @@ module QA module Project module Issue class Show < Page::Base + include Page::Component::Issuable::Common + view 'app/views/projects/issues/show.html.haml' do element :issue_details, '.issue-details' element :title, '.title' |