Skip to content

Commit 012eb11

Browse files
committed
fix tests
1 parent 959e062 commit 012eb11

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

packages/storage/compat/index.ts

-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ function factory(
5050
.getProvider('storage-exp')
5151
.getImmediate({ identifier: url });
5252

53-
// TODO: get StorageService instance from component framework instead
54-
// of creating a new one.
5553
const storageServiceCompat: StorageServiceCompat = new StorageServiceCompat(
5654
app,
5755
storageExp

packages/storage/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"test:browser:compat": "karma start --single-run --compat",
3131
"test:browser:exp": "karma start --single-run --exp",
3232
"test:browser": "karma start --single-run",
33+
"test:debug": "karma start --browser=Chrome",
3334
"prettier": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
3435
"api-report": "api-extractor run --local --verbose && ts-node-script ../../repo-scripts/prune-dts/prune-dts.ts --input exp/dist/storage-public.d.ts --output exp/dist/storage-public.d.ts"
3536
},

packages/storage/test/integration/integration.compat.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import '@firebase/auth';
2323
import * as storage from '@firebase/storage-types';
2424

2525
import { expect } from 'chai';
26-
import '../../compat/index';
26+
import '../../index';
2727

2828
// eslint-disable-next-line @typescript-eslint/no-require-imports
2929
const PROJECT_CONFIG = require('../../../../config/project.json');

packages/storage/test/unit/index.compat.test.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
* limitations under the License.
1616
*/
1717
import { expect } from 'chai';
18-
import '../../compat/index';
18+
import '../../index';
1919
import firebase from '@firebase/app';
2020
// eslint-disable-next-line import/no-extraneous-dependencies
2121
import { StorageServiceCompat } from '../../compat/service';
22+
import { StorageService } from '../../src/service';
2223

2324
// eslint-disable-next-line @typescript-eslint/no-require-imports
2425
const PROJECT_CONFIG = require('../../../../config/project.json');
@@ -38,7 +39,8 @@ describe('Firebase Storage > API', () => {
3839
});
3940
const storage = firebase.storage!();
4041
expect(
41-
(storage as StorageServiceCompat)._delegate._bucket?.bucket
42+
((storage as StorageServiceCompat)._delegate as StorageService)._bucket
43+
?.bucket
4244
).to.equal(STORAGE_BUCKET);
4345
await app.delete();
4446
});
@@ -51,7 +53,8 @@ describe('Firebase Storage > API', () => {
5153
});
5254
const storage = firebase.storage!(app, 'gs://foo-bar.appspot.com');
5355
expect(
54-
(storage as StorageServiceCompat)._delegate._bucket?.bucket
56+
((storage as StorageServiceCompat)._delegate as StorageService)._bucket
57+
?.bucket
5558
).to.equal(STORAGE_BUCKET);
5659
await app.delete();
5760
});

packages/storage/test/unit/service.compat.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ GOOG4-RSA-SHA256`
298298
});
299299
it('Running uploads fail when the service is deleted', () => {
300300
const ref = service.refFromURL('gs://mybucket/image.jpg');
301-
const toReturn = new Promise((resolve, reject) => {
301+
const toReturn = new Promise<void>((resolve, reject) => {
302302
ref.put(new Blob(['a'])).on(
303303
TaskEvent.STATE_CHANGED,
304304
null,

packages/storage/test/unit/service.exp.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ GOOG4-RSA-SHA256`
298298
});
299299
it('Running uploads fail when the service is deleted', () => {
300300
const reference = ref(service, 'gs://mybucket/image.jpg');
301-
const toReturn = new Promise((resolve, reject) => {
301+
const toReturn = new Promise<void>((resolve, reject) => {
302302
uploadBytesResumable(reference, new Blob(['a'])).on(
303303
TaskEvent.STATE_CHANGED,
304304
undefined,

packages/storage/test/unit/task.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ describe('Firebase Storage > Upload Task', () => {
115115
h1();
116116
h2();
117117

118-
return new Promise(resolve => {
118+
return new Promise<void>(resolve => {
119119
task.on(
120120
TaskEvent.STATE_CHANGED,
121121
undefined,
@@ -136,7 +136,7 @@ describe('Firebase Storage > Upload Task', () => {
136136
new Reference(storageService, testLocation),
137137
smallBlob
138138
);
139-
return new Promise(resolve => {
139+
return new Promise<void>(resolve => {
140140
task.on(TaskEvent.STATE_CHANGED, {
141141
error: () => {
142142
assert.fail('Unexpected upload failure');

0 commit comments

Comments
 (0)