]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
tests: migrate to mocha-headless-chrome
authorDaniel Ruf <daniel@daniel-ruf.de>
Wed, 14 Feb 2018 23:53:02 +0000 (00:53 +0100)
committerDaniel Ruf <daniel@daniel-ruf.de>
Thu, 15 Feb 2018 00:49:54 +0000 (01:49 +0100)
js/foundation.abide.js
package.json
test/javascript/components/offcanvas.js
test/javascript/util/box.js

index b307f29a5291edb6dca6b08fd485770c9832fd0d..52c14e3dc8b3c3f7605a219d785b24329c1d85a4 100644 (file)
@@ -229,7 +229,7 @@ class Abide extends Plugin {
       $el.attr('aria-describedby', errorId);
     }
 
-    if ($labels.filter('[for]').end().length < $labels.length) {
+    if ($labels.filter('[for]').length < $labels.length) {
       // Get the input ID or create one
       let elemId = $el.attr('id');
       if (typeof elemId === 'undefined') {
index 9dd311b7aa096ae3402f1878af0ddd2c01e69bdf..bdc14ffa0e2e5b83e6464dd975a31d92ca4ddaa0 100644 (file)
   "homepage": "http://foundation.zurb.com/sites",
   "scripts": {
     "start": "gulp",
-    "test": "npm run test:sass && npm run test:javascript:phantomjs",
+    "test": "npm run test:sass && npm run test:javascript:units",
     "test:ci": "npm run test:sass && npm run test:javascript:ci",
     "test:sass": "mocha test/sass/test_sass.js",
     "test:javascript:transpile": "gulp sass:foundation && gulp test:transpile-js",
-    "test:javascript:phantomjs": "npm run test:javascript:transpile && mocha-phantomjs --ignore-resource-errors test/javascript/index.html",
+    "test:javascript:units": "npm run test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -f test/javascript/index.html",
     "test:javascript:browserstack": "npm run test:javascript:transpile && browserstack-runner",
-    "test:javascript:ci": "npm run test:javascript:transpile && mocha-phantomjs --ignore-resource-errors test/javascript/index.html && browserstack-runner",
+    "test:javascript:ci": "npm run test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -f test/javascript/index.html && browserstack-runner",
     "test:visual": "gulp test",
     "deploy": "gulp deploy",
     "deploy:prep": "gulp deploy:prep",
@@ -80,7 +80,7 @@
     "is-empty-object": "^1.1.1",
     "js-yaml": "^3.8.4",
     "mocha": "^3.4.2",
-    "mocha-phantomjs": "^4.0.2",
+    "mocha-headless-chrome": "^1.8.2",
     "motion-ui": "^1.1.0",
     "multiline": "^1.0.2",
     "normalize-scss": "6.0.0",
index a031723316844bd91d57625e9ce1eb592cc7f9fc..7938dbaf1726f0109d0bf6b87b8240db57d4e75d 100644 (file)
@@ -104,7 +104,7 @@ describe('Off Canvas', function() {
           plugin.$element.should.have.class('is-open');
           $('body').should.have.class('is-off-canvas-open');
           done();
-        }, 1);
+        }, 30);
       });
 
       plugin.open();
index 0f1073429cfedfc68a73dd6ebad85216d052d710..aedafed562d9a3b38d2b9c3a1af62005fd881e3c 100644 (file)
@@ -33,8 +33,8 @@ describe('Foundation box', function () {
 
       var dims = Foundation.Box.GetDimensions($("#rect-test"));
 
-      dims.width.should.equal(200);
-      dims.height.should.equal(100);
+      Math.round(dims.width).should.equal(200); // Math.round fix for IE 11 (probably because of rem)
+      Math.round(dims.height).should.equal(100); // Math.round fix for IE 11 (probably because of rem)
     });
 
     it('parent height of element', function () {