You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/01/15 18:33:29 UTC
[05/50] [abbrv] ambari git commit: AMBARI-14626. UI UT cleanup
(onechiporenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/utils/string_utils_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/string_utils_test.js b/ambari-web/test/utils/string_utils_test.js
index 9df143f..3c7b077 100644
--- a/ambari-web/test/utils/string_utils_test.js
+++ b/ambari-web/test/utils/string_utils_test.js
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-var string_utils = require('utils/string_utils');
+var stringUtils = require('utils/string_utils');
require('utils/helper');
-describe('string_utils', function () {
+describe('stringUtils', function () {
describe('#underScoreToCamelCase', function () {
var tests = [
@@ -30,7 +30,7 @@ describe('string_utils', function () {
];
tests.forEach(function(test) {
it(test.m + ' ', function () {
- expect(string_utils.underScoreToCamelCase(test.i)).to.equal(test.e);
+ expect(stringUtils.underScoreToCamelCase(test.i)).to.equal(test.e);
});
});
});
@@ -50,7 +50,7 @@ describe('string_utils', function () {
];
tests.forEach(function(test) {
it(test.m + ' ', function () {
- expect(string_utils.pad(test.i, test.l, test.f, test.a)).to.equal(test.e);
+ expect(stringUtils.pad(test.i, test.l, test.f, test.a)).to.equal(test.e);
});
});
});
@@ -70,7 +70,7 @@ describe('string_utils', function () {
];
tests.forEach(function(test) {
it(test.m + ' ', function () {
- expect(string_utils.compareVersions(test.v1, test.v2)).to.equal(test.e);
+ expect(stringUtils.compareVersions(test.v1, test.v2)).to.equal(test.e);
});
});
});
@@ -84,7 +84,7 @@ describe('string_utils', function () {
];
tests.forEach(function(test) {
it(test.t + ' ' + test.m + ' ', function () {
- expect(string_utils.isSingleLine(test.t)).to.equal(test.e);
+ expect(stringUtils.isSingleLine(test.t)).to.equal(test.e);
});
});
});
@@ -92,7 +92,7 @@ describe('string_utils', function () {
describe('#arrayToCSV', function() {
var test = [{a: 1, b:2, c:3}, {a: 1, b:2, c:3}, {a: 1, b:2, c:3}];
it('array of object to csv-string', function () {
- expect(string_utils.arrayToCSV(test)).to.equal("1,2,3\n1,2,3\n1,2,3\n");
+ expect(stringUtils.arrayToCSV(test)).to.equal("1,2,3\n1,2,3\n1,2,3\n");
});
});
@@ -110,7 +110,7 @@ describe('string_utils', function () {
];
tests.forEach(function(test) {
it('Check ' + typeof test.t, function () {
- expect(string_utils.getFileFromPath(test.t)).to.equal(test.e);
+ expect(stringUtils.getFileFromPath(test.t)).to.equal(test.e);
});
});
});
@@ -131,7 +131,7 @@ describe('string_utils', function () {
];
tests.forEach(function(test) {
it('Check ' + typeof test.t, function () {
- expect(string_utils.getPath(test.t)).to.equal(test.e);
+ expect(stringUtils.getPath(test.t)).to.equal(test.e);
});
});
});
@@ -156,7 +156,7 @@ describe('string_utils', function () {
];
tests.forEach(function(test) {
it(test.i + ' to ' + test.e + ' ', function () {
- expect(string_utils.getCamelCase(test.i)).to.equal(test.e);
+ expect(stringUtils.getCamelCase(test.i)).to.equal(test.e);
});
});
});
@@ -251,7 +251,7 @@ describe('string_utils', function () {
];
tests.forEach(function(test) {
it('Check ' + typeof test.t, function () {
- expect(string_utils.htmlEntities(test.t)).to.equal(test.e);
+ expect(stringUtils.htmlEntities(test.t)).to.equal(test.e);
});
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/utils/ui_effects_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/ui_effects_test.js b/ambari-web/test/utils/ui_effects_test.js
index c4736ce..2c9ce7a 100644
--- a/ambari-web/test/utils/ui_effects_test.js
+++ b/ambari-web/test/utils/ui_effects_test.js
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-var ui_utils = require('utils/ui_effects');
-var App = require('app');
+var uiUtils = require('utils/ui_effects');
describe('utils/ui_effects', function(){
describe('#pulsate()', function(){
@@ -34,13 +33,13 @@ describe('utils/ui_effects', function(){
it('opacity should be 0.2 on 5-th iteration', function() {
var domEl = $('#pulsate-test-dom');
- ui_utils.pulsate(domEl, 1000);
+ uiUtils.pulsate(domEl, 1000);
this.clock.tick(300);
expect(parseFloat(domEl.css('opacity')).toFixed(1)).to.eql('0.2');
});
it('should call callback at the end', function() {
var domEl = $('#pulsate-test-dom');
- ui_utils.pulsate(domEl, 1000, this.clb);
+ uiUtils.pulsate(domEl, 1000, this.clb);
this.clock.tick(2000);
expect(this.clb.calledOnce).to.be.ok;
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/utils/validator_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/validator_test.js b/ambari-web/test/utils/validator_test.js
index 5591aee..5ff6185 100644
--- a/ambari-web/test/utils/validator_test.js
+++ b/ambari-web/test/utils/validator_test.js
@@ -232,8 +232,9 @@ describe('validator', function () {
{ obj: 1, detect: false },
{ obj: true, detect: false }
];
- testable.forEach(function(value){
- it('should ' + (value.detect ? '' : 'not') + ' detect empty value in `' + new String(value.obj) + '`', function(){
+ testable.forEach(function(value) {
+ var detect = value.detect ? '' : 'not';
+ it('should {0} detect empty value in `{1}`'.format(detect, JSON.stringify(value.obj)), function() {
expect(validator.empty(value.obj)).to.eql(value.detect);
});
});
@@ -420,7 +421,7 @@ describe('validator', function () {
{ value: 'a{1,2}{', expected: false }
];
tests.forEach(function(test) {
- it(message.format(test.value, (test.expected) ? 'valid' : 'not valid'), function() {
+ it(message.format(test.value, test.expected ? 'valid' : 'not valid'), function() {
expect(validator.isValidMatchesRegexp(test.value)).to.equal(test.expected);
})
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/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 d21f830..377e392 100644
--- a/ambari-web/test/views/common/chart/linear_time_test.js
+++ b/ambari-web/test/views/common/chart/linear_time_test.js
@@ -382,7 +382,7 @@ describe('App.ChartLinearTimeView', function () {
view.setYAxisFormatter();
view.yAxisFormatter();
methodNames.forEach(function (name) {
- expect(App.ChartLinearTimeView[name].callCount).to.equal(Number(name == item.formatter));
+ expect(App.ChartLinearTimeView[name].callCount).to.equal(Number(name === item.formatter));
});
});
});
@@ -443,16 +443,16 @@ describe('App.ChartLinearTimeView.LoadAggregator', function () {
result = aggregator.groupRequests(requests);
});
it("result['r1'].subRequests.length", function () {
- expect(result['r1'].subRequests.length).to.equal(1);
+ expect(result.r1.subRequests.length).to.equal(1);
});
it("result['r1'].fields.length", function () {
- expect(result['r1'].fields.length).to.equal(1);
+ expect(result.r1.fields.length).to.equal(1);
});
it("result['r2'].subRequests.length", function () {
- expect(result['r2'].subRequests.length).to.equal(2);
+ expect(result.r2.subRequests.length).to.equal(2);
});
it("result['r2'].fields.length", function () {
- expect(result['r2'].fields.length).to.equal(3);
+ expect(result.r2.fields.length).to.equal(3);
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/configs/overriddenProperty_view_test.js b/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
index 7520cef..16ab7e4 100644
--- a/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
+++ b/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
@@ -44,7 +44,7 @@ describe('App.ServiceConfigView.SCPOverriddenRowsView', function () {
describe('#setSwitchText', function () {
- var view = App.ServiceConfigView.SCPOverriddenRowsView.create({
+ view = App.ServiceConfigView.SCPOverriddenRowsView.create({
serviceConfigProperty: {
overrides: [
Em.Object.create({
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/common/configs/service_config_container_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/configs/service_config_container_view_test.js b/ambari-web/test/views/common/configs/service_config_container_view_test.js
index 0cdef1e..e7aaa62 100644
--- a/ambari-web/test/views/common/configs/service_config_container_view_test.js
+++ b/ambari-web/test/views/common/configs/service_config_container_view_test.js
@@ -22,10 +22,7 @@ require('views/common/configs/services_config');
describe('App.ServiceConfigContainerView', function () {
- var view,
- selectedService = {
- configCategories: []
- };
+ var view;
beforeEach(function () {
view = App.ServiceConfigContainerView.create({
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
index 3451964..5b443b6 100644
--- a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
+++ b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
@@ -26,8 +26,6 @@ describe('App.ServiceConfigsByCategoryView', function () {
serviceConfigs: []
});
- var result = [1, 2, 3, 4];
-
var testData = [
{
title: 'four configs in correct order',
@@ -97,6 +95,7 @@ describe('App.ServiceConfigsByCategoryView', function () {
App.TestAliases.testAsComputedIfThenElse(view, 'isCategoryBodyVisible', 'category.isCollapsed', 'display: none;', 'display: block;');
describe('#sortByIndex', function () {
+ var result = [1, 2, 3, 4];
testData.forEach(function(_test){
it(_test.title, function () {
expect(view.sortByIndex(_test.configs).mapProperty('resultId')).to.deep.equal(result);
@@ -352,9 +351,8 @@ describe('App.ServiceConfigsByCategoryView', function () {
});
describe('#categoryConfigs', function () {
- var view,
- result = [1,2,3,4,5],
- cases = [
+ var result = [1, 2, 3, 4, 5];
+ var cases = [
{
categoryNname: 'TestCategory',
serviceConfigs: [
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/common/filter_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/filter_view_test.js b/ambari-web/test/views/common/filter_view_test.js
index 3bf8152..81abddf 100644
--- a/ambari-web/test/views/common/filter_view_test.js
+++ b/ambari-web/test/views/common/filter_view_test.js
@@ -328,9 +328,10 @@ describe('filters.getFilterByType', function () {
}
];
- testData.forEach(function(item){
- it('Condition: ' + item.condition + ((item.result) ? ' - match ' : ' - doesn\'t match ' + 'value: ') +
- item.value.mapProperty('componentName').join(" "), function () {
+ testData.forEach(function(item) {
+ var substr = item.condition + (item.result ? ' - match ' : ' - doesn\'t match ');
+ var components = item.value.mapProperty('componentName').join(' ');
+ it('Condition: {0} value: {1}'.format(substr, components), function () {
expect(filter(item.value, item.condition)).to.equal(item.result);
})
});
@@ -389,9 +390,10 @@ describe('filters.getFilterByType', function () {
];
testData.forEach(function(item){
- it('Condition: ' + item.condition + ((item.result) ? ' - match ' : ' - doesn\'t match ' + 'value: ') + item.value, function () {
+ var substr = item.condition + (item.result ? ' - match ' : ' - doesn\'t match ');
+ it('Condition: {0} value: {1}'.format(substr, item.value), function () {
expect(filter(item.value, item.condition)).to.equal(item.result);
- })
+ });
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/common/quick_link_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/quick_link_view_test.js b/ambari-web/test/views/common/quick_link_view_test.js
index 1c985a1..cae4715 100644
--- a/ambari-web/test/views/common/quick_link_view_test.js
+++ b/ambari-web/test/views/common/quick_link_view_test.js
@@ -299,7 +299,7 @@ describe('App.QuickViewLinks', function () {
quickViewLinks.setEmptyLinks();
expect(quickViewLinks.get('quickLinks')).to.eql([{
label: quickViewLinks.t('quick.links.error.label'),
- url: 'javascript:alert("' + quickViewLinks.t('contact.administrator') + '");return false;'
+ url: 'javascript:alert("' + quickViewLinks.t('contact.administrator') + '");return false;' // eslint-disable-line no-script-url
}]);
expect(quickViewLinks.get('isLoaded')).to.be.true;
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/common/sort_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/sort_view_test.js b/ambari-web/test/views/common/sort_view_test.js
index 9bfae34..1820250 100644
--- a/ambari-web/test/views/common/sort_view_test.js
+++ b/ambari-web/test/views/common/sort_view_test.js
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-var App = require('app');
var sort = require('views/common/sort_view');
require('utils/misc');
require('utils/string_utils');
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/login_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/login_test.js b/ambari-web/test/views/login_test.js
index 844b0f6..6050211 100644
--- a/ambari-web/test/views/login_test.js
+++ b/ambari-web/test/views/login_test.js
@@ -21,16 +21,17 @@ var App = require('app');
require('views/login');
var view,
- controller,
pass;
describe('App.LoginView', function () {
before(function () {
sinon.stub(App, 'get', function(k) {
- if (k === 'router') return {
- login: Em.K
- };
+ if (k === 'router') {
+ return {
+ login: Em.K
+ };
+ }
return Em.get(App, k);
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
index a5b0def..25182a1 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
@@ -286,7 +286,7 @@ describe('App.upgradeWizardView', function () {
afterEach(function () {
this.mock.restore();
});
- var testCases = [
+ [
{
data: {
failedItem: null,
@@ -442,7 +442,7 @@ describe('App.upgradeWizardView', function () {
});
describe("#upgradeStatusLabel", function () {
- var testCases = [
+ [
{
data: {
status: 'QUEUED',
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/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 b151ee4..c4eaa74 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
@@ -207,7 +207,7 @@ describe('App.mainAdminStackVersionsView', function () {
beforeEach(function () {
sinon.stub(App, 'get', function (key) {
- return key == 'supports.displayOlderVersions' ? displayOlderVersions : Em.get(App, key);
+ return key === 'supports.displayOlderVersions' ? displayOlderVersions : Em.get(App, key);
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/alert_definitions_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/alert_definitions_view_test.js b/ambari-web/test/views/main/alert_definitions_view_test.js
index 66d1188..d4344c3 100644
--- a/ambari-web/test/views/main/alert_definitions_view_test.js
+++ b/ambari-web/test/views/main/alert_definitions_view_test.js
@@ -51,8 +51,8 @@ describe('App.MainAlertDefinitionsView', function () {
it('Add Ambari service to filters', function () {
var serviceFilterClass = view.serviceFilterView;
var content = serviceFilterClass.create({}).get('content');
- expect(content[0].label==Em.I18n.t('common.all'));
- expect(content[content.length-1].label==Em.I18n.t('app.name'));
+ expect(content[0].label === Em.I18n.t('common.all'));
+ expect(content[content.length - 1].label === Em.I18n.t('app.name'));
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/alerts/manage_alert_groups_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/alerts/manage_alert_groups_view_test.js b/ambari-web/test/views/main/alerts/manage_alert_groups_view_test.js
index 5bb005d..64e5c84 100644
--- a/ambari-web/test/views/main/alerts/manage_alert_groups_view_test.js
+++ b/ambari-web/test/views/main/alerts/manage_alert_groups_view_test.js
@@ -18,8 +18,6 @@
var App = require('app');
-var view;
-
function getView() {
return App.MainAlertsManageAlertGroupView.create({
controller: Em.Object.create()
@@ -28,10 +26,6 @@ function getView() {
describe('App.MainAlertsManageAlertGroupView', function () {
- beforeEach(function () {
- view = getView();
- });
-
App.TestAliases.testAsComputedIfThenElse(getView(), 'removeButtonTooltip', 'controller.isRemoveButtonDisabled', Em.I18n.t('alerts.actions.manage_alert_groups_popup.removeButtonDisabled'), Em.I18n.t('alerts.actions.manage_alert_groups_popup.removeButton'))
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js b/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js
index 6e8b993..eb68f2f 100644
--- a/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js
+++ b/ambari-web/test/views/main/alerts/manage_alert_notifications_view_test.js
@@ -89,7 +89,7 @@ describe('App.ManageAlertNotificationsView', function () {
selectedAlertNotification: null,
m: 'some alert notification is not selected and user is a non-admin operator',
p: {
- isAddButtonDisabled: true,
+ isAddButtonDisabled: true,
isEditButtonDisabled: false,
isRemoveButtonDisabled: false,
isDuplicateButtonDisabled: false
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/dashboard/widgets/hbase_master_uptime_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/dashboard/widgets/hbase_master_uptime_test.js b/ambari-web/test/views/main/dashboard/widgets/hbase_master_uptime_test.js
index 3a43b54..4f19a35 100644
--- a/ambari-web/test/views/main/dashboard/widgets/hbase_master_uptime_test.js
+++ b/ambari-web/test/views/main/dashboard/widgets/hbase_master_uptime_test.js
@@ -28,7 +28,7 @@ describe('App.HBaseMasterUptimeView', function () {
var tests = [
{
model: Em.Object.create({
- masterStartTime: ((new Date()).getTime() - 192.1 * 24 * 3600 * 1000)
+ masterStartTime: new Date().getTime() - 192.1 * 24 * 3600 * 1000
}),
e: {
isGreen: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/dashboard/widgets/namenode_uptime_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/dashboard/widgets/namenode_uptime_test.js b/ambari-web/test/views/main/dashboard/widgets/namenode_uptime_test.js
index 607ecfd..bfd101c 100644
--- a/ambari-web/test/views/main/dashboard/widgets/namenode_uptime_test.js
+++ b/ambari-web/test/views/main/dashboard/widgets/namenode_uptime_test.js
@@ -28,7 +28,7 @@ describe('App.NameNodeUptimeView', function() {
var tests = [
{
model: Em.Object.create({
- nameNodeStartTime: ((new Date()).getTime() - 192.1*24*3600*1000)
+ nameNodeStartTime: new Date().getTime() - 192.1*24*3600*1000
}),
e: {
isRed: false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/dashboard/widgets/resource_manager_uptime_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/dashboard/widgets/resource_manager_uptime_test.js b/ambari-web/test/views/main/dashboard/widgets/resource_manager_uptime_test.js
index bf4b637..1dd4df1 100644
--- a/ambari-web/test/views/main/dashboard/widgets/resource_manager_uptime_test.js
+++ b/ambari-web/test/views/main/dashboard/widgets/resource_manager_uptime_test.js
@@ -28,7 +28,7 @@ describe('App.ResourceManagerUptimeView', function() {
var tests = [
{
model: Em.Object.create({
- resourceManagerStartTime: ((new Date()).getTime() - 192.1*24*3600*1000)
+ resourceManagerStartTime: (new Date()).getTime() - 192.1*24*3600*1000
}),
e: {
isRed: false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/dashboard/widgets/uptime_text_widget_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/dashboard/widgets/uptime_text_widget_test.js b/ambari-web/test/views/main/dashboard/widgets/uptime_text_widget_test.js
index 5179353..808e67b 100644
--- a/ambari-web/test/views/main/dashboard/widgets/uptime_text_widget_test.js
+++ b/ambari-web/test/views/main/dashboard/widgets/uptime_text_widget_test.js
@@ -80,8 +80,8 @@ describe('App.UptimeTextDashboardWidgetView', function() {
];
timestamps.forEach(function(timestamp) {
var uptimeTextDashboardWidgetView = App.UptimeTextDashboardWidgetView.create({thresh1:40, thresh2:70});
- it('timestamp ' + timestamp.t + '. timeUnit should be ' + '"' + timestamp.e.timeUnit + '"', function() {
- var result = uptimeTextDashboardWidgetView.uptimeProcessing(((new Date()).getTime() - timestamp.diff));
+ it('timestamp {0}. timeUnit should be "{1}"'.format(timestamp.t, timestamp.e.timeUnit), function() {
+ uptimeTextDashboardWidgetView.uptimeProcessing(new Date().getTime() - timestamp.diff);
expect(uptimeTextDashboardWidgetView.get('timeUnit')).to.equal(timestamp.e.timeUnit);
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/dashboard/widgets_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/dashboard/widgets_test.js b/ambari-web/test/views/main/dashboard/widgets_test.js
index 35f0673..eb27237 100644
--- a/ambari-web/test/views/main/dashboard/widgets_test.js
+++ b/ambari-web/test/views/main/dashboard/widgets_test.js
@@ -19,7 +19,6 @@
var App = require('app');
require('messages');
-var filters = require('views/common/filter_view');
require('mixins/common/userPref');
require('mixins/common/localStorage');
require('views/main/dashboard/widgets');
@@ -29,11 +28,11 @@ describe('App.MainDashboardWidgetsView', function () {
var view = App.MainDashboardWidgetsView.create();
describe('#setInitPrefObject', function () {
- var host_metrics_widgets_count = 4;
- var hdfs_widgets_count = 7;
- var hbase_widgets_count = 4;
- var yarn_widgets_count = 4;
- var total_widgets_count = 20;
+ var hostMetricsWidgetsCount = 4;
+ var hdfsWidgetsCount = 7;
+ var hbaseWidgetsCount = 4;
+ var yarnWidgetsCount = 4;
+ var totalWidgetsCount = 20;
var tests = Em.A([
{
models: {
@@ -43,7 +42,7 @@ describe('App.MainDashboardWidgetsView', function () {
yarn_model: null
},
e: {
- visibleL: total_widgets_count - host_metrics_widgets_count - hdfs_widgets_count - hbase_widgets_count - yarn_widgets_count - 1,
+ visibleL: totalWidgetsCount - hostMetricsWidgetsCount - hdfsWidgetsCount - hbaseWidgetsCount - yarnWidgetsCount - 1,
hiddenL: 0
},
m: 'All models are null'
@@ -56,7 +55,7 @@ describe('App.MainDashboardWidgetsView', function () {
yarn_model: null
},
e: {
- visibleL: total_widgets_count - hdfs_widgets_count - hbase_widgets_count - yarn_widgets_count - 1,
+ visibleL: totalWidgetsCount - hdfsWidgetsCount - hbaseWidgetsCount - yarnWidgetsCount - 1,
hiddenL: 0
},
m: 'hdfs_model, hbase_model, yarn_model are null'
@@ -69,7 +68,7 @@ describe('App.MainDashboardWidgetsView', function () {
yarn_model: null
},
e: {
- visibleL: total_widgets_count - hbase_widgets_count - yarn_widgets_count - 1,
+ visibleL: totalWidgetsCount - hbaseWidgetsCount - yarnWidgetsCount - 1,
hiddenL: 0
},
m: 'hbase_model, yarn_model are null'
@@ -82,7 +81,7 @@ describe('App.MainDashboardWidgetsView', function () {
yarn_model: null
},
e: {
- visibleL: total_widgets_count - hbase_widgets_count - yarn_widgets_count - 1,
+ visibleL: totalWidgetsCount - hbaseWidgetsCount - yarnWidgetsCount - 1,
hiddenL: 0
},
m: 'hbase_model and yarn_model are null'
@@ -95,7 +94,7 @@ describe('App.MainDashboardWidgetsView', function () {
yarn_model: null
},
e: {
- visibleL: total_widgets_count - yarn_widgets_count - 1,
+ visibleL: totalWidgetsCount - yarnWidgetsCount - 1,
hiddenL: 1
},
m: 'yarn_model is null'
@@ -108,7 +107,7 @@ describe('App.MainDashboardWidgetsView', function () {
yarn_model: {}
},
e: {
- visibleL: total_widgets_count,
+ visibleL: totalWidgetsCount,
hiddenL: 1
},
m: 'All models are not null'
@@ -253,7 +252,6 @@ describe('App.MainDashboardWidgetsView', function () {
});
describe("#applyFilterComplete()", function () {
- var widget = {checked: true};
beforeEach(function () {
sinon.stub(view, 'postUserPref');
sinon.stub(view, 'translateToReal');
@@ -496,7 +494,7 @@ describe('App.MainDashboardWidgetsView', function () {
Em.keys(widgetsMap).forEach(function (item, index, array) {
it(notEmptyModelTitle.format(item), function () {
array.forEach(function (modelName) {
- view.set(modelName, modelName == item ? {} : null);
+ view.set(modelName, modelName === item ? {} : null);
});
expect(view.checkServicesChange(emptyCurrentPref).visible).to.eql(widgetsMap[item]);
});
@@ -506,7 +504,7 @@ describe('App.MainDashboardWidgetsView', function () {
it(emptyModelTitle.format(item), function () {
var expected = [];
array.forEach(function (modelName) {
- if (modelName == item) {
+ if (modelName === item) {
view.set(modelName, null);
} else {
view.set(modelName, {});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/dashboard_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/dashboard_test.js b/ambari-web/test/views/main/dashboard_test.js
index 1236e2d..70e2eb2 100644
--- a/ambari-web/test/views/main/dashboard_test.js
+++ b/ambari-web/test/views/main/dashboard_test.js
@@ -16,16 +16,4 @@
* limitations under the License.
*/
-
-var App = require('app');
-require('messages');
-var filters = require('views/common/filter_view');
-require('views/main/dashboard');
-var mainDashboardView;
-describe('App.MainDashboardView', function() {
-
- beforeEach(function() {
- mainDashboardView = App.MainDashboardView.create();
- });
-
-});
+describe('App.MainDashboardView', function() {});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
index 7c02870..b5cbbe5 100644
--- a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
+++ b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
@@ -28,13 +28,15 @@ describe('App.Decommissionable', function() {
beforeEach(function() {
sinon.stub(App.router, 'get', function (k) {
- if (k === 'mainHostDetailsController.content') return Em.Object.create({
- hostComponents: [
- {
- componentName: 'component'
- }
- ]
- });
+ if (k === 'mainHostDetailsController.content') {
+ return Em.Object.create({
+ hostComponents: [
+ {
+ componentName: 'component'
+ }
+ ]
+ });
+ }
return Em.get(App.router, k);
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/host/details/host_component_views/nodemanager_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/host/details/host_component_views/nodemanager_view_test.js b/ambari-web/test/views/main/host/details/host_component_views/nodemanager_view_test.js
index 3f72c27..3aafe70 100644
--- a/ambari-web/test/views/main/host/details/host_component_views/nodemanager_view_test.js
+++ b/ambari-web/test/views/main/host/details/host_component_views/nodemanager_view_test.js
@@ -64,7 +64,7 @@ describe('App.NodeManagerComponentView', function () {
expect(view.setStatusAs.calledWith('DECOMMISSIONED')).to.be.true;
});
it("RM contains host", function () {
- var curObj = {rm_metrics: {
+ var curObj = {rm_metrics: {
cluster: {
nodeManagers: [{
HostName: 'host1'
@@ -75,7 +75,7 @@ describe('App.NodeManagerComponentView', function () {
expect(view.setStatusAs.calledWith('DECOMMISSIONING')).to.be.true;
});
it("RM does not contain host", function () {
- var curObj = {rm_metrics: {
+ var curObj = {rm_metrics: {
cluster: {
nodeManagers: []
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/host/summary_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/host/summary_test.js b/ambari-web/test/views/main/host/summary_test.js
index 3481f15..eb70014 100644
--- a/ambari-web/test/views/main/host/summary_test.js
+++ b/ambari-web/test/views/main/host/summary_test.js
@@ -331,7 +331,7 @@ describe('App.MainHostSummaryView', function() {
sinon.stub(App.StackServiceComponent, 'find', function(component) {
var customCommands = [];
- if (component == 'WITH_CUSTOM_COMMANDS') {
+ if (component === 'WITH_CUSTOM_COMMANDS') {
customCommands = ['CUSTOMCOMMAND'];
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/service/info/metrics/ambari_metrics/regionserver_base_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/service/info/metrics/ambari_metrics/regionserver_base_test.js b/ambari-web/test/views/main/service/info/metrics/ambari_metrics/regionserver_base_test.js
index 4ba93ac..3b0ee44 100644
--- a/ambari-web/test/views/main/service/info/metrics/ambari_metrics/regionserver_base_test.js
+++ b/ambari-web/test/views/main/service/info/metrics/ambari_metrics/regionserver_base_test.js
@@ -54,7 +54,7 @@ describe('App.ChartServiceMetricsAMS_RegionServerBaseView', function () {
});
it('data.length', function () {
- expect(this.result[0].data.length).to.equal(jsonData.metrics.hbase.regionserver['test'].length);
+ expect(this.result[0].data.length).to.equal(jsonData.metrics.hbase.regionserver.test.length);
});
it('y-property', function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/service/info/summary_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/service/info/summary_test.js b/ambari-web/test/views/main/service/info/summary_test.js
index df3aa24..72e468d 100644
--- a/ambari-web/test/views/main/service/info/summary_test.js
+++ b/ambari-web/test/views/main/service/info/summary_test.js
@@ -447,7 +447,7 @@ describe('App.MainServiceInfoSummaryView', function() {
describe("#restartAllStaleConfigComponents", function () {
describe('trigger restartAllServiceHostComponents', function () {
- var view;
+
beforeEach(function () {
view = App.MainServiceInfoSummaryView.create({
controller: Em.Object.create({
@@ -476,7 +476,6 @@ describe('App.MainServiceInfoSummaryView', function() {
describe('trigger check last check point warning before triggering restartAllServiceHostComponents', function () {
- var view;
var mainServiceItemController;
beforeEach(function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/main/service/item_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/service/item_test.js b/ambari-web/test/views/main/service/item_test.js
index 8319699..af94f01 100644
--- a/ambari-web/test/views/main/service/item_test.js
+++ b/ambari-web/test/views/main/service/item_test.js
@@ -59,16 +59,16 @@ describe('App.MainServiceItemView', function () {
var actionMap = App.HostComponentActionMap.getMap(view);
var customActionsArray = [];
- for (var iter in actionMap) {
+ Object.keys(actionMap).forEach(function (iter) {
customActionsArray.push(actionMap[iter]);
- }
+ });
var customActions = customActionsArray.mapProperty('customCommand').filter(function (action) {
return !nonCustomAction.contains(action);
}).uniq();
// remove null and undefined from the list
customActions = customActions.filter(function (value) {
- return value != null;
+ return !Em.isNone(value);
});
customActions.forEach(function (action) {
@@ -402,7 +402,7 @@ describe('App.MainServiceItemView', function () {
{"action": "restartAllHostComponents", "context": "KNOX", "label": "Restart All", "cssClass": "icon-repeat", "disabled": false},
{"action": "runSmokeTest", "label": "Run Service Check", "cssClass": "icon-thumbs-up-alt", "disabled": false},
{"action": "turnOnOffPassive", "context": "Turn On Maintenance Mode for Knox", "label": "Turn On Maintenance Mode", "cssClass": "icon-medkit", "disabled": false},
- {"action": "startLdapKnox", "customCommand": "STARTDEMOLDAP", "context": "Start Demo LDAP", "label": "Start Demo LDAP", "cssClass": "icon-play-sign", "disabled": false},
+ {"action": "startLdapKnox", "customCommand": "STARTDEMOLDAP", "context": "Start Demo LDAP", "label": "Start Demo LDAP", "cssClass": "icon-play-sign", "disabled": false},
{"action": "stopLdapKnox", "customCommand": "STOPDEMOLDAP", "context": "Stop Demo LDAP", "label": "Stop Demo LDAP", "cssClass": "icon-stop", "disabled": false},
{"action": "downloadClientConfigs", "label": "Download Client Configs", "cssClass": "icon-download-alt", "isHidden": true, "disabled": false, "hasSubmenu": false, "submenuOptions": []}
]
@@ -436,7 +436,7 @@ describe('App.MainServiceItemView', function () {
sinon.stub(App, 'get', function (k) {
switch (k) {
case 'isSingleNode':
- return view.get('controller.content.serviceName') == 'HDFS';
+ return view.get('controller.content.serviceName') === 'HDFS';
case 'supports.autoRollbackHA':
case 'isRMHaEnabled':
case 'isHaEnabled':
@@ -479,8 +479,9 @@ describe('App.MainServiceItemView', function () {
];
});
- sinon.stub(App.StackServiceComponent, 'find', function () {
- switch (arguments[0]) {
+ /*eslint-disable complexity */
+ sinon.stub(App.StackServiceComponent, 'find', function (id) {
+ switch (id) {
case 'NAMENODE':
return Em.Object.create({ customCommands: ["DECOMMISSION", "REBALANCEHDFS"] });
case 'RESOURCEMANAGER':
@@ -510,6 +511,7 @@ describe('App.MainServiceItemView', function () {
];
}
});
+ /*eslint-enable complexity */
});
afterEach(function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/c263626e/ambari-web/test/views/wizard/step1_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/wizard/step1_view_test.js b/ambari-web/test/views/wizard/step1_view_test.js
index 1cfb7ff..0dacad8 100644
--- a/ambari-web/test/views/wizard/step1_view_test.js
+++ b/ambari-web/test/views/wizard/step1_view_test.js
@@ -279,7 +279,7 @@ describe('App.WizardStep1View', function () {
});
- App.TestAliases.testAsComputedSomeBy(getView(), 'invalidUrlExist', 'allRepositories', 'validation', App.Repository.validation['INVALID']);
+ App.TestAliases.testAsComputedSomeBy(getView(), 'invalidUrlExist', 'allRepositories', 'validation', App.Repository.validation.INVALID);
App.TestAliases.testAsComputedSomeBy(getView(), 'invalidFormatUrlExist', 'allRepositories', 'invalidFormatError', true);
@@ -448,7 +448,7 @@ describe('App.WizardStep1View', function () {
})
];
- var controller = {
+ var ctrl = {
content: {
stacks: [
Em.Object.create({
@@ -485,7 +485,7 @@ describe('App.WizardStep1View', function () {
it('target group isn\'t isSelected', function () {
view.reopen({
operatingSystems: operatingSystems,
- controller: controller
+ controller: ctrl
});
view.updateByCheckbox();
var targetGroup = view.get('operatingSystems.firstObject.repositories.firstObject');
@@ -496,11 +496,11 @@ describe('App.WizardStep1View', function () {
});
it('target group is isSelected, skipValidationisSelected = true', function () {
- controller.content.stacks[0].operatingSystems[0].selected = true;
+ ctrl.content.stacks[0].operatingSystems[0].selected = true;
operatingSystems[0].set('isSelected', true);
view.reopen({
operatingSystems: operatingSystems,
- controller: controller
+ controller: ctrl
});
view.updateByCheckbox();
var targetGroup = view.get('operatingSystems.firstObject.repositories.firstObject');