mgr/dashboard: prettify code

Signed-off-by: Tiago Melo <tmelo@suse.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts
index 90f886e22c7edbd42af501f167e9c82e1278b20f..a2609aa0a45d6fc687cf422c24ff8bab3565fe4e 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts
@@ -24,17 +24,9 @@ describe('RgwUserFormComponent', () => {
   }
 
   configureTestBed({
-    declarations: [ RgwUserFormComponent ],
-    imports: [
-      HttpClientTestingModule,
-      ReactiveFormsModule,
-      RouterTestingModule,
-      SharedModule
-    ],
-    providers: [
-      BsModalService,
-      { provide: RgwUserService, useClass: MockRgwUserService }
-    ]
+    declarations: [RgwUserFormComponent],
+    imports: [HttpClientTestingModule, ReactiveFormsModule, RouterTestingModule, SharedModule],
+    providers: [BsModalService, { provide: RgwUserService, useClass: MockRgwUserService }]
   });
 
   beforeEach(() => {
@@ -67,14 +59,12 @@ describe('RgwUserFormComponent', () => {
       component.setS3Key(key);
       expect(component.s3Keys.length).toBe(1);
       expect(component.s3Keys[0].user).toBe('test1:subuser2');
-      expect(rgwUserService.addS3Key).toHaveBeenCalledWith(
-        'test1', {
-          subuser: 'subuser2',
-          generate_key: 'false',
-          access_key: undefined,
-          secret_key: undefined
-        }
-      );
+      expect(rgwUserService.addS3Key).toHaveBeenCalledWith('test1', {
+        subuser: 'subuser2',
+        generate_key: 'false',
+        access_key: undefined,
+        secret_key: undefined
+      });
     });
 
     it('should set key w/o subuser', () => {
@@ -83,14 +73,12 @@ describe('RgwUserFormComponent', () => {
       component.setS3Key(key);
       expect(component.s3Keys.length).toBe(1);
       expect(component.s3Keys[0].user).toBe('test1');
-      expect(rgwUserService.addS3Key).toHaveBeenCalledWith(
-        'test1', {
-          subuser: '',
-          generate_key: 'false',
-          access_key: undefined,
-          secret_key: undefined
-        }
-      );
+      expect(rgwUserService.addS3Key).toHaveBeenCalledWith('test1', {
+        subuser: '',
+        generate_key: 'false',
+        access_key: undefined,
+        secret_key: undefined
+      });
     });
   });
 

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts
index f321dfe6595f7cf8992ff99ff259d1e61dc134fc..4c11f6a8f973dc6a574012997e1af854af78687e 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts
@@ -12,12 +12,9 @@ describe('RgwUserSubuserModalComponent', () => {
   let fixture: ComponentFixture<RgwUserSubuserModalComponent>;
 
   configureTestBed({
-    declarations: [ RgwUserSubuserModalComponent ],
-    imports: [
-      ReactiveFormsModule,
-      SharedModule
-    ],
-    providers: [ BsModalRef ]
+    declarations: [RgwUserSubuserModalComponent],
+    imports: [ReactiveFormsModule, SharedModule],
+    providers: [BsModalRef]
   });
 
   beforeEach(() => {

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts
index 738f89c4ed58ecef52948d9b7a53e1391af6d9bc..3e18c5490b8edeeca029fc901b25e0a2e6881d9b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts
@@ -23,5 +23,4 @@ describe('DashboardHelpComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
-
 });

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.spec.ts
index a7cab79cef1900f77951e602fd737fe982341166..8b8f4a25cc869ef0d516a93b7af244685f48f79e 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.spec.ts
@@ -53,17 +53,17 @@ describe('TaskManagerComponent', () => {
   it('should get executing message for task', () => {
     component._handleTasks(tasks.executing, []);
     expect(component.executingTasks.length).toBe(1);
-    expect(component.executingTasks[0].description).toBe('Deleting RBD \'somePool/someImage\'');
+    expect(component.executingTasks[0].description).toBe(`Deleting RBD 'somePool/someImage'`);
   });
 
   it('should get finished message for task', () => {
     component._handleTasks([], tasks.finished);
     expect(component.finishedTasks.length).toBe(2);
-    expect(component.finishedTasks[0].description).toBe('Copy RBD \'somePool/someImage\'');
+    expect(component.finishedTasks[0].description).toBe(`Copy RBD 'somePool/someImage'`);
     expect(component.finishedTasks[0].errorMessage).toBe(undefined);
-    expect(component.finishedTasks[1].description).toBe('Clone RBD \'somePool/someImage\'');
+    expect(component.finishedTasks[1].description).toBe(`Clone RBD 'somePool/someImage'`);
     expect(component.finishedTasks[1].errorMessage).toBe(
-      'Name \'somePool/someImage\' is already in use.'
+      `Name 'somePool/someImage' is already in use.`
     );
   });
 

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts
index 4dce6a0949e08c0e8a88049d5e2bb14def1a32b9..209bd12300bee7f8681ba42c4d63ed4bcbcd98c1 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts
@@ -19,7 +19,7 @@ describe('TableComponent', () => {
       data.push({
         a: i,
         b: i * i,
-        c: [-(i % 10), 'score' + (i % 16 + 6)],
+        c: [-(i % 10), 'score' + ((i % 16) + 6)],
         d: !(i % 2)
       });
     }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts
index a1772305255b2a3f31a07f2bca5b86fd2373526f..c6fc4f84abcbc11e05d2adb2800915ba4755d3fd 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts
@@ -36,11 +36,14 @@ describe('ModuleStatusGuardService', () => {
     expect(router.url).toBe(urlResult);
   };
 
-  configureTestBed({
-    imports: [RouterTestingModule.withRoutes(routes)],
-    providers: [ModuleStatusGuardService, { provide: HttpClient, useValue: fakeService }],
-    declarations: [FooComponent]
-  }, true);
+  configureTestBed(
+    {
+      imports: [RouterTestingModule.withRoutes(routes)],
+      providers: [ModuleStatusGuardService, { provide: HttpClient, useValue: fakeService }],
+      declarations: [FooComponent]
+    },
+    true
+  );
 
   beforeEach(() => {
     service = TestBed.get(ModuleStatusGuardService);

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts
index 635dba15375f47b27f7c3957eabbe2040d530135..ad024392f76d58bd97323cbfccdeec265411b17e 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts
@@ -27,9 +27,12 @@ describe('TaskManagerService', () => {
     filesystems: [{ id: 1, name: 'cephfs_a' }]
   };
 
-  configureTestBed({
-    providers: [TaskManagerService, { provide: SummaryService, useValue: fakeService }]
-  }, true);
+  configureTestBed(
+    {
+      providers: [TaskManagerService, { provide: SummaryService, useValue: fakeService }]
+    },
+    true
+  );
 
   beforeEach(() => {
     taskManagerService = TestBed.get(TaskManagerService);