Skip to content

Commit 4d90da7

Browse files
committed
Fix an id conflict in one of the test scenes
1 parent 3b60573 commit 4d90da7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tests/asset-and-model.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ test("Modify CSS transform on assetmesh", function () {
6868

6969
var test = frameLoaded.then(function (doc) {
7070
var xTest = doc.getElementById("xml3dTest");
71-
var mesh2 = doc.getElementById("toverride");
71+
var mesh2 = doc.getElementById("outerSubData");
7272
mesh2.setAttribute("style", "transform: translateX(2px)");
7373
return xTest;
7474
}).then(promiseSceneRendered).then(function (s) {
7575
QUnit.closePixel(XML3DUnit.getPixelValue(getContextForXml3DElement(s), 192, 137), [0,255,0, 255], PIXEL_EPSILON, "Assetmesh transform was overridden");
76-
s.querySelector("#toverride").setAttribute("style", "");
76+
s.querySelector("#outerSubData").setAttribute("style", "");
7777
return s;
7878
}).then(promiseSceneRendered).then(function(s) {
7979
QUnit.closePixel(XML3DUnit.getPixelValue(getContextForXml3DElement(s), 130, 137), [0, 255, 0, 255], PIXEL_EPSILON, "Assetmesh returned to original position");

tests/scenes/asset-basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102

103103
<group style="transform: translateX(-5px)">
104104
<model id="mm2" src="#asset2">
105-
<assetmesh id="toverride" name="mesh2" material="#greenmaterial" id="outerSubData">
105+
<assetmesh name="mesh2" material="#greenmaterial" id="outerSubData">
106106
<int name="index">0 1 2</int>
107107
</assetmesh>
108108
</model>

0 commit comments

Comments
 (0)