Merge remote-tracking branch 'origin/MAGETWO-61425' into BUGS

Author: Sergii Kovalenko

app/code/Magento/Ui/view/base/web/js/timeline/timeline.js

@@ -104,7 +104,7 @@ define([
          * @returns {Boolean}
          */
         isActive: function (record) {
-            return record.status === 1;
+            return Number(record.status) === 1;
         },
 
         /**
@@ -115,7 +115,7 @@ define([
          * @returns {Boolean}
          */
         isUpcoming: function (record) {
-            return record.status === 2;
+            return Number(record.status) === 2;
         },
 
         /**

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js

@@ -0,0 +1,58 @@
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/timeline/timeline'
+], function (Timeline) {
+    'use strict';
+
+    describe('Magento_Ui/js/timeline/timeline', function () {
+        var timeline;
+
+        beforeEach(function () {
+            timeline = new Timeline({});
+        });
+
+        describe('isActive method', function () {
+            it('record status is 1', function () {
+                expect(timeline.isActive({
+                    status: 1
+                })).toBe(true);
+            });
+
+            it('record status is "1"', function () {
+                expect(timeline.isActive({
+                    status: '1'
+                })).toBe(true);
+            });
+
+            it('record status is 2', function () {
+                expect(timeline.isActive({
+                    status: 2
+                })).toBe(false);
+            });
+        });
+
+        describe('isUpcoming method', function () {
+            it('record status is 2', function () {
+                expect(timeline.isUpcoming({
+                    status: 2
+                })).toBe(true);
+            });
+
+            it('record status is "2"', function () {
+                expect(timeline.isUpcoming({
+                    status: '2'
+                })).toBe(true);
+            });
+
+            it('record status is 1', function () {
+                expect(timeline.isUpcoming({
+                    status: 1
+                })).toBe(false);
+            });
+        });
+    });
+});