Skip to content

Commit bc2a669

Browse files
committed
Node test didn't work cause I hadn't saved my buffer...
1 parent fb53d76 commit bc2a669

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ install:
3939
fi
4040
4141
script:
42-
- yarn run build
42+
- yarn build
4343
- |
4444
./node_modules/.bin/karma start --single-run --browsers ChromeHeadlessTravis --reporters mocha &&
45+
yarn test:node &&
4546
node tools/run-typings-test.js &&
4647
bash ./test/ng-build/build.sh

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "The official library of Firebase and Angular.",
55
"private": true,
66
"scripts": {
7-
"test": "npm run build && karma start --single-run",
7+
"test": "npm run build && karma start --single-run && npm run test:node",
88
"test:node": "jasmine 'dist/packages-dist/schematics/**/*[sS]pec.js'",
99
"test:watch": "concurrently \"npm run build:watch\" \"npm run delayed_karma\"",
1010
"test:debug": "npm run build && karma start",

src/schematics/ng-add.spec.ts

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Tree } from "@angular-devkit/schematics";
2-
import { ngAdd } from "./ng-add";
2+
import { setupFirebaseProject } from "./ng-add";
33

44
const PROJECT_NAME = "pie-ka-chu";
55
const PROJECT_ROOT = "pirojok";
@@ -18,22 +18,22 @@ describe("ng-add", () => {
1818
});
1919

2020
it('generates new files if starting from scratch', async () => {
21-
const result = ngAdd(tree, {firebaseProject: FIREBASE_PROJECT, project: PROJECT_NAME});
21+
const result = setupFirebaseProject(tree, {firebaseProject: FIREBASE_PROJECT, project: PROJECT_NAME});
2222
expect(result.read('firebase.json')!.toString()).toEqual(initialFirebaseJson);
2323
expect(result.read('.firebaserc')!.toString()).toEqual(initialFirebaserc);
2424
expect(result.read('angular.json')!.toString()).toEqual(initialAngularJson);
2525
});
2626

2727
it('uses default project', async () => {
28-
const result = ngAdd(tree, {firebaseProject: FIREBASE_PROJECT});
28+
const result = setupFirebaseProject(tree, {firebaseProject: FIREBASE_PROJECT});
2929
expect(result.read('firebase.json')!.toString()).toEqual(overwriteFirebaseJson);
3030
expect(result.read('.firebaserc')!.toString()).toEqual(overwriteFirebaserc);
3131
expect(result.read('angular.json')!.toString()).toEqual(overwriteAngularJson);
3232
});
3333

3434
it('overrides existing files', async () => {
35-
const tempTree = ngAdd(tree, {firebaseProject: FIREBASE_PROJECT, project: PROJECT_NAME});
36-
const result = ngAdd(tempTree, {firebaseProject: OTHER_FIREBASE_PROJECT_NAME, project: OTHER_PROJECT_NAME});
35+
const tempTree = setupFirebaseProject(tree, {firebaseProject: FIREBASE_PROJECT, project: PROJECT_NAME});
36+
const result = setupFirebaseProject(tempTree, {firebaseProject: OTHER_FIREBASE_PROJECT_NAME, project: OTHER_PROJECT_NAME});
3737
expect(result.read('firebase.json')!.toString()).toEqual(projectFirebaseJson);
3838
expect(result.read('.firebaserc')!.toString()).toEqual(projectFirebaserc);
3939
expect(result.read('angular.json')!.toString()).toEqual(projectAngularJson);
@@ -47,7 +47,7 @@ describe("ng-add", () => {
4747
delete angularJSON.defaultProject;
4848
tree.create("angular.json", JSON.stringify(angularJSON));
4949
expect(() =>
50-
ngAdd(tree, {
50+
setupFirebaseProject(tree, {
5151
firebaseProject: FIREBASE_PROJECT,
5252
project: ""
5353
})
@@ -58,7 +58,7 @@ describe("ng-add", () => {
5858

5959
it("Should throw if angular.json not found", async () => {
6060
expect(() =>
61-
ngAdd(Tree.empty(), {
61+
setupFirebaseProject(Tree.empty(), {
6262
firebaseProject: FIREBASE_PROJECT,
6363
project: PROJECT_NAME
6464
})
@@ -69,7 +69,7 @@ describe("ng-add", () => {
6969
const tree = Tree.empty();
7070
tree.create("angular.json", "hi");
7171
expect(() =>
72-
ngAdd(tree, {
72+
setupFirebaseProject(tree, {
7373
firebaseProject: FIREBASE_PROJECT,
7474
project: PROJECT_NAME
7575
})
@@ -80,7 +80,7 @@ describe("ng-add", () => {
8080
const tree = Tree.empty();
8181
tree.create("angular.json", JSON.stringify({ projects: {} }));
8282
expect(() =>
83-
ngAdd(tree, {
83+
setupFirebaseProject(tree, {
8484
firebaseProject: FIREBASE_PROJECT,
8585
project: PROJECT_NAME
8686
})
@@ -96,7 +96,7 @@ describe("ng-add", () => {
9696
})
9797
);
9898
expect(() =>
99-
ngAdd(tree, {
99+
setupFirebaseProject(tree, {
100100
firebaseProject: FIREBASE_PROJECT,
101101
project: PROJECT_NAME
102102
})
@@ -112,7 +112,7 @@ describe("ng-add", () => {
112112
})
113113
);
114114
expect(() =>
115-
ngAdd(tree, {
115+
setupFirebaseProject(tree, {
116116
firebaseProject: FIREBASE_PROJECT,
117117
project: PROJECT_NAME
118118
})
@@ -122,13 +122,13 @@ describe("ng-add", () => {
122122
it("Should throw if firebase.json has the project already", async () => {
123123
const tree = Tree.empty();
124124
tree.create("angular.json", JSON.stringify(generateAngularJson()));
125-
const tempTree = ngAdd(tree, {
125+
const tempTree = setupFirebaseProject(tree, {
126126
firebaseProject: FIREBASE_PROJECT,
127127
project: PROJECT_NAME
128128
});
129129

130130
expect(() =>
131-
ngAdd(tempTree, {
131+
setupFirebaseProject(tempTree, {
132132
firebaseProject: FIREBASE_PROJECT,
133133
project: PROJECT_NAME
134134
})
@@ -140,7 +140,7 @@ describe("ng-add", () => {
140140
tree.create("angular.json", JSON.stringify(generateAngularJson()));
141141
tree.create("firebase.json", "I'm broken 😔");
142142
expect(() =>
143-
ngAdd(tree, {
143+
setupFirebaseProject(tree, {
144144
firebaseProject: FIREBASE_PROJECT,
145145
project: PROJECT_NAME
146146
})
@@ -152,7 +152,7 @@ describe("ng-add", () => {
152152
tree.create("angular.json", JSON.stringify(generateAngularJson()));
153153
tree.create(".firebaserc", "I'm broken 😔");
154154
expect(() =>
155-
ngAdd(tree, {
155+
setupFirebaseProject(tree, {
156156
firebaseProject: FIREBASE_PROJECT,
157157
project: PROJECT_NAME
158158
})
@@ -162,13 +162,13 @@ describe("ng-add", () => {
162162
it("Should throw if firebase.json has the project already", async () => {
163163
const tree = Tree.empty();
164164
tree.create("angular.json", JSON.stringify(generateAngularJson()));
165-
const tempTree = ngAdd(tree, {
165+
const tempTree = setupFirebaseProject(tree, {
166166
firebaseProject: FIREBASE_PROJECT,
167167
project: PROJECT_NAME
168168
});
169169

170170
expect(() =>
171-
ngAdd(tempTree, {
171+
setupFirebaseProject(tempTree, {
172172
firebaseProject: FIREBASE_PROJECT,
173173
project: OTHER_PROJECT_NAME
174174
})
@@ -179,13 +179,13 @@ describe("ng-add", () => {
179179
const tree = Tree.empty();
180180
tree.create("angular.json", JSON.stringify(generateAngularJson()));
181181

182-
const tempTree = ngAdd(tree, {
182+
const tempTree = setupFirebaseProject(tree, {
183183
firebaseProject: FIREBASE_PROJECT,
184184
project: PROJECT_NAME
185185
});
186186

187187
expect(() =>
188-
ngAdd(tempTree, {
188+
setupFirebaseProject(tempTree, {
189189
firebaseProject: FIREBASE_PROJECT,
190190
project: OTHER_PROJECT_NAME
191191
})

0 commit comments

Comments
 (0)