Commit c6525cb3 authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch '228999-aqualls-config-toggle' into 'master'

Replace board-scope tooltip on config_toggle.js

See merge request gitlab-org/gitlab!45449
parents cb2cf8fd 77bd354c
import Vue from 'vue'; import Vue from 'vue';
import tooltip from '~/vue_shared/directives/tooltip'; import { GlTooltipDirective } from '@gitlab/ui';
import { s__, __ } from '~/locale'; import { s__, __ } from '~/locale';
export default boardsStore => { export default boardsStore => {
...@@ -9,7 +9,7 @@ export default boardsStore => { ...@@ -9,7 +9,7 @@ export default boardsStore => {
gl.boardConfigToggle = new Vue({ gl.boardConfigToggle = new Vue({
el: configEl, el: configEl,
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
data() { data() {
return { return {
...@@ -32,7 +32,7 @@ export default boardsStore => { ...@@ -32,7 +32,7 @@ export default boardsStore => {
template: ` template: `
<div class="gl-ml-3"> <div class="gl-ml-3">
<button <button
v-tooltip v-gl-tooltip
:title="tooltipTitle" :title="tooltipTitle"
class="btn btn-inverted" class="btn btn-inverted"
:class="{ 'dot-highlight': hasScope }" :class="{ 'dot-highlight': hasScope }"
......
...@@ -472,14 +472,14 @@ RSpec.describe 'Scoped issue boards', :js do ...@@ -472,14 +472,14 @@ RSpec.describe 'Scoped issue boards', :js do
button = first('.filter-dropdown-container .btn.btn-inverted') button = first('.filter-dropdown-container .btn.btn-inverted')
expect(button.text).to include(button_title) expect(button.text).to include(button_title)
expect(button[:class]).to include('dot-highlight') expect(button[:class]).to include('dot-highlight')
expect(button['data-original-title']).to include('This board\'s scope is reduced') expect(button['title']).to include('This board\'s scope is reduced')
end end
def expect_no_dot_highlight(button_title) def expect_no_dot_highlight(button_title)
button = first('.filter-dropdown-container .btn.btn-inverted') button = first('.filter-dropdown-container .btn.btn-inverted')
expect(button.text).to include(button_title) expect(button.text).to include(button_title)
expect(button[:class]).not_to include('dot-highlight') expect(button[:class]).not_to include('dot-highlight')
expect(button['data-original-title']).not_to include('This board\'s scope is reduced') expect(button['title']).not_to include('This board\'s scope is reduced')
end end
# Create board helper methods # Create board helper methods
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment