Skip to content

Commit e810bad

Browse files
committed
Fix tests
1 parent 388fa14 commit e810bad

File tree

10 files changed

+986
-66
lines changed

10 files changed

+986
-66
lines changed

packages/storage/compat/reference.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import * as errorsExports from '../src/implementation/error';
4747
export class ReferenceCompat implements types.Reference {
4848
constructor(private readonly delegate: Reference) {}
4949

50-
root = new ReferenceCompat(this.delegate.root) as types.Reference;
5150
storage = new StorageServiceCompat(
5251
this.delegate.storage,
5352
ref => new ReferenceCompat(ref)
@@ -72,6 +71,10 @@ export class ReferenceCompat implements types.Reference {
7271
return new ReferenceCompat(reference);
7372
}
7473

74+
get root(): types.Reference {
75+
return new ReferenceCompat(this.delegate.root) as types.Reference;
76+
}
77+
7578
/**
7679
* @return A reference to the parent of the
7780
* current object, or null if the current object is the root.

packages/storage/compat/service.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ export class StorageServiceCompat implements types.FirebaseStorage {
6060
app = this.delegate.app;
6161
maxOperationRetryTime = this.delegate.maxOperationRetryTime;
6262
maxUploadRetryTime = this.delegate.maxUploadRetryTime;
63+
INTERNAL = new ServiceInternals(this);
6364

6465
/**
6566
* Returns a firebaseStorage.Reference for the given path in the default
@@ -106,17 +107,17 @@ export class StorageServiceCompat implements types.FirebaseStorage {
106107
* @struct
107108
*/
108109
export class ServiceInternals {
109-
service_: StorageService;
110+
service_: StorageServiceCompat;
110111

111-
constructor(service: StorageService) {
112+
constructor(service: StorageServiceCompat) {
112113
this.service_ = service;
113114
}
114115

115116
/**
116117
* Called when the associated app is deleted.
117118
*/
118119
delete(): Promise<void> {
119-
this.service_.deleteApp();
120+
this.service_.delegate.deleteApp();
120121
return Promise.resolve();
121122
}
122123
}

packages/storage/exp/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ export {
3939
list,
4040
listAll,
4141
getDownloadURL,
42-
deleteObject,
43-
getParent as parentReference
42+
deleteObject
4443
} from '../src/reference';
4544

4645
/**

packages/storage/src/reference.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ export class Reference {
107107
return this.service;
108108
}
109109

110+
get parent(): Reference | null {
111+
return getParent(this);
112+
}
113+
110114
throwIfRoot_(name: string): void {
111115
if (this.location.path === '') {
112116
throw errorsExports.invalidRootOperation(name);

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

Lines changed: 1 addition & 1 deletion
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 '../../index';
26+
import '../../compat/index';
2727

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

packages/storage/test/unit/reference.test.ts renamed to packages/storage/test/unit/reference.compat.test.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,37 @@ import { FirebaseApp } from '@firebase/app-types';
1919
import { StringFormat } from '../../src/implementation/string';
2020
import { Headers } from '../../src/implementation/xhrio';
2121
import { Metadata } from '../../src/metadata';
22-
import { Reference } from '../../src/reference';
23-
import { StorageService } from '../../src/service';
22+
import { ReferenceCompat } from '../../compat/reference';
23+
import { StorageServiceCompat } from '../../compat/service';
2424
import * as testShared from './testshared';
2525
import { SendHook, TestingXhrIo } from './xhrio';
2626
import { DEFAULT_HOST } from '../../src/implementation/constants';
2727
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
2828
import { Provider } from '@firebase/component';
29+
import { StorageService } from '../../src/service';
30+
import { Reference } from '../../src/reference';
2931

3032
/* eslint-disable @typescript-eslint/no-floating-promises */
3133
function makeFakeService(
3234
app: FirebaseApp,
3335
authProvider: Provider<FirebaseAuthInternalName>,
3436
sendHook: SendHook
35-
): StorageService {
36-
return new StorageService(app, authProvider, testShared.makePool(sendHook));
37+
): StorageServiceCompat {
38+
return new StorageServiceCompat(
39+
new StorageService(app, authProvider, testShared.makePool(sendHook)),
40+
ref => new ReferenceCompat(ref)
41+
);
3742
}
3843

39-
function makeStorage(url: string): Reference {
44+
function makeStorage(url: string): ReferenceCompat {
45+
console.log('makeStorage');
4046
const service = new StorageService(
4147
{} as FirebaseApp,
4248
testShared.emptyAuthProvider,
4349
testShared.makePool(null)
4450
);
45-
return new Reference(service, url);
51+
console.log('created service');
52+
return new ReferenceCompat(new Reference(service, url));
4653
}
4754

4855
describe('Firebase Storage > Reference', () => {

0 commit comments

Comments
 (0)