Repository: ambari Updated Branches: refs/heads/trunk 80e1d9fb9 -> 1f950c054
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f950c05/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js index fbfa94b..64a9c7b 100644 --- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js +++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js @@ -83,117 +83,84 @@ describe('App.MainAdminStackAndUpgradeController', function() { }); describe("#loadVersionsInfoSuccessCallback()", function() { + beforeEach(function(){ + sinon.stub(controller, 'parseVersionsData', function (data) { + return data; + }); + }); + afterEach(function(){ + controller.parseVersionsData.restore(); + }); it("target version installed and higher than current", function() { - var data = {"items": [ + var data = [ { - "ClusterStackVersions": { - "state": "CURRENT" - }, - "repository_versions": [ - { - "RepositoryVersions" : { - "repository_version" : "2.2.0.1-885" - } - } - ] + "state": "CURRENT", + "repository_version": "2.2.0.1-885" }, { - "ClusterStackVersions": { - "state": "INSTALLED" - }, - "repository_versions": [ - { - "RepositoryVersions" : { - "repository_version" : "2.2.1.1-885" - } - } - ] + "state": "INSTALLED", + "repository_version": "2.2.1.1-885" } - ]}; + ]; controller.loadVersionsInfoSuccessCallback(data); expect(controller.get('currentVersion')).to.eql({ - "state": "CURRENT" + "state": "CURRENT", + "repository_version": "2.2.0.1-885" }); expect(controller.get('targetVersions')).to.eql([{ - "state": "INSTALLED" + "state": "INSTALLED", + "repository_version": "2.2.1.1-885" }]); }); it("target version installed and lower than current", function() { - var data = {"items": [ + var data = [ { - "ClusterStackVersions": { - "state": "CURRENT" - }, - "repository_versions": [ - { - "RepositoryVersions" : { - "repository_version" : "2.2.0.1-885" - } - } - ] + "state": "CURRENT", + "repository_version": "2.2.0.1-885" }, { - "ClusterStackVersions": { - "state": "INSTALLED" - }, - "repository_versions": [ - { - "RepositoryVersions" : { - "repository_version" : "2.2.0.1-885" - } - } - ] + "state": "INSTALLED", + "repository_version" : "2.2.0.1-885" } - ]}; + ]; controller.loadVersionsInfoSuccessCallback(data); expect(controller.get('currentVersion')).to.eql({ - "state": "CURRENT" + "state": "CURRENT", + "repository_version": "2.2.0.1-885" }); expect(controller.get('targetVersions')).to.be.empty; }); it("target version not installed and lower than current", function() { - var data = {"items": [ + var data = [ { - "ClusterStackVersions": { - "state": "CURRENT" - }, - "repository_versions": [ - { - "RepositoryVersions" : { - "repository_version" : "2.2.0.1-885" - } - } - ] + "state": "CURRENT", + "repository_version": "2.2.0.1-885" }, { - "ClusterStackVersions": { - "state": "INIT" - }, - "repository_versions": [ - { - "RepositoryVersions" : { - "repository_version" : "2.2.0.1-885" - } - } - ] + "state": "INIT", + "repository_version" : "2.2.0.1-885" } - ]}; + ]; controller.loadVersionsInfoSuccessCallback(data); expect(controller.get('currentVersion')).to.eql({ - "state": "CURRENT" + "state": "CURRENT", + "repository_version": "2.2.0.1-885" }); expect(controller.get('targetVersions')).to.be.empty; }); }); describe("#loadUpgradeData()", function() { - before(function () { - sinon.stub(App.ajax, 'send', Em.K); + beforeEach(function () { + sinon.stub(App.ajax, 'send').returns({ + then: Em.K + }); }); - after(function () { + afterEach(function () { App.ajax.send.restore(); }); - it("make ajax call", function() { + it("get entire data", function() { + controller.set('upgradeId', 1); controller.loadUpgradeData(); expect(App.ajax.send.getCall(0).args[0]).to.eql({ name: 'admin.upgrade.data', @@ -204,11 +171,27 @@ describe('App.MainAdminStackAndUpgradeController', function() { success: 'loadUpgradeDataSuccessCallback' }) }); + it("get only state", function() { + controller.set('upgradeId', 1); + controller.loadUpgradeData(true); + expect(App.ajax.send.getCall(0).args[0]).to.eql({ + name: 'admin.upgrade.state', + sender: controller, + data: { + id: 1 + }, + success: 'loadUpgradeDataSuccessCallback' + }) + }); }); describe("#loadUpgradeDataSuccessCallback()", function() { it("", function() { - var data = {"upgrade_groups": [ + var data = { + "Upgrade": { + "request_status": "COMPLETED" + }, + "upgrade_groups": [ { "UpgradeGroup": { "id": 1 @@ -217,14 +200,8 @@ describe('App.MainAdminStackAndUpgradeController', function() { } ]}; controller.loadUpgradeDataSuccessCallback(data); - expect(controller.get('upgradeGroups')).to.eql([ - { - "UpgradeGroup": { - "id": 1 - }, - "upgrade_items": [] - } - ]); + expect(controller.get('upgradeData')).to.eql(data); + expect(App.get('upgradeState')).to.equal('COMPLETED'); }); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f950c05/ambari-web/test/controllers/main/service/info/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/service/info/config_test.js b/ambari-web/test/controllers/main/service/info/config_test.js index 7a2fc79..428bfa3 100644 --- a/ambari-web/test/controllers/main/service/info/config_test.js +++ b/ambari-web/test/controllers/main/service/info/config_test.js @@ -1187,13 +1187,15 @@ describe("App.MainServiceInfoConfigsController", function () { } ]; - var a = App.get('isAdmin'); + beforeEach(function(){ + this.mock = sinon.stub(App, 'isAccessible'); + }); afterEach(function () { - App.set('isAdmin', a); + this.mock.restore(); }); tests.forEach(function(t) { it("set isEditable " + t.isEditable + t.m, function(){ - App.set('isAdmin', t.isAdmin); + this.mock.returns(t.isAdmin); mainServiceInfoConfigsController.set("isHostsConfigsPage", t.isHostsConfigsPage); var serviceConfigProperty = Em.Object.create({ isReconfigurable: t.isReconfigurable http://git-wip-us.apache.org/repos/asf/ambari/blob/1f950c05/ambari-web/test/controllers/wizard/step7_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js index 435ce17..510917c 100644 --- a/ambari-web/test/controllers/wizard/step7_test.js +++ b/ambari-web/test/controllers/wizard/step7_test.js @@ -1128,6 +1128,12 @@ describe('App.InstallerStep7Controller', function () { }); describe('#_updateIsEditableFlagForConfig', function () { + beforeEach(function(){ + this.mock = sinon.stub(App, 'isAccessible'); + }); + afterEach(function () { + this.mock.restore(); + }); Em.A([ { isAdmin: false, @@ -1171,16 +1177,12 @@ describe('App.InstallerStep7Controller', function () { } ]).forEach(function (test) { it(test.m, function () { - sinon.stub(App, 'get', function (k) { - if (k === 'isAdmin') return test.isAdmin; - return Em.get(App, k); - }); + this.mock.returns(test.isAdmin); installerStep7Controller.reopen({isHostsConfigsPage: test.isHostsConfigsPage}); var serviceConfigProperty = Em.Object.create({ isReconfigurable: test.isReconfigurable }); installerStep7Controller._updateIsEditableFlagForConfig(serviceConfigProperty, test.defaultGroupSelected); - App.get.restore(); expect(serviceConfigProperty.get('isEditable')).to.equal(test.e); }); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f950c05/ambari-web/test/views/main/admin/stack_upgrade/upgrade_task_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_task_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_task_view_test.js index a3c75f1..b40ea28 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_task_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_task_view_test.js @@ -32,7 +32,7 @@ describe('App.upgradeTaskView', function () { view.set('statusIconMap', { 'S1': 'icon1' }); - view.set('content.UpgradeGroup.state', 'S1'); + view.set('content.UpgradeGroup.status', 'S1'); view.propertyDidChange('iconClass'); expect(view.get('iconClass')).to.equal('icon1'); }); @@ -40,7 +40,7 @@ describe('App.upgradeTaskView', function () { view.set('statusIconMap', { 'S1': 'icon1' }); - view.set('content.UpgradeGroup.state', 'S2'); + view.set('content.UpgradeGroup.status', 'S2'); view.propertyDidChange('iconClass'); expect(view.get('iconClass')).to.equal('icon-question-sign'); }); @@ -48,12 +48,12 @@ describe('App.upgradeTaskView', function () { describe("#isFailed", function () { it("task is not failed", function () { - view.set('content.UpgradeGroup.state', 'COMPLETED'); + view.set('content.UpgradeGroup.status', 'COMPLETED'); view.propertyDidChange('isFailed'); expect(view.get('isFailed')).to.be.false; }); it("task is not failed", function () { - view.set('content.UpgradeGroup.state', 'FAILED'); + view.set('content.UpgradeGroup.status', 'FAILED'); view.propertyDidChange('isFailed'); expect(view.get('isFailed')).to.be.true; }); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f950c05/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js index 7e277e5..8fcb6a6 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js @@ -35,8 +35,7 @@ describe('App.UpgradeVersionBoxView', function () { }); it("version is loaded", function () { view.set('version', Em.Object.create({ - stack: 'HDP', - version: '2.2' + repository_name: 'HDP-2.2' })); view.propertyDidChange('versionName'); expect(view.get('versionName')).to.equal('HDP-2.2'); @@ -51,11 +50,13 @@ describe('App.UpgradeVersionBoxView', function () { view.get('controller').upgrade.restore(); }); it("call upgrade()", function () { - expect(view.runAction({context: 'upgrade'})).to.be.true; + view.set('method', 'upgrade'); + expect(view.runAction()).to.be.true; expect(view.get('controller').upgrade.calledOnce).to.be.true; }); it("no method should be called", function () { - expect(view.runAction({context: null})).to.be.false; + view.set('method', null); + expect(view.runAction()).to.be.false; expect(view.get('controller').upgrade.called).to.be.false; }); });
