Skip to content

Commit 5ccc34d

Browse files
committed
datastore.test.ts: also verify that the thrown exception's name is FirebaseError
1 parent b8f4e37 commit 5ccc34d

File tree

1 file changed

+34
-10
lines changed

1 file changed

+34
-10
lines changed

packages/firestore/test/unit/remote/datastore.test.ts

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,11 @@ describe('Datastore', () => {
109109
);
110110
datastore.terminate();
111111
await expect(invokeDatastoreImplInvokeRpc(datastore))
112-
.to.eventually.be.rejectedWith(/terminated/i)
113-
.and.have.property('code', Code.FAILED_PRECONDITION);
112+
.to.eventually.be.rejectedWith(/terminated/)
113+
.and.include({
114+
'name': 'FirebaseError',
115+
'code': Code.FAILED_PRECONDITION
116+
});
114117
});
115118

116119
it('DatastoreImpl.invokeRPC() rethrows a FirestoreError', async () => {
@@ -121,7 +124,10 @@ describe('Datastore', () => {
121124
const datastore = newDatastore(credentials, connection, serializer);
122125
await expect(invokeDatastoreImplInvokeRpc(datastore))
123126
.to.eventually.be.rejectedWith('zzyzx')
124-
.and.have.property('code', Code.ABORTED);
127+
.and.include({
128+
'name': 'FirebaseError',
129+
'code': Code.ABORTED
130+
});
125131
expect(credentials.invalidateTokenInvoked).to.be.false;
126132
});
127133

@@ -132,7 +138,10 @@ describe('Datastore', () => {
132138
const datastore = newDatastore(credentials, connection, serializer);
133139
await expect(invokeDatastoreImplInvokeRpc(datastore))
134140
.to.eventually.be.rejectedWith('zzyzx')
135-
.and.have.property('code', Code.UNKNOWN);
141+
.and.include({
142+
'name': 'FirebaseError',
143+
'code': Code.UNKNOWN
144+
});
136145
expect(credentials.invalidateTokenInvoked).to.be.false;
137146
});
138147

@@ -144,7 +153,10 @@ describe('Datastore', () => {
144153
const datastore = newDatastore(credentials, connection, serializer);
145154
await expect(invokeDatastoreImplInvokeRpc(datastore))
146155
.to.eventually.be.rejectedWith('zzyzx')
147-
.and.have.property('code', Code.UNAUTHENTICATED);
156+
.and.include({
157+
'name': 'FirebaseError',
158+
'code': Code.UNAUTHENTICATED
159+
});
148160
expect(credentials.invalidateTokenInvoked).to.be.true;
149161
});
150162

@@ -156,8 +168,11 @@ describe('Datastore', () => {
156168
);
157169
datastore.terminate();
158170
await expect(invokeDatastoreImplInvokeStreamingRPC(datastore))
159-
.to.eventually.be.rejectedWith(/terminated/i)
160-
.and.have.property('code', Code.FAILED_PRECONDITION);
171+
.to.eventually.be.rejectedWith(/terminated/)
172+
.and.include({
173+
'name': 'FirebaseError',
174+
'code': Code.FAILED_PRECONDITION
175+
});
161176
});
162177

163178
it('DatastoreImpl.invokeStreamingRPC() rethrows a FirestoreError', async () => {
@@ -168,7 +183,10 @@ describe('Datastore', () => {
168183
const datastore = newDatastore(credentials, connection, serializer);
169184
await expect(invokeDatastoreImplInvokeStreamingRPC(datastore))
170185
.to.eventually.be.rejectedWith('zzyzx')
171-
.and.have.property('code', Code.ABORTED);
186+
.and.include({
187+
'name': 'FirebaseError',
188+
'code': Code.ABORTED
189+
});
172190
expect(credentials.invalidateTokenInvoked).to.be.false;
173191
});
174192

@@ -179,7 +197,10 @@ describe('Datastore', () => {
179197
const datastore = newDatastore(credentials, connection, serializer);
180198
await expect(invokeDatastoreImplInvokeStreamingRPC(datastore))
181199
.to.eventually.be.rejectedWith('zzyzx')
182-
.and.have.property('code', Code.UNKNOWN);
200+
.and.include({
201+
'name': 'FirebaseError',
202+
'code': Code.UNKNOWN
203+
});
183204
expect(credentials.invalidateTokenInvoked).to.be.false;
184205
});
185206

@@ -191,7 +212,10 @@ describe('Datastore', () => {
191212
const datastore = newDatastore(credentials, connection, serializer);
192213
await expect(invokeDatastoreImplInvokeStreamingRPC(datastore))
193214
.to.eventually.be.rejectedWith('zzyzx')
194-
.and.have.property('code', Code.UNAUTHENTICATED);
215+
.and.include({
216+
'name': 'FirebaseError',
217+
'code': Code.UNAUTHENTICATED
218+
});
195219
expect(credentials.invalidateTokenInvoked).to.be.true;
196220
});
197221
});

0 commit comments

Comments
 (0)