Skip to content

Commit 45e5ba4

Browse files
authored
Merge branch 'master' into mikelehen-changelog
2 parents b6373f0 + cbb07d3 commit 45e5ba4

File tree

7 files changed

+21
-10
lines changed

7 files changed

+21
-10
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ before_install:
1212
# get an up to date version
1313
- npm install -g yarn
1414
before_script:
15-
- npm run test:setup -- --token $FIREBASE_TOKEN --projectId $FIREBASE_PROJECT
15+
- cp config/ci.config.json config/project.json
1616
script:
1717
- xvfb-run npm test
1818

config/ci.config.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"apiKey": "AIzaSyBNHCyZ-bpv-WA-HpXTmigJm2aq3z1kaH8",
3+
"authDomain": "jscore-sandbox-141b5.firebaseapp.com",
4+
"databaseURL": "https://jscore-sandbox-141b5.firebaseio.com",
5+
"projectId": "jscore-sandbox-141b5",
6+
"storageBucket": "jscore-sandbox-141b5.appspot.com",
7+
"messagingSenderId": "280127633210"
8+
}

packages/auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/auth",
3-
"version": "0.2.1",
3+
"version": "0.2.2",
44
"main": "dist/auth.js",
55
"description": "Javascript library for Firebase Auth SDK",
66
"files": [

packages/firebase/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase",
3-
"version": "4.6.1",
3+
"version": "4.6.2",
44
"description": "Firebase JavaScript library for web and Node.js",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -28,9 +28,9 @@
2828
"react-native": "index.react-native.js",
2929
"dependencies": {
3030
"@firebase/app": "^0.1.2",
31-
"@firebase/auth": "^0.2.1",
31+
"@firebase/auth": "^0.2.2",
3232
"@firebase/database": "^0.1.3",
33-
"@firebase/firestore": "^0.1.3",
33+
"@firebase/firestore": "^0.1.4",
3434
"@firebase/messaging": "^0.1.3",
3535
"@firebase/polyfill": "^0.1.2",
3636
"@firebase/storage": "^0.1.2",

packages/firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore",
3-
"version": "0.1.3",
3+
"version": "0.1.4",
44
"description": "",
55
"scripts": {
66
"dev": "gulp dev",
@@ -18,7 +18,7 @@
1818
"module": "dist/esm/index.js",
1919
"license": "Apache-2.0",
2020
"dependencies": {
21-
"@firebase/webchannel-wrapper": "^0.2.3"
21+
"@firebase/webchannel-wrapper": "^0.2.4"
2222
},
2323
"peerDependencies": {
2424
"@firebase/app": "^0.1.0"

packages/firestore/test/unit/specs/spec_test_runner.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,8 +1039,11 @@ export async function runSpec(
10391039
runner = new MemoryTestRunner(name, config);
10401040
}
10411041
await runner.start();
1042-
await runner.run(steps);
1043-
await runner.shutdown();
1042+
try {
1043+
await runner.run(steps);
1044+
} finally {
1045+
await runner.shutdown();
1046+
}
10441047
}
10451048

10461049
/** Specifies initial configuration information for the test. */

packages/webchannel-wrapper/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/webchannel-wrapper",
3-
"version": "0.2.3",
3+
"version": "0.2.4",
44
"description": "A wrapper of the webchannel packages from closure-library for use outside of a closure compiled application",
55
"main": "dist/index.js",
66
"scripts": {

0 commit comments

Comments
 (0)