Skip to content

Commit 8152a4c

Browse files
committed
[us40] Remove now unneeded runAll button on rules page
1 parent 541d28c commit 8152a4c

File tree

3 files changed

+12
-40
lines changed

3 files changed

+12
-40
lines changed

src/app/rules/rules.component.html

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<h1>Setup rules</h1>
77
<div class="actionButtons">
88
<button (click)="showCreate()" [disabled]="ruleToCreateOrUpdate" mat-raised-button>Create new rule</button>
9-
&nbsp;
10-
<button (click)="runAll()" color="primary" mat-raised-button>Run all</button>
119
</div>
1210
<form (ngSubmit)="createOrUpdateRule()" *ngIf="ruleToCreateOrUpdate">
1311
<div class="nameAndCategoryFields">

src/app/rules/rules.component.spec.ts

+12-34
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import {MatButtonHarness} from "@angular/material/button/testing";
66
import {HarnessLoader, TestKey} from "@angular/cdk/testing";
77
import {ComponentFixture, fakeAsync, tick} from "@angular/core/testing";
88
import {TestbedHarnessEnvironment} from "@angular/cdk/testing/testbed";
9-
import {mustBeConsumedAsyncObservable} from "../../testing/common-testing-function.spec";
10-
import {mockRuleService} from "./rule.service.spec";
119
import {MatInputHarness} from "@angular/material/input/testing";
1210
import {MatFormFieldHarness} from "@angular/material/form-field/testing";
1311
import {MatFormFieldModule} from "@angular/material/form-field";
@@ -39,7 +37,7 @@ describe('RulesComponent', () => {
3937
mockSampleRules()
4038

4139
// Act
42-
let component = MockRender(RulesComponent).point.componentInstance;
40+
let component = MockRender(RulesComponent, null, {reset: true}).point.componentInstance;
4341

4442
// Assert
4543
expect(component).toBeTruthy();
@@ -50,7 +48,7 @@ describe('RulesComponent', () => {
5048
mockSampleRules();
5149

5250
// Act
53-
let fixture = MockRender(RulesComponent);
51+
let fixture = MockRender(RulesComponent, null, {reset: true});
5452

5553
// Assert
5654
tick();
@@ -60,24 +58,9 @@ describe('RulesComponent', () => {
6058
expect(Page.getRuleScript('Electric bill')).toEqual('return fileName === "electricity_bill.pdf"');
6159
}))
6260

63-
it('should run all the rules when clicking on "run rules" button', async () => {
64-
// Arrange
65-
mockSampleRules();
66-
let ruleService = mockRuleService();
67-
when(() => ruleService.runAll()).thenReturn(mustBeConsumedAsyncObservable(undefined));
68-
let fixture = MockRender(RulesComponent);
69-
let page = new Page(fixture);
70-
71-
// Act
72-
await page.clickOnRunRulesButton();
73-
74-
// Assert
75-
// no failure from mock setup
76-
})
77-
7861
it('should create a new rule', fakeAsync(async () => {
7962
// Arrange
80-
let ruleService = mockRuleService();
63+
let ruleService = ngMocks.get(RuleService);
8164
when(() => ruleService.findAll()).thenResolve([]);
8265

8366
let expectedRule: Rule = {
@@ -89,7 +72,7 @@ describe('RulesComponent', () => {
8972

9073
// After refresh, there should be the new rule
9174
when(() => ruleService.findAll()).thenResolve([expectedRule]);
92-
let fixture = MockRender(RulesComponent);
75+
let fixture = MockRender(RulesComponent, null, {reset: true});
9376

9477
let page = new Page(fixture);
9578

@@ -111,7 +94,7 @@ describe('RulesComponent', () => {
11194

11295
it('should delete an existing rule', fakeAsync(async () => {
11396
// Arrange
114-
let ruleService = mockRuleService();
97+
let ruleService = ngMocks.get(RuleService);
11598

11699
let rule: Rule = {
117100
name: 'Rule1',
@@ -125,7 +108,7 @@ describe('RulesComponent', () => {
125108

126109
when(() => ruleService.delete(rule)).thenResolve();
127110

128-
let fixture = MockRender(RulesComponent);
111+
let fixture = MockRender(RulesComponent, null, {reset: true});
129112
tick();
130113

131114
let page = new Page(fixture);
@@ -188,7 +171,7 @@ describe('RulesComponent', () => {
188171

189172

190173
function mockSampleRules() {
191-
let ruleService = mockRuleService();
174+
let ruleService = ngMocks.get(RuleService);
192175
when(() => ruleService.findAll()).thenResolve(getSampleRules());
193176
}
194177

@@ -232,11 +215,6 @@ class Page {
232215
.nativeNode.textContent.trim();
233216
}
234217

235-
async clickOnRunRulesButton() {
236-
let button = await this.loader.getHarness(MatButtonHarness.with({text: 'Run all'}));
237-
return button.click();
238-
}
239-
240218
async clickOnCreateNewRule() {
241219
let button = await this.loader.getHarness(MatButtonHarness.with({text: 'Create new rule'}));
242220
await button.click();
@@ -280,6 +258,11 @@ class Page {
280258
await button.click();
281259
}
282260

261+
async deleteFirstRule() {
262+
let button = await this.loader.getHarness(MatButtonHarness.with({text: 'Delete'}));
263+
await button.click();
264+
}
265+
283266
private async getInputByFloatingLabel(floatingLabelText: string | RegExp) {
284267
let formFieldHarness = await this.loader.getHarness(MatFormFieldHarness.with({floatingLabelText: floatingLabelText}));
285268
let control = await formFieldHarness.getControl();
@@ -288,9 +271,4 @@ class Page {
288271
}
289272
throw Error("No input found with floating label '" + floatingLabelText + "'");
290273
}
291-
292-
async deleteFirstRule() {
293-
let button = await this.loader.getHarness(MatButtonHarness.with({text: 'Delete'}));
294-
await button.click();
295-
}
296274
}

src/app/rules/rules.component.ts

-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ export class RulesComponent {
4040
}
4141
}
4242

43-
runAll() {
44-
this.ruleService.runAll().subscribe();
45-
}
46-
4743
add(event: MatChipInputEvent) {
4844
this.ruleToCreateOrUpdate?.category.push(event.value);
4945
event.chipInput.clear();

0 commit comments

Comments
 (0)