From 9586054332b35d4393aec818c5d08842f829b4df Mon Sep 17 00:00:00 2001 From: Damien Pobel Date: Thu, 8 Sep 2016 16:33:45 +0200 Subject: [PATCH] Make sure the active flag is forwarded to UDW methods --- .../js/views/ez-universaldiscoveryview.js | 3 +- .../assets/ez-universaldiscoveryview-tests.js | 43 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/Resources/public/js/views/ez-universaldiscoveryview.js b/Resources/public/js/views/ez-universaldiscoveryview.js index 1ae9c1436..5a3896c77 100644 --- a/Resources/public/js/views/ez-universaldiscoveryview.js +++ b/Resources/public/js/views/ez-universaldiscoveryview.js @@ -286,7 +286,8 @@ YUI.add('ez-universaldiscoveryview', function (Y) { 'loadContent': this.get('loadContent'), 'startingLocationId': startingLocationId, 'visible': visible, - 'isSelectable': Y.bind(this.get('isSelectable'), this) + 'isSelectable': Y.bind(this.get('isSelectable'), this), + 'active': this.get('active'), }); if ( visible ) { this._visibleMethodView = method; diff --git a/Tests/js/views/assets/ez-universaldiscoveryview-tests.js b/Tests/js/views/assets/ez-universaldiscoveryview-tests.js index 795248111..bc6a46f32 100644 --- a/Tests/js/views/assets/ez-universaldiscoveryview-tests.js +++ b/Tests/js/views/assets/ez-universaldiscoveryview-tests.js @@ -7,6 +7,7 @@ YUI.add('ez-universaldiscoveryview-tests', function (Y) { tabTest, defaultMethodsTest, selectContentTest, confirmButtonStateTest, updateTitleTest, confirmSelectedContentTest, resetTest, selectionUpdateConfirmViewTest, defaultConfirmedListTest, multipleClassTest, animatedSelectionTest, unselectContentTest, + activeTest, Assert = Y.Assert, Mock = Y.Mock; renderTest = new Y.Test.Case({ @@ -989,6 +990,47 @@ YUI.add('ez-universaldiscoveryview-tests', function (Y) { }, }); + activeTest= new Y.Test.Case({ + name: "eZ Universal Discovery View active test", + + setUp: function () { + this.method1 = new Y.eZ.UniversalDiscoveryMethodBaseView(); + this.method1._set('identifier', 'browse'); + this.method2 = new Y.eZ.UniversalDiscoveryMethodBaseView(); + this.method2._set('identifier', 'create'); + this.confirmedList = new Y.View(); + this.view = new Y.eZ.UniversalDiscoveryView({ + container: '.container', + title: "Easier to run", + methods: [this.method1, this.method2], + confirmedListView: this.confirmedList, + }); + this.view.render(); + }, + + tearDown: function () { + this.view.destroy(); + this.method.destroy(); + this.confirmedList.destroy(); + delete this.view; + delete this.method; + delete this.confirmedList; + }, + + "Should forward the active flag to the methods": function () { + this.view.set('active', true); + + Assert.isTrue( + this.method1.get('active'), + "The method1 should be active" + ); + Assert.isTrue( + this.method2.get('active'), + "The method2 should be active" + ); + }, + }); + resetTest= new Y.Test.Case({ name: "eZ Universal Discovery View reset test", @@ -1294,6 +1336,7 @@ YUI.add('ez-universaldiscoveryview-tests', function (Y) { Y.Test.Runner.add(eventHandlersTest); Y.Test.Runner.add(eventsTest); Y.Test.Runner.add(visibleMethodTest); + Y.Test.Runner.add(activeTest); Y.Test.Runner.add(tabTest); Y.Test.Runner.add(defaultMethodsTest); Y.Test.Runner.add(selectContentTest);