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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d79e4bb7
Commit
d79e4bb7
authored
Mar 03, 2021
by
Anastasia McDonald
Committed by
Ramya Authappan
Mar 03, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes failing snippet and epic tests
See
https://gitlab.com/gitlab-org/gitlab/-/issues/323267
parent
a9cda936
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
5 deletions
+23
-5
app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
...vascripts/snippets/components/snippet_visibility_edit.vue
+6
-1
ee/app/assets/javascripts/epic/components/epic_form.vue
ee/app/assets/javascripts/epic/components/epic_form.vue
+5
-2
qa/qa/ee/page/group/epic/new.rb
qa/qa/ee/page/group/epic/new.rb
+1
-1
qa/qa/page/component/new_snippet.rb
qa/qa/page/component/new_snippet.rb
+5
-1
spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap
...onents/__snapshots__/snippet_visibility_edit_spec.js.snap
+6
-0
No files found.
app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
View file @
d79e4bb7
...
...
@@ -55,7 +55,12 @@ export default {
>
<div
class=
"d-flex align-items-center"
>
<gl-icon
:size=
"16"
:name=
"option.icon"
/>
<span
class=
"font-weight-bold ml-1 js-visibility-option"
>
{{
option
.
label
}}
</span>
<span
class=
"font-weight-bold ml-1 js-visibility-option"
data-qa-selector=
"visibility_content"
:data-qa-visibility=
"option.label"
>
{{
option
.
label
}}
</span
>
</div>
<template
#help
>
{{
isProjectSnippet
&&
option
.
description_project
...
...
ee/app/assets/javascripts/epic/components/epic_form.vue
View file @
d79e4bb7
...
...
@@ -158,12 +158,15 @@ export default {
</
template
>
</markdown-field>
</gl-form-group>
<gl-form-group
:label=
"__('Confidentiality')"
label-for=
"epic-confidentiality"
>
<gl-form-group
:label=
"__('Confidentiality')"
label-for=
"epic-confidentiality"
data-qa-selector=
"confidential_epic_checkbox"
>
<gl-form-checkbox
id=
"epic-confidentiality"
v-model=
"confidential"
data-testid=
"epic-confidentiality"
data-qa-selector=
"confidential_epic_checkbox"
>
{{ $options.i18n.confidentialityLabel }}
</gl-form-checkbox>
...
...
qa/qa/ee/page/group/epic/new.rb
View file @
d79e4bb7
...
...
@@ -17,7 +17,7 @@ module QA
end
def
enable_confidential_epic
click_element
:confidential_epic_checkbox
find_element
(
:confidential_epic_checkbox
,
visible:
false
).
click
end
def
set_title
(
title
)
...
...
qa/qa/page/component/new_snippet.rb
View file @
d79e4bb7
...
...
@@ -32,6 +32,10 @@ module QA
# This 'element' is here only to ensure the changes in the view source aren't mistakenly changed
element
:_
,
"qa_selector = local_assigns.fetch(:qa_selector, '')"
# rubocop:disable QA/ElementWithPattern
end
base
.
view
'app/assets/javascripts/snippets/components/snippet_visibility_edit.vue'
do
element
:visibility_content
end
end
def
fill_title
(
title
)
...
...
@@ -44,7 +48,7 @@ module QA
end
def
set_visibility
(
visibility
)
c
hoose
visibility
c
lick_element
(
:visibility_content
,
visibility:
visibility
)
end
def
fill_file_name
(
name
,
file_number
=
nil
)
...
...
spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap
View file @
d79e4bb7
...
...
@@ -46,6 +46,8 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
<span
class="font-weight-bold ml-1 js-visibility-option"
data-qa-selector="visibility_content"
data-qa-visibility="Private"
>
Private
</span>
...
...
@@ -65,6 +67,8 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
<span
class="font-weight-bold ml-1 js-visibility-option"
data-qa-selector="visibility_content"
data-qa-visibility="Internal"
>
Internal
</span>
...
...
@@ -84,6 +88,8 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
<span
class="font-weight-bold ml-1 js-visibility-option"
data-qa-selector="visibility_content"
data-qa-visibility="Public"
>
Public
</span>
...
...
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