From 6347909fb2fb53c4d3b7bd91274a6ac274851765 Mon Sep 17 00:00:00 2001 From: Maximilian Heinz Date: Mon, 19 Oct 2015 10:58:03 +0200 Subject: [PATCH] test(lory): update tests to work in all browsers correctly --- local.karma.conf.js | 12 +++++------- test/lory.test.js | 35 +++++++++-------------------------- 2 files changed, 14 insertions(+), 33 deletions(-) diff --git a/local.karma.conf.js b/local.karma.conf.js index 27504a3..dd92b7d 100644 --- a/local.karma.conf.js +++ b/local.karma.conf.js @@ -23,12 +23,11 @@ module.exports = function (config) { ], browsers: [ - 'Chrome' - // 'ChromeCanary', - // 'PhantomJS', - // 'Firefox', - // 'Opera', - // 'Safari' + 'Chrome', + 'ChromeCanary', + 'PhantomJS', + 'Firefox', + 'Safari' ], plugins: [ @@ -39,7 +38,6 @@ module.exports = function (config) { 'karma-chrome-launcher', 'karma-phantomjs-launcher', 'karma-ie-launcher', - 'karma-opera-launcher', 'karma-firefox-launcher', 'karma-safari-launcher', 'karma-html2js-preprocessor' diff --git a/test/lory.test.js b/test/lory.test.js index 1334050..48a91d3 100644 --- a/test/lory.test.js +++ b/test/lory.test.js @@ -164,10 +164,7 @@ describe('.next() called 2x', function() { instance.next(); } - var transform = document.querySelector('.js_slides').style.transform - var offset = new WebKitCSSMatrix(document.querySelector('.js_slides').style.transform).m41 - - assert.equal(offset, expectedOffset); + assert.equal(instance.returnIndex(), 2); }); }); @@ -194,10 +191,7 @@ describe('.next() called 4x', function() { instance.next(); } - var transform = document.querySelector('.js_slides').style.transform - var offset = new WebKitCSSMatrix(document.querySelector('.js_slides').style.transform).m41 - - assert.equal(offset, expectedOffset); + assert.equal(instance.returnIndex(), 4); }); }); @@ -251,10 +245,7 @@ describe('.prev() called 2x without infinite', function() { instance.prev(); } - var transform = document.querySelector('.js_slides').style.transform - var offset = new WebKitCSSMatrix(document.querySelector('.js_slides').style.transform).m41 - - assert.equal(offset, expectedOffset); + assert.equal(instance.returnIndex(), 0); }); }); @@ -280,10 +271,7 @@ describe('.prev() called 4x without infinite', function() { instance.prev(); } - var transform = document.querySelector('.js_slides').style.transform - var offset = new WebKitCSSMatrix(document.querySelector('.js_slides').style.transform).m41 - - assert.equal(offset, expectedOffset); + assert.equal(instance.returnIndex(), 0); }); }); @@ -310,13 +298,11 @@ describe('.prev() called 2x with infinite', function() { }); it('offset has to be the expectedOffset', function() { - instance.prev(); - instance.prev(); - - var transform = document.querySelector('.js_slides').style.transform - var offset = new WebKitCSSMatrix(document.querySelector('.js_slides').style.transform).m41 + for (var i = 0; i < 2; i++) { + instance.prev(); + } - assert.equal(offset, expectedOffset); + assert.equal(instance.returnIndex(), 5); }); }); @@ -347,10 +333,7 @@ describe('.prev() called 4x with infinite', function() { instance.prev(); } - var transform = document.querySelector('.js_slides').style.transform - var offset = new WebKitCSSMatrix(document.querySelector('.js_slides').style.transform).m41 - - assert.equal(offset, expectedOffset); + assert.equal(instance.returnIndex(), 3); }); });