Skip to content

Commit bbc8bcb

Browse files
committed
WIP: fix tests with recent type changes
1 parent f6f50ba commit bbc8bcb

20 files changed

+1023
-1016
lines changed

gulp/tasks/build.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@ function compileIndvES2015ModulesToBrowser() {
183183
sourceMap: true
184184
})
185185
],
186+
node: {
187+
fs: 'empty',
188+
net: 'empty',
189+
tls: 'empty'
190+
},
186191
resolve: {
187192
extensions: ['.ts', '.tsx', '.js']
188193
},

gulp/tasks/test.integration.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@ function compileTypescript() {
4848
function compileWebpack() {
4949
return gulp.src('tests-integration/bundlers/**/*.test.js')
5050
.pipe(named())
51-
.pipe(webpackStream({}, webpack))
51+
.pipe(webpackStream({
52+
node: {
53+
fs: 'empty',
54+
net: 'empty',
55+
tls: 'empty'
56+
}
57+
}, webpack))
5258
.pipe(rename(path => {
5359
const rawPath = path.basename.replace('.test', '');
5460
path.basename = `${rawPath}.webpack.test`;

tests/database/browser/crawler_support.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {
99

1010
// Some sanity checks for the ReadonlyRestClient crawler support.
1111
describe('Crawler Support', function() {
12-
var initialData;
13-
var normalRef;
14-
var restRef;
15-
var tokenProvider;
12+
let initialData;
13+
let normalRef;
14+
let restRef;
15+
let tokenProvider;
1616

1717
beforeEach(function(done) {
1818
normalRef = getRandomNode();

tests/database/compound_write.test.ts

Lines changed: 102 additions & 102 deletions
Large diffs are not rendered by default.

tests/database/database.test.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
import "../../src/database";
88

99
describe('Database Tests', function() {
10-
var defaultApp;
10+
let defaultApp;
1111

1212
beforeEach(function() {
1313
defaultApp = firebase.initializeApp({databaseURL: TEST_PROJECT.databaseURL});
@@ -19,74 +19,74 @@ describe('Database Tests', function() {
1919
});
2020

2121
it('Can get database.', function() {
22-
var db = firebase.database();
22+
const db = firebase.database();
2323
expect(db).to.not.be.undefined;
2424
expect(db).not.to.be.null;
2525
});
2626

2727
it('Illegal to call constructor', function() {
2828
expect(function() {
29-
var db = new firebase.database.Database('url');
29+
const db = new firebase.database.Database('url');
3030
}).to.throw(/don't call new Database/i);
3131
});
3232

3333
it('Can get app', function() {
34-
var db = firebase.database();
34+
const db = firebase.database();
3535
expect(db.app).to.not.be.undefined;
3636
expect((db.app as any) instanceof firebase.app.App);
3737
});
3838

3939
it('Can get root ref', function() {
40-
var db = firebase.database();
40+
const db = firebase.database();
4141

42-
var ref = db.ref();
42+
const ref = db.ref();
4343

4444
expect(ref instanceof firebase.database.Reference).to.be.true;
4545
expect(ref.key).to.be.null;
4646
});
4747

4848
it('Can get child ref', function() {
49-
var db = firebase.database();
49+
const db = firebase.database();
5050

51-
var ref = db.ref('child');
51+
const ref = db.ref('child');
5252

5353
expect(ref instanceof firebase.database.Reference).to.be.true;
5454
expect(ref.key).to.equal('child');
5555
});
5656

5757
it('Can get deep child ref', function() {
58-
var db = firebase.database();
58+
const db = firebase.database();
5959

60-
var ref = db.ref('child/grand-child');
60+
const ref = db.ref('child/grand-child');
6161

6262
expect(ref instanceof firebase.database.Reference).to.be.true;
6363
expect(ref.key).to.equal('grand-child');
6464
});
6565

6666
it('ref() validates arguments', function() {
67-
var db = firebase.database();
67+
const db = firebase.database();
6868
expect(function() {
69-
var ref = (db as any).ref('path', 'extra');
69+
const ref = (db as any).ref('path', 'extra');
7070
}).to.throw(/Expects no more than 1/);
7171
});
7272

7373
it('Can get refFromURL()', function() {
74-
var db = firebase.database();
75-
var ref = db.refFromURL(TEST_PROJECT.databaseURL + '/path/to/data');
74+
const db = firebase.database();
75+
const ref = db.refFromURL(TEST_PROJECT.databaseURL + '/path/to/data');
7676
expect(ref.key).to.equal('data');
7777
});
7878

7979
it('refFromURL() validates domain', function() {
80-
var db = firebase.database();
80+
const db = firebase.database();
8181
expect(function() {
82-
var ref = db.refFromURL('https://thisisnotarealfirebase.firebaseio.com/path/to/data');
82+
const ref = db.refFromURL('https://thisisnotarealfirebase.firebaseio.com/path/to/data');
8383
}).to.throw(/does not match.*database/i);
8484
});
8585

8686
it('refFromURL() validates argument', function() {
87-
var db = firebase.database();
87+
const db = firebase.database();
8888
expect(function() {
89-
var ref = (db as any).refFromURL();
89+
const ref = (db as any).refFromURL();
9090
}).to.throw(/Expects at least 1/);
9191
});
9292
});

tests/database/datasnapshot.test.ts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import { Reference } from "../../src/database/api/Reference";
77

88
describe("DataSnapshot Tests", function () {
99
/** @return {!DataSnapshot} */
10-
var snapshotForJSON = function(json) {
11-
var dummyRef = <Reference>getRandomNode();
10+
const snapshotForJSON = function(json) {
11+
const dummyRef = <Reference>getRandomNode();
1212
return new DataSnapshot(nodeFromJSON(json), dummyRef, PRIORITY_INDEX);
1313
};
1414

1515
it("DataSnapshot.hasChildren() works.", function() {
16-
var snap = snapshotForJSON({});
16+
let snap = snapshotForJSON({});
1717
expect(snap.hasChildren()).to.equal(false);
1818

1919
snap = snapshotForJSON(5);
@@ -24,7 +24,7 @@ describe("DataSnapshot Tests", function () {
2424
});
2525

2626
it("DataSnapshot.exists() works.", function() {
27-
var snap = snapshotForJSON({});
27+
let snap = snapshotForJSON({});
2828
expect(snap.exists()).to.equal(false);
2929

3030
snap = snapshotForJSON({ '.priority':1 });
@@ -44,13 +44,13 @@ describe("DataSnapshot Tests", function () {
4444
});
4545

4646
it("DataSnapshot.val() works.", function() {
47-
var snap = snapshotForJSON(5);
47+
let snap = snapshotForJSON(5);
4848
expect(snap.val()).to.equal(5);
4949

5050
snap = snapshotForJSON({ });
5151
expect(snap.val()).to.equal(null);
5252

53-
var json =
53+
const json =
5454
{
5555
x: 5,
5656
y: {
@@ -64,7 +64,7 @@ describe("DataSnapshot Tests", function () {
6464
});
6565

6666
it("DataSnapshot.child() works.", function() {
67-
var snap = snapshotForJSON({x: 5, y: { yy: 3, yz: 4}});
67+
const snap = snapshotForJSON({x: 5, y: { yy: 3, yz: 4}});
6868
expect(snap.child('x').val()).to.equal(5);
6969
expect(snap.child('y').val()).to.deep.equal({yy: 3, yz: 4});
7070
expect(snap.child('y').child('yy').val()).to.equal(3);
@@ -75,7 +75,7 @@ describe("DataSnapshot Tests", function () {
7575
});
7676

7777
it("DataSnapshot.hasChild() works.", function() {
78-
var snap = snapshotForJSON({x: 5, y: { yy: 3, yz: 4}});
78+
const snap = snapshotForJSON({x: 5, y: { yy: 3, yz: 4}});
7979
expect(snap.hasChild('x')).to.equal(true);
8080
expect(snap.hasChild('y/yy')).to.equal(true);
8181
expect(snap.hasChild('dinosaur')).to.equal(false);
@@ -84,7 +84,7 @@ describe("DataSnapshot Tests", function () {
8484
});
8585

8686
it("DataSnapshot.key works.", function() {
87-
var snap = snapshotForJSON({a: { b: { c: 5 }}});
87+
const snap = snapshotForJSON({a: { b: { c: 5 }}});
8888
expect(snap.child('a').key).to.equal('a');
8989
expect(snap.child('a/b/c').key).to.equal('c');
9090
expect(snap.child('/a/b/c/').key).to.equal('c');
@@ -96,8 +96,8 @@ describe("DataSnapshot Tests", function () {
9696
});
9797

9898
it("DataSnapshot.forEach() works: no priorities.", function() {
99-
var snap = snapshotForJSON({a: 1, z: 26, m: 13, n: 14, c: 3, b: 2, e: 5});
100-
var out = '';
99+
const snap = snapshotForJSON({a: 1, z: 26, m: 13, n: 14, c: 3, b: 2, e: 5});
100+
let out = '';
101101
snap.forEach(function(child) {
102102
out = out + child.key + ':' + child.val() + ':';
103103
});
@@ -106,7 +106,7 @@ describe("DataSnapshot Tests", function () {
106106
});
107107

108108
it("DataSnapshot.forEach() works: numeric priorities.", function() {
109-
var snap = snapshotForJSON({
109+
const snap = snapshotForJSON({
110110
a: {'.value': 1, '.priority': 26},
111111
z: {'.value': 26, '.priority': 1},
112112
m: {'.value': 13, '.priority': 14},
@@ -115,7 +115,7 @@ describe("DataSnapshot Tests", function () {
115115
b: {'.value': 2, '.priority': 25},
116116
e: {'.value': 5, '.priority': 22}});
117117

118-
var out = '';
118+
let out = '';
119119
snap.forEach(function(child) {
120120
out = out + child.key + ':' + child.val() + ':';
121121
});
@@ -124,7 +124,7 @@ describe("DataSnapshot Tests", function () {
124124
});
125125

126126
it("DataSnapshot.forEach() works: numeric priorities as strings.", function() {
127-
var snap = snapshotForJSON({
127+
const snap = snapshotForJSON({
128128
a: {'.value': 1, '.priority': '26'},
129129
z: {'.value': 26, '.priority': '1'},
130130
m: {'.value': 13, '.priority': '14'},
@@ -133,7 +133,7 @@ describe("DataSnapshot Tests", function () {
133133
b: {'.value': 2, '.priority': '25'},
134134
e: {'.value': 5, '.priority': '22'}});
135135

136-
var out = '';
136+
let out = '';
137137
snap.forEach(function(child) {
138138
out = out + child.key + ':' + child.val() + ':';
139139
});
@@ -142,7 +142,7 @@ describe("DataSnapshot Tests", function () {
142142
});
143143

144144
it("DataSnapshot.forEach() works: alpha priorities.", function() {
145-
var snap = snapshotForJSON({
145+
const snap = snapshotForJSON({
146146
a: {'.value': 1, '.priority': 'first'},
147147
z: {'.value': 26, '.priority': 'second'},
148148
m: {'.value': 13, '.priority': 'third'},
@@ -151,7 +151,7 @@ describe("DataSnapshot Tests", function () {
151151
b: {'.value': 2, '.priority': 'sixth'},
152152
e: {'.value': 5, '.priority': 'seventh'}});
153153

154-
var out = '';
154+
let out = '';
155155
snap.forEach(function(child) {
156156
out = out + child.key + ':' + child.val() + ':';
157157
});
@@ -160,7 +160,7 @@ describe("DataSnapshot Tests", function () {
160160
});
161161

162162
it("DataSnapshot.foreach() works: mixed alpha and numeric priorities", function() {
163-
var json = {
163+
const json = {
164164
"alpha42": {'.value': 1, '.priority': "zed" },
165165
"noPriorityC": {'.value': 1, '.priority': null },
166166
"num41": {'.value': 1, '.priority': 500 },
@@ -181,8 +181,8 @@ describe("DataSnapshot Tests", function () {
181181
"alpha40": {'.value': 1, '.priority': "zed" },
182182
"num40": {'.value': 1, '.priority': 500 } };
183183

184-
var snap = snapshotForJSON(json);
185-
var out = '';
184+
const snap = snapshotForJSON(json);
185+
let out = '';
186186
snap.forEach(function(child) {
187187
out = out + child.key + ', ';
188188
});
@@ -191,19 +191,19 @@ describe("DataSnapshot Tests", function () {
191191
});
192192

193193
it(".val() exports array-like data as arrays.", function() {
194-
var array = ['bob', 'and', 'becky', 'seem', 'really', 'nice', 'yeah?'];
195-
var snap = snapshotForJSON(array);
196-
var snapVal = snap.val();
194+
const array = ['bob', 'and', 'becky', 'seem', 'really', 'nice', 'yeah?'];
195+
const snap = snapshotForJSON(array);
196+
const snapVal = snap.val();
197197
expect(snapVal).to.deep.equal(array);
198198
expect(snapVal instanceof Array).to.equal(true); // to.equal doesn't verify type.
199199
});
200200

201201
it("DataSnapshot can be JSON serialized", function() {
202-
var json = {
202+
const json = {
203203
"foo": "bar",
204204
".priority": 1
205205
};
206-
var snap = snapshotForJSON(json);
206+
const snap = snapshotForJSON(json);
207207
expect(JSON.parse(JSON.stringify(snap))).to.deep.equal(json);
208208
});
209209
});

tests/database/helpers/EventAccumulator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ export const EventAccumulatorFactory = {
22
waitsForCount: maxCount => {
33
let count = 0;
44
const condition = () => ea.eventData.length >= count;
5-
const ea = new EventAccumulator(condition)
5+
const ea = new EventAccumulator(condition);
66
ea.onReset(() => { count = 0; });
77
ea.onEvent(() => { count++; });
88
return ea;
99
}
10-
}
10+
};
1111

1212
export class EventAccumulator {
1313
public eventData = [];

0 commit comments

Comments
 (0)