@@ -91,17 +91,17 @@ describe('FeedComponent', () => {
91
91
const el = cmpDebugElement . nativeElement ;
92
92
expect ( getDOM ( ) . querySelectorAll ( el , 'li' ) . length ) . toEqual ( 2 ) ;
93
93
94
- const avatarLink = getDOM ( ) . querySelector ( el , 'li>a' ) ;
95
- expect ( avatarLink . getAttribute ( 'href' ) ) . toEqual ( '/users/1' ) ;
94
+ const avatarLink = getDOM ( ) . querySelector ( el , 'li > a[href="/users/1"]' ) ;
95
+ expect ( avatarLink ) . toBeTruthy ( ) ;
96
+
97
+ const userLink = getDOM ( ) . querySelector ( el , 'li > span > a[href="/users/1"]' ) ;
98
+ expect ( userLink ) . toBeTruthy ( ) ;
96
99
97
100
const gravatarDebugElement = cmpDebugElement . query ( By . directive ( GravatarComponent ) ) ;
98
101
expect ( gravatarDebugElement ) . toBeTruthy ( ) ;
99
102
expect ( gravatarDebugElement . componentInstance . hash ) . toEqual ( '9a3f499f653f7e8d4c5bf3ae0cf6418f' ) ;
100
103
expect ( gravatarDebugElement . componentInstance . alt ) . toEqual ( 'test user1' ) ;
101
104
102
- const userLink = getDOM ( ) . querySelector ( el , 'span>a' ) ;
103
- expect ( userLink . getAttribute ( 'href' ) ) . toEqual ( '/users/1' ) ;
104
-
105
105
const firstItem = getDOM ( ) . querySelector ( el , 'li' ) ;
106
106
expect ( firstItem . innerText ) . toMatch ( / t e s t u s e r 1 / ) ;
107
107
expect ( firstItem . innerText ) . toMatch ( / c o n t e n t 1 / ) ;
@@ -114,7 +114,7 @@ describe('FeedComponent', () => {
114
114
115
115
it ( 'does not delete micropost when not confirmed' , ( ) => {
116
116
const deleteLink = getDOM ( )
117
- . querySelector ( cmpDebugElement . nativeElement , 'li:first-child > a:last-child ' ) ;
117
+ . querySelector ( cmpDebugElement . nativeElement , 'li:first-child > a[href="#"] ' ) ;
118
118
spyOn ( window , 'confirm' ) . and . returnValue ( false ) ;
119
119
spyOn ( micropostService , 'delete' ) ;
120
120
deleteLink . click ( ) ;
@@ -125,7 +125,7 @@ describe('FeedComponent', () => {
125
125
const cmp : FeedComponent = cmpDebugElement . componentInstance ;
126
126
const testCmp : TestComponent = testCmpDebugElement . componentInstance ;
127
127
const deleteLink = getDOM ( )
128
- . querySelector ( cmpDebugElement . nativeElement , 'li:first-child > a:last-child ' ) ;
128
+ . querySelector ( cmpDebugElement . nativeElement , 'li:first-child > a[href="#"] ' ) ;
129
129
spyOn ( window , 'confirm' ) . and . returnValue ( true ) ;
130
130
spyOn ( cmp , 'list' ) ;
131
131
spyOn ( testCmp , 'listenDeleted' ) ;
0 commit comments