Skip to content

Commit

Permalink
fix(tests): fix sauce tests (#5057)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Domainv @valorkin
Domainv authored and valorkin committed Feb 12, 2019
1 parent b697cc5 commit 0bc4a69
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 63 deletions.
1 change: 0 additions & 1 deletion src/positioning/modifiers/flip.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ export function flip(data: Data): Data {
(!isVertical && variation === 'right' && overflowsBottom));

if (overlapsRef || overflowsBoundaries || flippedVariation) {
// this boolean to detect any flip loop
if (overlapsRef || overflowsBoundaries) {
placement = flipOrder[index + 1];
}
Expand Down
11 changes: 8 additions & 3 deletions src/positioning/modifiers/initData.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ import { Data } from '../models';
export function initData(targetElement: HTMLElement, hostElement: HTMLElement, position: string): Data {

const hostElPosition = getReferenceOffsets(targetElement, hostElement);
const targetOffset = getTargetOffsets(targetElement, hostElPosition, position);
const placementAuto = !!position.match(/auto/g);

const placement = computeAutoPlacement(position, hostElPosition, targetElement, hostElement, 'viewport', 0);
const placementAuto = position.indexOf('auto') !== -1;
// support old placements 'auto left|right|top|bottom'
let placement = !!position.match(/auto\s(left|right|top|bottom)/g)
? position.split(' ')[1] || ''
: position;

const targetOffset = getTargetOffsets(targetElement, hostElPosition, placement);
placement = computeAutoPlacement(placement, hostElPosition, targetElement, hostElement, 'viewport', 0);

return {
instance: {
Expand Down
9 changes: 0 additions & 9 deletions src/positioning/utils/computeAutoPlacement.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@ export function computeAutoPlacement(
return placement;
}

if (placement.indexOf('auto') !== -1
&& (placement.indexOf('left') !== -1
|| placement.indexOf('right') !== -1
|| placement.indexOf('top') !== -1
|| placement.indexOf('bottom') !== -1)) {

return placement.split(' ')[1] || '';
}

const boundaries = getBoundaries(target, host, padding, boundariesElement);

const rects: any = {
Expand Down
87 changes: 37 additions & 50 deletions src/spec/typeahead.directive.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import { Component, DebugElement } from '@angular/core';
import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { FormsModule } from '@angular/forms';

import { dispatchMouseEvent } from '@netbasal/spectator';
import { fireEvent } from '../../scripts/helpers';
import { dispatchMouseEvent, dispatchTouchEvent, dispatchKeyboardEvent } from '@netbasal/spectator';
import { of } from 'rxjs';
import { TypeaheadMatch, TypeaheadDirective, TypeaheadModule } from '../typeahead';

Expand Down Expand Up @@ -121,7 +120,7 @@ describe('Directive: Typeahead', () => {
describe('onInput', () => {
it('should be called show method', fakeAsync(() => {
inputElement.value = 'a';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();

expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
Expand All @@ -131,7 +130,7 @@ describe('Directive: Typeahead', () => {
it('and dropup equal true should be called show method', fakeAsync(() => {
directive.dropup = true;
inputElement.value = 'al';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();

expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
Expand All @@ -140,11 +139,11 @@ describe('Directive: Typeahead', () => {

it('if value was changed to invalid should be called hide method', fakeAsync(() => {
inputElement.value = 'al';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();

inputElement.value = ' ';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
Expand All @@ -153,7 +152,7 @@ describe('Directive: Typeahead', () => {

it('if value equal 0 should be called hide method', fakeAsync(() => {
inputElement.value = ' ';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
Expand All @@ -163,11 +162,11 @@ describe('Directive: Typeahead', () => {
it('if click event triggers on outside element should be called onOutsideClick method',
fakeAsync(() => {
inputElement.value = 'al';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();

inputElement.value = ' ';
document.dispatchEvent(new Event('click'));
dispatchMouseEvent(document, 'click');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
Expand All @@ -178,14 +177,14 @@ describe('Directive: Typeahead', () => {
describe('onFocus', () => {
it('should work if typeaheadMinLength equal 0', fakeAsync(() => {
directive.typeaheadMinLength = 0;
inputElement.dispatchEvent(new Event('click'));
dispatchMouseEvent(inputElement, 'click');
tick();

expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
}));

it('should not work if typeaheadMinLength equal 0', fakeAsync(() => {
inputElement.dispatchEvent(new Event('click'));
dispatchMouseEvent(inputElement, 'click');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
Expand All @@ -208,7 +207,7 @@ describe('Directive: Typeahead', () => {
beforeEach(
fakeAsync(() => {
inputElement.value = 'Ala';
fireEvent(inputElement, 'input');
dispatchTouchEvent(inputElement, 'input');
directive.typeaheadGroupField = 'region';

fixture.detectChanges();
Expand Down Expand Up @@ -257,7 +256,7 @@ describe('Directive: Typeahead', () => {
describe('onBlur', () => {
it('blur event should send the correct active item', fakeAsync(() => {
inputElement.value = 'Alab';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();

spyOn(fixture.componentInstance, 'onBlurEvent').and.callFake(param => {
Expand All @@ -274,7 +273,7 @@ describe('Directive: Typeahead', () => {
beforeEach(
fakeAsync(() => {
inputElement.value = 'Ala';
fireEvent(inputElement, 'input');
dispatchTouchEvent(inputElement, 'input');
directive.typeaheadHideResultsOnBlur = false;
fixture.detectChanges();
tick(100);
Expand Down Expand Up @@ -305,7 +304,7 @@ describe('Directive: Typeahead', () => {
beforeEach(
fakeAsync(() => {
inputElement.value = 'Ala';
fireEvent(inputElement, 'input');
dispatchTouchEvent(inputElement, 'input');

fixture.detectChanges();
tick(100);
Expand Down Expand Up @@ -346,7 +345,7 @@ describe('Directive: Typeahead', () => {

it('should result in 0 matches, when input does not match', fakeAsync(() => {
inputElement.value = 'foo';
fireEvent(inputElement, 'input');
dispatchTouchEvent(inputElement, 'input');
fixture.detectChanges();
tick(100);

Expand All @@ -357,7 +356,7 @@ describe('Directive: Typeahead', () => {
it('should not display null item', fakeAsync(() => {
component.states.push({id: 3, name: null, region: 'West'});
inputElement.value = 'Ala';
fireEvent(inputElement, 'input');
dispatchTouchEvent(inputElement, 'input');
fixture.detectChanges();
tick(100);

Expand All @@ -367,63 +366,56 @@ describe('Directive: Typeahead', () => {

it('should be triggered hide method if esc was clicked', fakeAsync(() => {
expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 27} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keyup', 'ESCAPE');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
}));

it('should be triggered hide method if enter was clicked', fakeAsync(() => {
expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 13} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keyup', 'ENTER');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
}));

it('should not be triggered prevActiveMatch method if up was clicked', fakeAsync(() => {
inputElement.value = ' ';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 38} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keyup', 'UP_ARROW');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
}));

it('should be triggered prevActiveMatch method if up was clicked', fakeAsync(() => {
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 38} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keyup', 'UP_ARROW');
tick();

expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
}));

it('should not be triggered nextActiveMatch method if down was clicked', fakeAsync(() => {
inputElement.value = ' ';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 40} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keyup', 'DOWN_ARROW');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
}));

it('should be triggered nextActiveMatch method if down was clicked', fakeAsync(() => {
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 40} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keyup', 'DOWN_ARROW');
tick();

expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
}));

it('should not close typeahead container if Ctrl was clicked', fakeAsync(() => {
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 45} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keydown', 'INSERT');
tick();

expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
Expand All @@ -434,58 +426,53 @@ describe('Directive: Typeahead', () => {
beforeEach(
fakeAsync(() => {
inputElement.value = 'Ala';
fireEvent(inputElement, 'input');
dispatchTouchEvent(inputElement, 'input');
fixture.detectChanges();
tick(100);
})
);

it('should not be triggered show method', fakeAsync(() => {
expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 9} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keydown', 'TAB');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
}));

it('should not be triggered hide method', fakeAsync(() => {
inputElement.value = ' ';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 9} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keydown', 'TAB');
tick();
expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
}));

it('should close container if Enter was clicked', fakeAsync(() => {
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 13} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keydown', 'ENTER');
tick();
expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
}));

it('should not close typeahead container if Ctrl was clicked', fakeAsync(() => {
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 45} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keydown', 'INSERT');
tick();

expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
}));

it('should close typeahead container if Tab was clicked', fakeAsync(() => {
inputElement.value = ' ';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();

directive.typeaheadSelectFirstItem = false;
directive.isActiveItemChanged = true;
inputElement.value = 'Alab';
inputElement.dispatchEvent(new Event('input'));
dispatchTouchEvent(inputElement, 'input');
tick();
/* tslint:disable:no-object-literal-type-assertion */
inputElement.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 9} as {[key: string]: number}));
dispatchKeyboardEvent(inputElement, 'keydown', 'TAB');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
Expand All @@ -496,7 +483,7 @@ describe('Directive: Typeahead', () => {
beforeEach(
fakeAsync(() => {
inputElement.value = 'Ala';
fireEvent(inputElement, 'input');
dispatchTouchEvent(inputElement, 'input');
directive.typeaheadHideResultsOnBlur = false;
fixture.detectChanges();
tick(100);
Expand All @@ -505,7 +492,7 @@ describe('Directive: Typeahead', () => {

it('equal true should be opened',
fakeAsync(() => {
document.dispatchEvent(new Event('click'));
dispatchMouseEvent(document, 'click');
tick();

expect(fixture.nativeElement.querySelector('.dropdown').classList).toContain('open');
Expand All @@ -515,7 +502,7 @@ describe('Directive: Typeahead', () => {
it('equal false should be closed',
fakeAsync(() => {
directive.typeaheadHideResultsOnBlur = true;
document.dispatchEvent(new Event('click'));
dispatchMouseEvent(document, 'click');
tick();

expect(fixture.debugElement.query(By.css('typeahead-container'))).toBeNull();
Expand Down

0 comments on commit 0bc4a69

Please sign in to comment.