Merge remote-tracking branch 'antranig/FLUID-6092'

* antranig/FLUID-6092: FLUID-6092: Renamed "elements" to "sequenceElements" in IoC Testing Framework
fluid-project · Dec 6, 2016 · 85a1ffe · 85a1ffe
2 parents 945866a + 354a685
commit 85a1ffe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/test-core/testTests/js/IoCTestingTests.js b/tests/test-core/testTests/js/IoCTestingTests.js
@@ -530,7 +530,7 @@ fluid.tests.elementPriority.checkSequence = function (record) {
 
 fluid.defaults("fluid.tests.elementPrioritySequence", {
     gradeNames: "fluid.test.sequence",
-    elements: {
+    sequenceElements: {
         check: {
             gradeNames: "fluid.tests.elementPriority.check",
             options: {
@@ -566,7 +566,7 @@ fluid.defaults("fluid.tests.elementPriority", {
         pushRecord: "fluid.tests.elementPriority.pushRecord({testCaseHolder}.record, {arguments}.0)"
     },
     modules: [{
-        name: "Priority-driven grade budding",
+        name: "FLUID-5903: Priority-driven grade budding",
         tests: [{
             expect: 1,
             name: "Simple sequence of 4 active elements",

diff --git a/tests/test-core/utils/js/IoCTestUtils.js b/tests/test-core/utils/js/IoCTestUtils.js
@@ -483,7 +483,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
             var sequenceComponent = fluid.construct(seqPath, {type: fixture.sequenceGrade});
 
             fluid.test.checkComponentGrade(sequenceComponent, fixture.sequenceGrade, "fluid.test.sequence", "sequenceGrade", fixture);
-            var elements = fluid.transform(sequenceComponent.options.elements, function (element, i) {
+            var elements = fluid.transform(sequenceComponent.options.sequenceElements, function (element, i) {
                 var elementPath = seqPath.concat(["sequenceElement-" + i]);
                 var constructOptions = fluid.extend({type: element.gradeNames}, element.options);
                 var elementComponent = fluid.construct(elementPath, constructOptions);