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
956912e5
Commit
956912e5
authored
Oct 17, 2018
by
at.ramya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QA Selectors for Batch Comment E2E Automation
parent
5722f63f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
.../javascripts/diffs/components/parallel_diff_table_row.vue
+1
-1
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+26
-0
No files found.
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
View file @
956912e5
...
@@ -143,7 +143,7 @@ export default {
...
@@ -143,7 +143,7 @@ export default {
:show-comment-button=
"true"
:show-comment-button=
"true"
:diff-view-type=
"parallelDiffViewType"
:diff-view-type=
"parallelDiffViewType"
line-position=
"right"
line-position=
"right"
class=
"diff-line-num new_line"
class=
"diff-line-num new_line
qa-new-diff-line
"
/>
/>
<td
<td
:id=
"line.right.lineCode"
:id=
"line.right.lineCode"
...
...
qa/qa/page/merge_request/show.rb
View file @
956912e5
...
@@ -55,6 +55,32 @@ module QA
...
@@ -55,6 +55,32 @@ module QA
element
:labels_block
element
:labels_block
end
end
view
'app/views/projects/merge_requests/show.html.haml'
do
element
:notes_tab
element
:diffs_tab
end
view
'app/assets/javascripts/diffs/components/diff_line_gutter_content.vue'
do
element
:diff_comment
end
view
'app/assets/javascripts/notes/components/comment_form.vue'
do
element
:note_dropdown
element
:discussion_option
end
view
'app/assets/javascripts/notes/components/note_form.vue'
do
element
:reply_input
end
view
'app/assets/javascripts/notes/components/noteable_discussion.vue'
do
element
:discussion_reply
end
view
'app/assets/javascripts/diffs/components/parallel_diff_table_row.vue'
do
element
:new_diff_line
end
def
fast_forward_possible?
def
fast_forward_possible?
!
has_text?
(
'Fast-forward merge is not possible'
)
!
has_text?
(
'Fast-forward merge is not possible'
)
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