Skip to content

Commit b46d818

Browse files
xanfxanf
authored
Merge branch 'dev' into dev
2 parents d932f53 + e7aaf2d commit b46d818

File tree

62 files changed

+615
-600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+615
-600
lines changed

‎.bundlewatch.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
},
4747
{
4848
"path": "./dist/bootstrap-vue.common.min.js",
49-
"maxSize": "235 kB"
49+
"maxSize": "240 kB"
5050
},
5151
{
5252
"path": "./dist/bootstrap-vue.esm.js",

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"@nuxtjs/robots": "^2.5.0",
100100
"@nuxtjs/sitemap": "^2.4.0",
101101
"@testing-library/jest-dom": "^5.12.0",
102-
"@vue/test-utils": "^1.2.0",
102+
"@vue/test-utils": "^1.3.0",
103103
"autoprefixer": "^10.2.5",
104104
"babel-core": "^7.0.0-bridge.0",
105105
"babel-eslint": "^10.1.0",
@@ -134,7 +134,7 @@
134134
"loader-utils": "^2.0.0",
135135
"lodash": "^4.17.21",
136136
"marked": "^2.0.3",
137-
"nuxt": "^2.15.6",
137+
"nuxt": "^2.15.8",
138138
"postcss": "^8.2.15",
139139
"postcss-cli": "^8.3.1",
140140
"prettier": "1.14.3",

‎src/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ $b-custom-checkbox-indicator-border-radius-sm: $border-radius-sm !default;
3030
// Custom switch sizes
3131
$b-custom-switch-width-lg: $b-custom-control-indicator-size-lg * 1.75 !default;
3232
$b-custom-switch-width-sm: $b-custom-control-indicator-size-sm * 1.75 !default;
33-
$b-custom-switch-indicator-border-radius-lg: $b-custom-control-indicator-size-lg / 2 !default;
34-
$b-custom-switch-indicator-border-radius-sm: $b-custom-control-indicator-size-sm / 2 !default;
33+
$b-custom-switch-indicator-border-radius-lg: $b-custom-control-indicator-size-lg * 0.5 !default;
34+
$b-custom-switch-indicator-border-radius-sm: $b-custom-control-indicator-size-sm * 0.5 !default;
3535
$b-custom-switch-indicator-size-lg: calc(
3636
#{$b-custom-control-indicator-size-lg} - #{$custom-control-indicator-border-width * 4}
3737
) !default;

‎src/components/button-toolbar/button-toolbar.spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mount } from '@vue/test-utils'
2-
import { createContainer, waitNT } from '../../../tests/utils'
2+
import { waitNT } from '../../../tests/utils'
33
import { BButton } from '../button/button'
44
import { BButtonGroup } from '../button-group/button-group'
55
import { BButtonToolbar } from './button-toolbar'
@@ -93,7 +93,7 @@ describe('button-toolbar', () => {
9393

9494
it('has correct structure', async () => {
9595
const wrapper = mount(App, {
96-
attachTo: createContainer()
96+
attachTo: document.body
9797
})
9898

9999
await waitNT(wrapper.vm)
@@ -150,7 +150,7 @@ describe('button-toolbar', () => {
150150

151151
it('focuses first button when tabbed into', async () => {
152152
const wrapper = mount(App, {
153-
attachTo: createContainer()
153+
attachTo: document.body
154154
})
155155

156156
await waitNT(wrapper.vm)
@@ -173,7 +173,7 @@ describe('button-toolbar', () => {
173173

174174
it('keyboard navigation works', async () => {
175175
const wrapper = mount(App, {
176-
attachTo: createContainer()
176+
attachTo: document.body
177177
})
178178

179179
await waitNT(wrapper.vm)

‎src/components/calendar/calendar.spec.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mount } from '@vue/test-utils'
2-
import { createContainer, waitNT, waitRAF } from '../../../tests/utils'
2+
import { waitNT, waitRAF } from '../../../tests/utils'
33
import { BCalendar } from './calendar'
44
import { formatYMD } from '../../utils/date'
55

@@ -8,7 +8,7 @@ import { formatYMD } from '../../utils/date'
88
describe('calendar', () => {
99
it('has expected base structure', async () => {
1010
const wrapper = mount(BCalendar, {
11-
attachTo: createContainer()
11+
attachTo: document.body
1212
})
1313

1414
expect(wrapper.vm).toBeDefined()
@@ -42,7 +42,7 @@ describe('calendar', () => {
4242

4343
it('has expected structure when value is set', async () => {
4444
const wrapper = mount(BCalendar, {
45-
attachTo: createContainer(),
45+
attachTo: document.body,
4646
propsData: {
4747
value: '2020-02-15' // Leap year
4848
}
@@ -62,7 +62,7 @@ describe('calendar', () => {
6262

6363
it('reacts to changes in value', async () => {
6464
const wrapper = mount(BCalendar, {
65-
attachTo: createContainer(),
65+
attachTo: document.body,
6666
propsData: {
6767
value: '2020-01-01' // Leap year
6868
}
@@ -88,7 +88,7 @@ describe('calendar', () => {
8888

8989
it('clicking a date selects date', async () => {
9090
const wrapper = mount(BCalendar, {
91-
attachTo: createContainer(),
91+
attachTo: document.body,
9292
propsData: {
9393
value: '2020-01-01' // Leap year
9494
}
@@ -122,7 +122,7 @@ describe('calendar', () => {
122122

123123
it('date navigation buttons work', async () => {
124124
const wrapper = mount(BCalendar, {
125-
attachTo: createContainer(),
125+
attachTo: document.body,
126126
propsData: {
127127
showDecadeNav: true,
128128
value: '2020-02-15' // Leap year
@@ -178,7 +178,7 @@ describe('calendar', () => {
178178

179179
it('focus and blur methods work', async () => {
180180
const wrapper = mount(BCalendar, {
181-
attachTo: createContainer(),
181+
attachTo: document.body,
182182
propsData: {
183183
value: '2020-02-15' // Leap year
184184
}
@@ -211,7 +211,7 @@ describe('calendar', () => {
211211

212212
it('clicking output header focuses grid', async () => {
213213
const wrapper = mount(BCalendar, {
214-
attachTo: createContainer(),
214+
attachTo: document.body,
215215
propsData: {
216216
value: '2020-02-15' // Leap year
217217
}
@@ -246,7 +246,7 @@ describe('calendar', () => {
246246

247247
it('has correct header tag when "header-tag" prop is set', async () => {
248248
const wrapper = mount(BCalendar, {
249-
attachTo: createContainer(),
249+
attachTo: document.body,
250250
propsData: {
251251
value: '2020-02-15', // Leap year,
252252
headerTag: 'div'
@@ -266,7 +266,7 @@ describe('calendar', () => {
266266

267267
it('keyboard navigation works', async () => {
268268
const wrapper = mount(BCalendar, {
269-
attachTo: createContainer(),
269+
attachTo: document.body,
270270
propsData: {
271271
value: '2020-02-15' // Leap year
272272
}
@@ -362,7 +362,7 @@ describe('calendar', () => {
362362

363363
it('should disable key navigation when `no-key-nav` prop set', () => {
364364
const wrapper = mount(BCalendar, {
365-
attachTo: createContainer(),
365+
attachTo: document.body,
366366
propsData: {
367367
noKeyNav: true,
368368
navButtonVariant: 'primary'
@@ -381,7 +381,7 @@ describe('calendar', () => {
381381

382382
it('`nav-button-variant` changes nav button class', async () => {
383383
const wrapper = mount(BCalendar, {
384-
attachTo: createContainer(),
384+
attachTo: document.body,
385385
propsData: {
386386
navButtonVariant: 'primary'
387387
}
@@ -400,7 +400,7 @@ describe('calendar', () => {
400400

401401
it('disables dates based on `date-disabled-fn` prop', async () => {
402402
const wrapper = mount(BCalendar, {
403-
attachTo: createContainer(),
403+
attachTo: document.body,
404404
propsData: {
405405
value: '2020-01-01',
406406
dateDisabledFn(ymd) {
@@ -433,7 +433,7 @@ describe('calendar', () => {
433433

434434
it('applies classes on dates based on `date-info-fn` prop', async () => {
435435
const wrapper = mount(BCalendar, {
436-
attachTo: createContainer(),
436+
attachTo: document.body,
437437
propsData: {
438438
value: '2020-01-01',
439439
dateInfoFn(ymd) {

‎src/components/carousel/carousel.spec.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mount } from '@vue/test-utils'
2-
import { createContainer, waitNT, waitRAF } from '../../../tests/utils'
2+
import { waitNT, waitRAF } from '../../../tests/utils'
33
import { BCarousel } from './carousel'
44
import { BCarouselSlide } from './carousel-slide'
55

@@ -34,7 +34,7 @@ const App = {
3434
describe('carousel', () => {
3535
it('has expected default structure', async () => {
3636
const wrapper = mount(BCarousel, {
37-
attachTo: createContainer()
37+
attachTo: document.body
3838
})
3939

4040
expect(wrapper.vm).toBeDefined()
@@ -101,7 +101,7 @@ describe('carousel', () => {
101101

102102
it('has prev/next controls when prop controls is set', async () => {
103103
const wrapper = mount(BCarousel, {
104-
attachTo: createContainer(),
104+
attachTo: document.body,
105105
propsData: {
106106
controls: true
107107
}
@@ -164,7 +164,7 @@ describe('carousel', () => {
164164

165165
it('has indicators showing when prop indicators is set', async () => {
166166
const wrapper = mount(BCarousel, {
167-
attachTo: createContainer(),
167+
attachTo: document.body,
168168
propsData: {
169169
indicators: true
170170
}
@@ -211,7 +211,7 @@ describe('carousel', () => {
211211

212212
it('should have class "carousel-fade" when prop "fade" is "true"', async () => {
213213
const wrapper = mount(BCarousel, {
214-
attachTo: createContainer(),
214+
attachTo: document.body,
215215
propsData: {
216216
fade: true
217217
}
@@ -230,7 +230,7 @@ describe('carousel', () => {
230230

231231
it('should not have class "fade" or "slide" when prop "no-animation" is "true"', async () => {
232232
const wrapper = mount(BCarousel, {
233-
attachTo: createContainer(),
233+
attachTo: document.body,
234234
propsData: {
235235
noAnimation: true
236236
}
@@ -249,7 +249,7 @@ describe('carousel', () => {
249249

250250
it('should not have class "fade" or "slide" when prop "no-animation" and "fade" are "true"', async () => {
251251
const wrapper = mount(BCarousel, {
252-
attachTo: createContainer(),
252+
attachTo: document.body,
253253
propsData: {
254254
fade: true,
255255
noAnimation: true
@@ -269,7 +269,7 @@ describe('carousel', () => {
269269

270270
it('should not automatically scroll to next slide when "interval" is "0"', async () => {
271271
const wrapper = mount(App, {
272-
attachTo: createContainer(),
272+
attachTo: document.body,
273273
propsData: {
274274
interval: 0
275275
}
@@ -296,7 +296,7 @@ describe('carousel', () => {
296296

297297
it('should scroll to next/prev slide when next/prev clicked', async () => {
298298
const wrapper = mount(App, {
299-
attachTo: createContainer(),
299+
attachTo: document.body,
300300
propsData: {
301301
interval: 0,
302302
controls: true
@@ -358,7 +358,7 @@ describe('carousel', () => {
358358

359359
it('should scroll to next/prev slide when next/prev space keypress', async () => {
360360
const wrapper = mount(App, {
361-
attachTo: createContainer(),
361+
attachTo: document.body,
362362
propsData: {
363363
interval: 0,
364364
controls: true
@@ -420,7 +420,7 @@ describe('carousel', () => {
420420

421421
it('should scroll to specified slide when indicator clicked', async () => {
422422
const wrapper = mount(App, {
423-
attachTo: createContainer(),
423+
attachTo: document.body,
424424
propsData: {
425425
interval: 0,
426426
controls: true
@@ -482,7 +482,7 @@ describe('carousel', () => {
482482

483483
it('should scroll to specified slide when indicator keypress space/enter', async () => {
484484
const wrapper = mount(App, {
485-
attachTo: createContainer(),
485+
attachTo: document.body,
486486
propsData: {
487487
interval: 0,
488488
controls: true
@@ -544,7 +544,7 @@ describe('carousel', () => {
544544

545545
it('should scroll to next/prev slide when key next/prev pressed', async () => {
546546
const wrapper = mount(App, {
547-
attachTo: createContainer(),
547+
attachTo: document.body,
548548
propsData: {
549549
interval: 0,
550550
controls: true
@@ -603,7 +603,7 @@ describe('carousel', () => {
603603

604604
it('should emit paused and unpaused events when "interval" changed to 0', async () => {
605605
const wrapper = mount(App, {
606-
attachTo: createContainer(),
606+
attachTo: document.body,
607607
propsData: {
608608
interval: 0
609609
}
@@ -682,7 +682,7 @@ describe('carousel', () => {
682682

683683
it('should scroll to specified slide when value (v-model) changed', async () => {
684684
const wrapper = mount(App, {
685-
attachTo: createContainer(),
685+
attachTo: document.body,
686686
propsData: {
687687
interval: 0,
688688
value: 0
@@ -761,7 +761,7 @@ describe('carousel', () => {
761761

762762
it('changing slides works when "no-animation" set', async () => {
763763
const wrapper = mount(App, {
764-
attachTo: createContainer(),
764+
attachTo: document.body,
765765
propsData: {
766766
interval: 0,
767767
noAnimation: true
@@ -825,7 +825,7 @@ describe('carousel', () => {
825825

826826
it('setting new slide when sliding is active, schedules the new slide to happen after finished', async () => {
827827
const wrapper = mount(App, {
828-
attachTo: createContainer(),
828+
attachTo: document.body,
829829
propsData: {
830830
interval: 0
831831
}
@@ -902,7 +902,7 @@ describe('carousel', () => {
902902

903903
it('next/prev slide wraps to end/start when "no-wrap is "false"', async () => {
904904
const wrapper = mount(App, {
905-
attachTo: createContainer(),
905+
attachTo: document.body,
906906
propsData: {
907907
interval: 0,
908908
noAnimation: true,
@@ -967,7 +967,7 @@ describe('carousel', () => {
967967

968968
it('next/prev slide does not wrap to end/start when "no-wrap" is "true"', async () => {
969969
const wrapper = mount(App, {
970-
attachTo: createContainer(),
970+
attachTo: document.body,
971971
propsData: {
972972
interval: 0,
973973
// Transitions (or fallback timers) are not used when no-animation set

0 commit comments

Comments
 (0)