Skip to content

Commit c010005

Browse files
lmiller1990lmiller1990
committed
chore: v1.1.4
1 parent 3cd81d0 commit c010005

File tree

4 files changed

+275
-52
lines changed

4 files changed

+275
-52
lines changed

‎packages/server-test-utils/dist/vue-server-test-utils.js

+68-13
Original file line numberDiff line numberDiff line change
@@ -1885,7 +1885,7 @@ function vmMatchesName(vm, name) {
18851885
// We want to mirror how Vue resolves component names in SFCs:
18861886
// For example, <test-component />, <TestComponent /> and `<testComponent />
18871887
// all resolve to the same component
1888-
var componentName = (vm.$options && vm.$options.name) || '';
1888+
var componentName = vm.name || (vm.$options && vm.$options.name) || '';
18891889
return (
18901890
!!name &&
18911891
(componentName === name ||
@@ -1931,13 +1931,7 @@ function matches(node, selector) {
19311931
return element && element.matches && element.matches(selector.value)
19321932
}
19331933

1934-
var isFunctionalSelector = isConstructor(selector.value)
1935-
? selector.value.options.functional
1936-
: selector.value.functional;
1937-
1938-
var componentInstance = isFunctionalSelector
1939-
? node[FUNCTIONAL_OPTIONS]
1940-
: node.child;
1934+
var componentInstance = node[FUNCTIONAL_OPTIONS] || node.child;
19411935

19421936
if (!componentInstance) {
19431937
return false
@@ -9358,11 +9352,43 @@ var modifiers = {
93589352
pagedown: 34
93599353
};
93609354

9355+
// get from https://github.com/ashubham/w3c-keys/blob/master/index.ts
9356+
var w3cKeys = {
9357+
enter: 'Enter',
9358+
tab: 'Tab',
9359+
delete: 'Delete',
9360+
esc: 'Esc',
9361+
escape: 'Escape',
9362+
space: ' ',
9363+
up: 'Up',
9364+
left: 'Left',
9365+
right: 'Right',
9366+
down: 'Down',
9367+
end: 'End',
9368+
home: 'Home',
9369+
backspace: 'Backspace',
9370+
insert: 'Insert',
9371+
pageup: 'PageUp',
9372+
pagedown: 'PageDown'
9373+
};
9374+
9375+
var codeToKeyNameMap = Object.entries(modifiers).reduce(
9376+
function (acc, ref) {
9377+
var obj;
9378+
9379+
var key = ref[0];
9380+
var value = ref[1];
9381+
return Object.assign(acc, ( obj = {}, obj[value] = w3cKeys[key], obj ));
9382+
},
9383+
{}
9384+
);
9385+
93619386
function getOptions(eventParams) {
93629387
var modifier = eventParams.modifier;
93639388
var meta = eventParams.meta;
93649389
var options = eventParams.options;
93659390
var keyCode = modifiers[modifier] || options.keyCode || options.code;
9391+
var key = codeToKeyNameMap[keyCode];
93669392

93679393
return Object.assign({}, options, // What the user passed in as the second argument to #trigger
93689394

@@ -9371,7 +9397,8 @@ function getOptions(eventParams) {
93719397

93729398
// Any derived options should go here
93739399
keyCode: keyCode,
9374-
code: keyCode})
9400+
code: keyCode,
9401+
key: key})
93759402
}
93769403

93779404
function createEvent(eventParams) {
@@ -9613,7 +9640,7 @@ Wrapper.prototype.emittedByOrder = function emittedByOrder () {
96139640
};
96149641

96159642
/**
9616-
* Utility to check wrapper exists. Returns true as Wrapper always exists
9643+
* Utility to check wrapper exists.
96179644
*/
96189645
Wrapper.prototype.exists = function exists () {
96199646
if (this.vm) {
@@ -10251,6 +10278,35 @@ Wrapper.prototype.text = function text () {
1025110278
return this.element.textContent.trim()
1025210279
};
1025310280

10281+
/**
10282+
* Simulates event triggering
10283+
*/
10284+
Wrapper.prototype.__simulateTrigger = function __simulateTrigger (type, options) {
10285+
var this$1 = this;
10286+
10287+
var regularEventTrigger = function (type, options) {
10288+
var event = createDOMEvent(type, options);
10289+
return this$1.element.dispatchEvent(event)
10290+
};
10291+
10292+
var focusEventTrigger = function (type, options) {
10293+
if (this$1.element instanceof HTMLElement) {
10294+
return this$1.element.focus()
10295+
}
10296+
10297+
regularEventTrigger(type, options);
10298+
};
10299+
10300+
var triggerProcedureMap = {
10301+
focus: focusEventTrigger,
10302+
__default: regularEventTrigger
10303+
};
10304+
10305+
var triggerFn = triggerProcedureMap[type] || triggerProcedureMap.__default;
10306+
10307+
return triggerFn(type, options)
10308+
};
10309+
1025410310
/**
1025510311
* Dispatches a DOM event on wrapper
1025610312
*/
@@ -10293,8 +10349,7 @@ Wrapper.prototype.trigger = function trigger (type, options) {
1029310349
return nextTick()
1029410350
}
1029510351

10296-
var event = createDOMEvent(type, options);
10297-
this.element.dispatchEvent(event);
10352+
this.__simulateTrigger(type, options);
1029810353
return nextTick()
1029910354
};
1030010355

@@ -12877,7 +12932,7 @@ function _createLocalVue(
1287712932
instance.config = cloneDeep_1(Vue__default['default'].config);
1287812933

1287912934
// if a user defined errorHandler is defined by a localVue instance via createLocalVue, register it
12880-
instance.config.errorHandler = config.errorHandler || Vue__default['default'].config.errorHandler;
12935+
instance.config.errorHandler = config.errorHandler;
1288112936

1288212937
// option merge strategies need to be exposed by reference
1288312938
// so that merge strats registered by plugins can work properly

‎packages/test-utils/dist/vue-test-utils.iife.js

+69-13
Original file line numberDiff line numberDiff line change
@@ -2690,7 +2690,7 @@ var VueTestUtils = (function (exports, Vue, vueTemplateCompiler) {
26902690
// We want to mirror how Vue resolves component names in SFCs:
26912691
// For example, <test-component />, <TestComponent /> and `<testComponent />
26922692
// all resolve to the same component
2693-
var componentName = (vm.$options && vm.$options.name) || '';
2693+
var componentName = vm.name || (vm.$options && vm.$options.name) || '';
26942694
return (
26952695
!!name &&
26962696
(componentName === name ||
@@ -2736,13 +2736,7 @@ var VueTestUtils = (function (exports, Vue, vueTemplateCompiler) {
27362736
return element && element.matches && element.matches(selector.value)
27372737
}
27382738

2739-
var isFunctionalSelector = isConstructor(selector.value)
2740-
? selector.value.options.functional
2741-
: selector.value.functional;
2742-
2743-
var componentInstance = isFunctionalSelector
2744-
? node[FUNCTIONAL_OPTIONS]
2745-
: node.child;
2739+
var componentInstance = node[FUNCTIONAL_OPTIONS] || node.child;
27462740

27472741
if (!componentInstance) {
27482742
return false
@@ -10262,11 +10256,43 @@ var VueTestUtils = (function (exports, Vue, vueTemplateCompiler) {
1026210256
pagedown: 34
1026310257
};
1026410258

10259+
// get from https://github.com/ashubham/w3c-keys/blob/master/index.ts
10260+
var w3cKeys = {
10261+
enter: 'Enter',
10262+
tab: 'Tab',
10263+
delete: 'Delete',
10264+
esc: 'Esc',
10265+
escape: 'Escape',
10266+
space: ' ',
10267+
up: 'Up',
10268+
left: 'Left',
10269+
right: 'Right',
10270+
down: 'Down',
10271+
end: 'End',
10272+
home: 'Home',
10273+
backspace: 'Backspace',
10274+
insert: 'Insert',
10275+
pageup: 'PageUp',
10276+
pagedown: 'PageDown'
10277+
};
10278+
10279+
var codeToKeyNameMap = Object.entries(modifiers).reduce(
10280+
function (acc, ref) {
10281+
var obj;
10282+
10283+
var key = ref[0];
10284+
var value = ref[1];
10285+
return Object.assign(acc, ( obj = {}, obj[value] = w3cKeys[key], obj ));
10286+
},
10287+
{}
10288+
);
10289+
1026510290
function getOptions(eventParams) {
1026610291
var modifier = eventParams.modifier;
1026710292
var meta = eventParams.meta;
1026810293
var options = eventParams.options;
1026910294
var keyCode = modifiers[modifier] || options.keyCode || options.code;
10295+
var key = codeToKeyNameMap[keyCode];
1027010296

1027110297
return Object.assign({}, options, // What the user passed in as the second argument to #trigger
1027210298

@@ -10275,7 +10301,8 @@ var VueTestUtils = (function (exports, Vue, vueTemplateCompiler) {
1027510301

1027610302
// Any derived options should go here
1027710303
keyCode: keyCode,
10278-
code: keyCode})
10304+
code: keyCode,
10305+
key: key})
1027910306
}
1028010307

1028110308
function createEvent(eventParams) {
@@ -10517,7 +10544,7 @@ var VueTestUtils = (function (exports, Vue, vueTemplateCompiler) {
1051710544
};
1051810545

1051910546
/**
10520-
* Utility to check wrapper exists. Returns true as Wrapper always exists
10547+
* Utility to check wrapper exists.
1052110548
*/
1052210549
Wrapper.prototype.exists = function exists () {
1052310550
if (this.vm) {
@@ -11155,6 +11182,35 @@ var VueTestUtils = (function (exports, Vue, vueTemplateCompiler) {
1115511182
return this.element.textContent.trim()
1115611183
};
1115711184

11185+
/**
11186+
* Simulates event triggering
11187+
*/
11188+
Wrapper.prototype.__simulateTrigger = function __simulateTrigger (type, options) {
11189+
var this$1 = this;
11190+
11191+
var regularEventTrigger = function (type, options) {
11192+
var event = createDOMEvent(type, options);
11193+
return this$1.element.dispatchEvent(event)
11194+
};
11195+
11196+
var focusEventTrigger = function (type, options) {
11197+
if (this$1.element instanceof HTMLElement) {
11198+
return this$1.element.focus()
11199+
}
11200+
11201+
regularEventTrigger(type, options);
11202+
};
11203+
11204+
var triggerProcedureMap = {
11205+
focus: focusEventTrigger,
11206+
__default: regularEventTrigger
11207+
};
11208+
11209+
var triggerFn = triggerProcedureMap[type] || triggerProcedureMap.__default;
11210+
11211+
return triggerFn(type, options)
11212+
};
11213+
1115811214
/**
1115911215
* Dispatches a DOM event on wrapper
1116011216
*/
@@ -11197,8 +11253,7 @@ var VueTestUtils = (function (exports, Vue, vueTemplateCompiler) {
1119711253
return nextTick()
1119811254
}
1119911255

11200-
var event = createDOMEvent(type, options);
11201-
this.element.dispatchEvent(event);
11256+
this.__simulateTrigger(type, options);
1120211257
return nextTick()
1120311258
};
1120411259

@@ -13818,7 +13873,7 @@ var VueTestUtils = (function (exports, Vue, vueTemplateCompiler) {
1381813873
instance.config = cloneDeep_1(Vue__default['default'].config);
1381913874

1382013875
// if a user defined errorHandler is defined by a localVue instance via createLocalVue, register it
13821-
instance.config.errorHandler = config.errorHandler || Vue__default['default'].config.errorHandler;
13876+
instance.config.errorHandler = config.errorHandler;
1382213877

1382313878
// option merge strategies need to be exposed by reference
1382413879
// so that merge strats registered by plugins can work properly
@@ -14051,6 +14106,7 @@ var VueTestUtils = (function (exports, Vue, vueTemplateCompiler) {
1405114106
return shallowMount(component, options)
1405214107
}
1405314108

14109+
exports.ErrorWrapper = ErrorWrapper;
1405414110
exports.RouterLinkStub = RouterLinkStub;
1405514111
exports.Wrapper = Wrapper;
1405614112
exports.WrapperArray = WrapperArray;

0 commit comments

Comments
 (0)