diff --git a/.gitattributes b/.gitattributes index 70e23f7a9..176a458f9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ * text=auto -sauce-encrypted-env-vars binary diff --git a/circle.yml b/circle.yml index 3e04aca4c..51a2fc35a 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: dependencies: pre: - - openssl -aes-256-cbc -d -in sauce-encrypted-env-vars -out ~/.circlerc -k $SAUCE_DECRYPT_KEY + - openssl aes-256-cbc -d -in sauce-encrypted-env-vars -k $SAUCE_DECRYPT_KEY >> ~/.circlerc test: override: diff --git a/sauce-encrypted-env-vars b/sauce-encrypted-env-vars index 603458d01..293dee6a1 100644 --- a/sauce-encrypted-env-vars +++ b/sauce-encrypted-env-vars @@ -1 +1,2 @@ -Salted__t n¾9QMú'¦k)n_rȆ“ƒ=Õe½çôõ=—º}ßv}Ø—lcÚQiª-òê¡ßTÂ5¡üªö¡ Ô’âÄb~6 ²Õ`"=„„‚»öñÃìñ6–Â% \ No newline at end of file +Salted__£¾IV¬]O‚èÄÊõ:bi»{7CÄ ü0è…"JB><¾kmðÉ­/ɬöCLnòØ]¢>\Ü•±».£ÙÊm"…K²øZÏs9Ÿ’Qš¦¬%ÛvðX +7 Á•eXŽcÏ᥻!w \ No newline at end of file diff --git a/test/core_tests.js b/test/core_tests.js index 1b7a2016a..c8a245e0a 100644 --- a/test/core_tests.js +++ b/test/core_tests.js @@ -45,15 +45,20 @@ var canvasIsNotAStep = !canvas.classList.contains("step") && canvas.id === ""; assert.ok( canvasIsNotAStep, "Canvas do not have step element data" ); - actual = canvas.style.transform; + actual = canvas.style.webkitTransform || canvas.style.transform; expected = "rotateZ(0deg) rotateY(0deg) rotateX(0deg) translate3d(1000px, 0px, 0px)"; assert.strictEqual( actual, expected, "canvas.style.transform initialized correctly" ); - actual = canvas.style.transformOrigin; + // Normalize result for IE 11 and Safari. + actual = canvas.style.webkitTransformOrigin || canvas.style.transformOrigin; expected = "left top 0px"; + + if ( actual === "left top" || actual === "0% 0%" ) { + actual = expected; + } assert.strictEqual( actual, expected, "canvas.style.transformOrigin initialized correctly" ); - actual = canvas.style.transformStyle; + actual = canvas.style.webkitTransformStyle || canvas.style.transformStyle; expected = "preserve-3d"; assert.strictEqual( actual, expected, "canvas.style.transformStyle initialized correctly" );