You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2016/04/13 08:40:41 UTC
ambari git commit: AMBARI-15832. Remove stubbing setTimeout from
tests (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 89fef12a4 -> 799c09851
AMBARI-15832. Remove stubbing setTimeout from tests (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/799c0985
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/799c0985
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/799c0985
Branch: refs/heads/trunk
Commit: 799c09851d9a371253ba54390ef284d53d2f05f3
Parents: 89fef12
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Tue Apr 12 15:30:15 2016 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Apr 13 09:39:50 2016 +0300
----------------------------------------------------------------------
.../test/mixins/common/reload_popup_test.js | 2 +-
.../test/mixins/common/widget_mixin_test.js | 3 +-
ambari-web/test/utils/polling_test.js | 46 --------------------
.../test/views/common/chart/linear_time_test.js | 24 ----------
.../admin/stack_upgrade/version_view_test.js | 4 +-
5 files changed, 4 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/799c0985/ambari-web/test/mixins/common/reload_popup_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mixins/common/reload_popup_test.js b/ambari-web/test/mixins/common/reload_popup_test.js
index 895020a..c00abf7 100644
--- a/ambari-web/test/mixins/common/reload_popup_test.js
+++ b/ambari-web/test/mixins/common/reload_popup_test.js
@@ -134,7 +134,7 @@ describe('App.ReloadPopupMixin', function () {
sinon.stub(App.ajax, 'defaultErrorHandler', Em.K);
sinon.stub(obj, 'showReloadPopup', Em.K);
sinon.stub(App, 'get').withArgs('maxRetries').returns(3);
- sinon.stub(window, 'setTimeout', Em.K);
+ sinon.spy(window, 'setTimeout');
});
afterEach(function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/799c0985/ambari-web/test/mixins/common/widget_mixin_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mixins/common/widget_mixin_test.js b/ambari-web/test/mixins/common/widget_mixin_test.js
index 9612d7f..b2816b8 100644
--- a/ambari-web/test/mixins/common/widget_mixin_test.js
+++ b/ambari-web/test/mixins/common/widget_mixin_test.js
@@ -591,7 +591,7 @@ describe('App.WidgetLoadAggregator', function () {
describe("#add()", function () {
beforeEach(function () {
- sinon.stub(window, 'setTimeout').returns('timeId');
+ sinon.spy(window, 'setTimeout');
});
afterEach(function () {
window.setTimeout.restore();
@@ -609,7 +609,6 @@ describe('App.WidgetLoadAggregator', function () {
aggregator.add({});
expect(aggregator.get('requests')).to.not.be.empty;
expect(window.setTimeout.calledOnce).to.be.true;
- expect(aggregator.get('timeoutId')).to.equal('timeId');
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/799c0985/ambari-web/test/utils/polling_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/polling_test.js b/ambari-web/test/utils/polling_test.js
index f2cc35b..2682890 100644
--- a/ambari-web/test/utils/polling_test.js
+++ b/ambari-web/test/utils/polling_test.js
@@ -580,52 +580,6 @@ describe('App.Poll', function () {
});
- describe('#reloadSuccessCallback', function () {
-
- var cases = [
- {
- parseInfo: false,
- startPollingCallCount: 1,
- title: 'no parsed data'
- },
- {
- parseInfo: true,
- startPollingCallCount: 0,
- title: 'data parsed'
- }
- ];
-
- cases.forEach(function (item) {
-
- describe(item.title, function () {
-
- beforeEach(function () {
- sinon.stub(poll, 'parseInfo').returns(item.parseInfo);
- sinon.stub(window, 'setTimeout', Em.clb);
- sinon.stub(poll, 'startPolling', Em.K);
- poll.reloadSuccessCallback(null);
- });
-
- afterEach(function () {
- poll.parseInfo.restore();
- window.setTimeout.restore();
- poll.startPolling.restore();
- });
-
- it('set timeout', function () {
- expect(window.setTimeout.callCount).to.equal(item.startPollingCallCount);
- });
-
- it('timeout callback', function () {
- expect(poll.startPolling.callCount).to.equal(item.startPollingCallCount);
- });
-
- });
-
- });
-
- });
-
describe('#reloadErrorCallback', function () {
var cases = [
http://git-wip-us.apache.org/repos/asf/ambari/blob/799c0985/ambari-web/test/views/common/chart/linear_time_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/chart/linear_time_test.js b/ambari-web/test/views/common/chart/linear_time_test.js
index c05ce23..00047bc 100644
--- a/ambari-web/test/views/common/chart/linear_time_test.js
+++ b/ambari-web/test/views/common/chart/linear_time_test.js
@@ -524,30 +524,6 @@ describe('App.ChartLinearTimeView.LoadAggregator', function () {
var aggregator = App.ChartLinearTimeView.LoadAggregator;
- describe("#add()", function () {
- beforeEach(function () {
- sinon.stub(window, 'setTimeout').returns('timeId');
- });
- afterEach(function () {
- window.setTimeout.restore();
- });
- it("timeout started", function () {
- aggregator.set('timeoutId', 'timeId');
- aggregator.get('requests').clear();
- aggregator.add({}, {});
- expect(aggregator.get('requests')).to.not.be.empty;
- expect(window.setTimeout.called).to.be.false;
- });
- it("timeout started (2)", function () {
- aggregator.set('timeoutId', null);
- aggregator.get('requests').clear();
- aggregator.add({}, {});
- expect(aggregator.get('requests')).to.not.be.empty;
- expect(window.setTimeout.calledOnce).to.be.true;
- expect(aggregator.get('timeoutId')).to.equal('timeId');
- });
- });
-
describe("#groupRequests()", function () {
var result;
beforeEach(function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/799c0985/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js
index 511c549..38fe9a7 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js
@@ -388,7 +388,7 @@ describe('App.mainAdminStackVersionsView', function () {
request = {
abort: Em.K
};
- sinon.stub(window, 'clearTimeout', Em.K);
+ sinon.spy(window, 'clearTimeout');
sinon.spy(request, 'abort');
view.set('controller.runningCheckRequests', [request, request]);
view.willDestroyElement();
@@ -410,7 +410,7 @@ describe('App.mainAdminStackVersionsView', function () {
describe("#doPolling()", function() {
before(function () {
- sinon.stub(window, 'setTimeout', Em.K);
+ sinon.spy(window, 'setTimeout');
});
after(function () {
window.setTimeout.restore();