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
e3fb7f77
Commit
e3fb7f77
authored
Jul 29, 2019
by
Tanya Pazitny
Committed by
Mayra Cabrera
Jul 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change qa-* class references to js-* for suggestions
parent
c7a7e795
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/vue_shared/components/markdown/header.vue
...ets/javascripts/vue_shared/components/markdown/header.vue
+1
-1
app/assets/javascripts/vue_shared/components/markdown/suggestion_diff.vue
...cripts/vue_shared/components/markdown/suggestion_diff.vue
+1
-1
app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue
...vue_shared/components/markdown/suggestion_diff_header.vue
+2
-2
spec/features/markdown/copy_as_gfm_spec.rb
spec/features/markdown/copy_as_gfm_spec.rb
+3
-3
spec/frontend/vue_shared/components/markdown/header_spec.js
spec/frontend/vue_shared/components/markdown/header_spec.js
+1
-1
spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
...shared/components/markdown/suggestion_diff_header_spec.js
+2
-2
spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js
...ts/vue_shared/components/markdown/suggestion_diff_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/markdown/header.vue
View file @
e3fb7f77
...
@@ -123,7 +123,7 @@ export default {
...
@@ -123,7 +123,7 @@ export default {
:cursor-offset=
"4"
:cursor-offset=
"4"
:tag-content=
"lineContent"
:tag-content=
"lineContent"
icon=
"doc-code"
icon=
"doc-code"
class=
"qa-suggestion-btn"
class=
"qa-suggestion-btn
js-suggestion-btn
"
@
click=
"handleSuggestDismissed"
@
click=
"handleSuggestDismissed"
/>
/>
<gl-popover
<gl-popover
...
...
app/assets/javascripts/vue_shared/components/markdown/suggestion_diff.vue
View file @
e3fb7f77
...
@@ -39,7 +39,7 @@ export default {
...
@@ -39,7 +39,7 @@ export default {
<
template
>
<
template
>
<div
class=
"md-suggestion"
>
<div
class=
"md-suggestion"
>
<suggestion-diff-header
<suggestion-diff-header
class=
"qa-suggestion-diff-header"
class=
"qa-suggestion-diff-header
js-suggestion-diff-header
"
:can-apply=
"suggestion.appliable && suggestion.current_user.can_apply && !disabled"
:can-apply=
"suggestion.appliable && suggestion.current_user.can_apply && !disabled"
:is-applied=
"suggestion.applied"
:is-applied=
"suggestion.applied"
:help-page-path=
"helpPagePath"
:help-page-path=
"helpPagePath"
...
...
app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue
View file @
e3fb7f77
...
@@ -41,7 +41,7 @@ export default {
...
@@ -41,7 +41,7 @@ export default {
<
template
>
<
template
>
<div
class=
"md-suggestion-header border-bottom-0 mt-2"
>
<div
class=
"md-suggestion-header border-bottom-0 mt-2"
>
<div
class=
"qa-suggestion-diff-header font-weight-bold"
>
<div
class=
"qa-suggestion-diff-header
js-suggestion-diff-header
font-weight-bold"
>
{{
__
(
'
Suggested change
'
)
}}
{{
__
(
'
Suggested change
'
)
}}
<a
v-if=
"helpPagePath"
:href=
"helpPagePath"
:aria-label=
"__('Help')"
class=
"js-help-btn"
>
<a
v-if=
"helpPagePath"
:href=
"helpPagePath"
:aria-label=
"__('Help')"
class=
"js-help-btn"
>
<icon
name=
"question-o"
css-classes=
"link-highlight"
/>
<icon
name=
"question-o"
css-classes=
"link-highlight"
/>
...
@@ -55,7 +55,7 @@ export default {
...
@@ -55,7 +55,7 @@ export default {
<gl-button
<gl-button
v-else-if=
"canApply"
v-else-if=
"canApply"
v-gl-tooltip.viewport=
"__('This also resolves the discussion')"
v-gl-tooltip.viewport=
"__('This also resolves the discussion')"
class=
"btn-inverted qa-apply-btn"
class=
"btn-inverted qa-apply-btn
js-apply-btn
"
:disabled=
"isApplying"
:disabled=
"isApplying"
variant=
"success"
variant=
"success"
@
click=
"applySuggestion"
@
click=
"applySuggestion"
...
...
spec/features/markdown/copy_as_gfm_spec.rb
View file @
e3fb7f77
...
@@ -418,8 +418,8 @@ describe 'Copy as GFM', :js do
...
@@ -418,8 +418,8 @@ describe 'Copy as GFM', :js do
html
=
<<~
HTML
html
=
<<~
HTML
<div class="md-suggestion">
<div class="md-suggestion">
<div class="md-suggestion-header border-bottom-0 mt-2 qa-suggestion-diff-header">
<div class="md-suggestion-header border-bottom-0 mt-2 qa-suggestion-diff-header
js-suggestion-diff-header
">
<div class="qa-suggestion-diff-header font-weight-bold">
<div class="qa-suggestion-diff-header
js-suggestion-diff-header
font-weight-bold">
Suggested change
Suggested change
<a href="/gitlab/help/user/discussions/index.md#suggest-changes" aria-label="Help" class="js-help-btn">
<a href="/gitlab/help/user/discussions/index.md#suggest-changes" aria-label="Help" class="js-help-btn">
<svg aria-hidden="true" class="s16 ic-question-o link-highlight">
<svg aria-hidden="true" class="s16 ic-question-o link-highlight">
...
@@ -428,7 +428,7 @@ describe 'Copy as GFM', :js do
...
@@ -428,7 +428,7 @@ describe 'Copy as GFM', :js do
</a>
</a>
</div>
</div>
<!---->
<!---->
<button type="button" class="btn qa-apply-btn">Apply suggestion</button>
<button type="button" class="btn qa-apply-btn
js-apply-btn
">Apply suggestion</button>
</div>
</div>
<table class="mb-3 md-suggestion-diff js-syntax-highlight code white">
<table class="mb-3 md-suggestion-diff js-syntax-highlight code white">
<tbody>
<tbody>
...
...
spec/frontend/vue_shared/components/markdown/header_spec.js
View file @
e3fb7f77
...
@@ -101,7 +101,7 @@ describe('Markdown field header component', () => {
...
@@ -101,7 +101,7 @@ describe('Markdown field header component', () => {
vm
.
canSuggest
=
false
;
vm
.
canSuggest
=
false
;
Vue
.
nextTick
(()
=>
{
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.
qa
-suggestion-btn
'
)).
toBe
(
null
);
expect
(
vm
.
$el
.
querySelector
(
'
.
js
-suggestion-btn
'
)).
toBe
(
null
);
});
});
});
});
});
});
spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
View file @
e3fb7f77
...
@@ -28,8 +28,8 @@ describe('Suggestion Diff component', () => {
...
@@ -28,8 +28,8 @@ describe('Suggestion Diff component', () => {
wrapper
.
destroy
();
wrapper
.
destroy
();
});
});
const
findApplyButton
=
()
=>
wrapper
.
find
(
'
.
qa
-apply-btn
'
);
const
findApplyButton
=
()
=>
wrapper
.
find
(
'
.
js
-apply-btn
'
);
const
findHeader
=
()
=>
wrapper
.
find
(
'
.
qa
-suggestion-diff-header
'
);
const
findHeader
=
()
=>
wrapper
.
find
(
'
.
js
-suggestion-diff-header
'
);
const
findHelpButton
=
()
=>
wrapper
.
find
(
'
.js-help-btn
'
);
const
findHelpButton
=
()
=>
wrapper
.
find
(
'
.js-help-btn
'
);
const
findLoading
=
()
=>
wrapper
.
find
(
GlLoadingIcon
);
const
findLoading
=
()
=>
wrapper
.
find
(
GlLoadingIcon
);
...
...
spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js
View file @
e3fb7f77
...
@@ -60,7 +60,7 @@ describe('Suggestion Diff component', () => {
...
@@ -60,7 +60,7 @@ describe('Suggestion Diff component', () => {
describe
(
'
init
'
,
()
=>
{
describe
(
'
init
'
,
()
=>
{
it
(
'
renders a suggestion header
'
,
()
=>
{
it
(
'
renders a suggestion header
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.
qa
-suggestion-diff-header
'
)).
not
.
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.
js
-suggestion-diff-header
'
)).
not
.
toBeNull
();
});
});
it
(
'
renders a diff table with syntax highlighting
'
,
()
=>
{
it
(
'
renders a diff table with syntax highlighting
'
,
()
=>
{
...
...
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