@@ -6,8 +6,6 @@ import {MatButtonHarness} from "@angular/material/button/testing";
6
6
import { HarnessLoader , TestKey } from "@angular/cdk/testing" ;
7
7
import { ComponentFixture , fakeAsync , tick } from "@angular/core/testing" ;
8
8
import { TestbedHarnessEnvironment } from "@angular/cdk/testing/testbed" ;
9
- import { mustBeConsumedAsyncObservable } from "../../testing/common-testing-function.spec" ;
10
- import { mockRuleService } from "./rule.service.spec" ;
11
9
import { MatInputHarness } from "@angular/material/input/testing" ;
12
10
import { MatFormFieldHarness } from "@angular/material/form-field/testing" ;
13
11
import { MatFormFieldModule } from "@angular/material/form-field" ;
@@ -39,7 +37,7 @@ describe('RulesComponent', () => {
39
37
mockSampleRules ( )
40
38
41
39
// Act
42
- let component = MockRender ( RulesComponent ) . point . componentInstance ;
40
+ let component = MockRender ( RulesComponent , null , { reset : true } ) . point . componentInstance ;
43
41
44
42
// Assert
45
43
expect ( component ) . toBeTruthy ( ) ;
@@ -50,7 +48,7 @@ describe('RulesComponent', () => {
50
48
mockSampleRules ( ) ;
51
49
52
50
// Act
53
- let fixture = MockRender ( RulesComponent ) ;
51
+ let fixture = MockRender ( RulesComponent , null , { reset : true } ) ;
54
52
55
53
// Assert
56
54
tick ( ) ;
@@ -60,24 +58,9 @@ describe('RulesComponent', () => {
60
58
expect ( Page . getRuleScript ( 'Electric bill' ) ) . toEqual ( 'return fileName === "electricity_bill.pdf"' ) ;
61
59
} ) )
62
60
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
-
78
61
it ( 'should create a new rule' , fakeAsync ( async ( ) => {
79
62
// Arrange
80
- let ruleService = mockRuleService ( ) ;
63
+ let ruleService = ngMocks . get ( RuleService ) ;
81
64
when ( ( ) => ruleService . findAll ( ) ) . thenResolve ( [ ] ) ;
82
65
83
66
let expectedRule : Rule = {
@@ -89,7 +72,7 @@ describe('RulesComponent', () => {
89
72
90
73
// After refresh, there should be the new rule
91
74
when ( ( ) => ruleService . findAll ( ) ) . thenResolve ( [ expectedRule ] ) ;
92
- let fixture = MockRender ( RulesComponent ) ;
75
+ let fixture = MockRender ( RulesComponent , null , { reset : true } ) ;
93
76
94
77
let page = new Page ( fixture ) ;
95
78
@@ -111,7 +94,7 @@ describe('RulesComponent', () => {
111
94
112
95
it ( 'should delete an existing rule' , fakeAsync ( async ( ) => {
113
96
// Arrange
114
- let ruleService = mockRuleService ( ) ;
97
+ let ruleService = ngMocks . get ( RuleService ) ;
115
98
116
99
let rule : Rule = {
117
100
name : 'Rule1' ,
@@ -125,7 +108,7 @@ describe('RulesComponent', () => {
125
108
126
109
when ( ( ) => ruleService . delete ( rule ) ) . thenResolve ( ) ;
127
110
128
- let fixture = MockRender ( RulesComponent ) ;
111
+ let fixture = MockRender ( RulesComponent , null , { reset : true } ) ;
129
112
tick ( ) ;
130
113
131
114
let page = new Page ( fixture ) ;
@@ -188,7 +171,7 @@ describe('RulesComponent', () => {
188
171
189
172
190
173
function mockSampleRules ( ) {
191
- let ruleService = mockRuleService ( ) ;
174
+ let ruleService = ngMocks . get ( RuleService ) ;
192
175
when ( ( ) => ruleService . findAll ( ) ) . thenResolve ( getSampleRules ( ) ) ;
193
176
}
194
177
@@ -232,11 +215,6 @@ class Page {
232
215
. nativeNode . textContent . trim ( ) ;
233
216
}
234
217
235
- async clickOnRunRulesButton ( ) {
236
- let button = await this . loader . getHarness ( MatButtonHarness . with ( { text : 'Run all' } ) ) ;
237
- return button . click ( ) ;
238
- }
239
-
240
218
async clickOnCreateNewRule ( ) {
241
219
let button = await this . loader . getHarness ( MatButtonHarness . with ( { text : 'Create new rule' } ) ) ;
242
220
await button . click ( ) ;
@@ -280,6 +258,11 @@ class Page {
280
258
await button . click ( ) ;
281
259
}
282
260
261
+ async deleteFirstRule ( ) {
262
+ let button = await this . loader . getHarness ( MatButtonHarness . with ( { text : 'Delete' } ) ) ;
263
+ await button . click ( ) ;
264
+ }
265
+
283
266
private async getInputByFloatingLabel ( floatingLabelText : string | RegExp ) {
284
267
let formFieldHarness = await this . loader . getHarness ( MatFormFieldHarness . with ( { floatingLabelText : floatingLabelText } ) ) ;
285
268
let control = await formFieldHarness . getControl ( ) ;
@@ -288,9 +271,4 @@ class Page {
288
271
}
289
272
throw Error ( "No input found with floating label '" + floatingLabelText + "'" ) ;
290
273
}
291
-
292
- async deleteFirstRule ( ) {
293
- let button = await this . loader . getHarness ( MatButtonHarness . with ( { text : 'Delete' } ) ) ;
294
- await button . click ( ) ;
295
- }
296
274
}
0 commit comments