From ac970b8641f20b3fd3f43bea4fffe72373d3db29 Mon Sep 17 00:00:00 2001 From: Duncan Graham Walker Date: Thu, 22 Dec 2016 18:08:21 +0000 Subject: [PATCH] Testing tooltip side closest to the target is in the right position --- test-support/helpers/ember-tooltips.js | 8 ++++---- tests/integration/components/side-test.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test-support/helpers/ember-tooltips.js b/test-support/helpers/ember-tooltips.js index 6c988ede..cbf2a739 100644 --- a/test-support/helpers/ember-tooltips.js +++ b/test-support/helpers/ember-tooltips.js @@ -126,16 +126,16 @@ export function assertTooltipSide(assert, options = {}) { const tooltipPosition = $tooltip[0].getBoundingClientRect(); if (expectedSide === 'top') { - assert.ok(targetPosition.top > tooltipPosition.top, + assert.ok(targetPosition.top > tooltipPosition.bottom, 'Tooltip should be above the target'); } else if (expectedSide === 'right') { - assert.ok(targetPosition.left < tooltipPosition.left, + assert.ok(targetPosition.right < tooltipPosition.left, 'Tooltip should be right of the target'); } else if (expectedSide === 'bottom') { - assert.ok(targetPosition.top < tooltipPosition.top, + assert.ok(targetPosition.bottom < tooltipPosition.top, 'Tooltip should be below the target'); } else if (expectedSide === 'left') { - assert.ok(targetPosition.left > tooltipPosition.left, + assert.ok(targetPosition.left > tooltipPosition.right, 'Tooltip should be left of the target'); } } diff --git a/tests/integration/components/side-test.js b/tests/integration/components/side-test.js index 7cf5717c..88bc0333 100644 --- a/tests/integration/components/side-test.js +++ b/tests/integration/components/side-test.js @@ -73,6 +73,6 @@ test('tooltip-on-element shows with showOn left', function(assert) { // {{/tooltip-on-element}} // `); -// assertPosition(assert, this, 'right'); +// assertTooltipSide(assert, { side: 'right' }); // });