Merge 7941f1a into ad6a1b0

jussi-kalliokoski · Sep 2, 2014 · ee6eb97 · ee6eb97
2 parents ad6a1b0 + 7941f1a
commit ee6eb97
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Carousel/index.js b/Carousel/index.js
@@ -110,6 +110,7 @@ module.exports = React.createClass({
                 className: this.props.baseClass + "__page",
                 key: buffer.index,
                 style: this.calculatePageStyle(buffer.index),
+                "data-index": buffer.pageIndex,
             }, pageView);
         }.bind(this));
     },

diff --git a/test/CarouselSpec.js b/test/CarouselSpec.js
@@ -46,15 +46,24 @@ describe("Carousel", function () {
 
     function expectPages (list) {
         expectChildrenByClassName("merry-go-round__page", list.length);
-        var actual = getPages().map(function (page) {
+        var contents = getPages().map(function (page) {
             if ( page.childNodes.length === 0 ) {
                 return null;
             }
 
             return getElementsByClassName(page, "dummy")[0].innerHTML;
         });
 
-        expect(actual).to.eql(list);
+        var indices = getPages().map(function (page) {
+            if ( page.childNodes.length === 0 ) {
+                return null;
+            }
+
+            return page.getAttribute("data-index");
+        });
+
+        expect(contents).to.eql(list);
+        expect(indices).to.eql(list);
     }
 
     function expectSliderPosition (x, y) {