Merge remote-tracking branch 'origin/MAGETWO-52958-1' into MAGETWO-52958-1

vkorotun · vkorotun · commit a6043005c7cc · 2017-04-11T15:25:21.000+03:00
diff --git a/app/code/Magento/Ui/view/base/requirejs-config.js b/app/code/Magento/Ui/view/base/requirejs-config.js
@@ -15,6 +15,7 @@ var config = {
             uiClass:        'Magento_Ui/js/lib/core/class',
             uiEvents:       'Magento_Ui/js/lib/core/events',
             uiRegistry:     'Magento_Ui/js/lib/registry/registry',
+            consoleLogger:  'Magento_Ui/js/lib/logger/console-logger',
             uiLayout:       'Magento_Ui/js/core/renderer/layout',
             buttonAdapter:  'Magento_Ui/js/form/button-adapter'
         }
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/console-logger.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/console-logger.js
@@ -1,3 +1,8 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
 define([
     './logger',
     './entry-factory',
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/console-output-handler.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/console-output-handler.js
@@ -2,6 +2,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     './levels-pool'
 ], function (logLevels) {
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/entry-factory.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/entry-factory.js
@@ -2,6 +2,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     './entry'
 ], function (LogEntry) {
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/entry.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/entry.js
@@ -2,6 +2,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     './levels-pool'
 ], function (logLevels) {
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/formatter.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/formatter.js
@@ -2,6 +2,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     'moment',
     'mage/utils/template'
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/levels-pool.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/levels-pool.js
@@ -2,6 +2,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     'underscore'
 ], function (_) {
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
@@ -2,6 +2,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([], function () {
     'use strict';
 
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/logger.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/logger.js
@@ -2,6 +2,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     './levels-pool'
 ], function (logLevels) {
@@ -28,7 +29,7 @@ define([
          * @protected
          * @type {Number}
          */
-        this.displayLevel_ = levels.WARN;
+        this.displayLevel_ = levels.ERROR;
 
         /**
          * An array of display criteria.
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/message-pool.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/message-pool.js
@@ -1,3 +1,8 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
 define(function () {
     'use strict';
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/logger/logger.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/logger/logger.test.js
@@ -189,6 +189,7 @@ define([
                 spyOn(entryHandler, 'show');
                 spyOn(entryFactory, 'createEntry').and.callThrough();
 
+                logger.setDisplayLevel(levels.WARN);
                 entry = logger.warn('warn message', logData);
 
                 expect(entry instanceof LogEntry).toBe(true);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js
@@ -1,34 +1,41 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/* global jQuery */
-/* eslint-disable max-nested-callbacks */
+
 define([
     'squire'
 ], function (Squire) {
     'use strict';
 
     var injector = new Squire(),
         mocks = {
-            'uiRegistry': jasmine.createSpy()
+            'Magento_Ui/js/timeline/timeline-view': jasmine.createSpy()
         },
         timeline;
 
-    describe('Magento_Ui/js/timeline/timeline', function () {
-        beforeEach(function (done) {
-            injector.mock(mocks);
-            injector.require(['Magento_Ui/js/timeline/timeline'], function (Constr) {
-                timeline = new Constr({
-                    provider: 'provName',
-                    name: '',
-                    index: '',
-                    links: '',
-                    listens: ''
-                });
-                done();
+    beforeEach(function (done) {
+        injector.mock(mocks);
+        injector.require(['Magento_Ui/js/timeline/timeline', 'knockoutjs/knockout-es5'], function (Constr) {
+            timeline = new Constr({
+                name: '',
+                index: '',
+                links: '',
+                listens: '',
+                viewConfig: {
+                    component: '',
+                    model: ''
+                },
+                dndConfig: {
+                    enabled: false
+                }
             });
+            done();
         });
+    });
+
+    describe('Magento_Ui/js/timeline/timeline', function () {
+
         describe('isActive method', function () {
             it('record status is 1', function () {
                 expect(timeline.isActive({

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ var config = {`
`15`	`15`	`uiClass: 'Magento_Ui/js/lib/core/class',`
`16`	`16`	`uiEvents: 'Magento_Ui/js/lib/core/events',`
`17`	`17`	`uiRegistry: 'Magento_Ui/js/lib/registry/registry',`
	`18`	`+ consoleLogger: 'Magento_Ui/js/lib/logger/console-logger',`
`18`	`19`	`uiLayout: 'Magento_Ui/js/core/renderer/layout',`
`19`	`20`	`buttonAdapter: 'Magento_Ui/js/form/button-adapter'`
`20`	`21`	`}`