Fix broken tests

Author: mgechev

deploy/actions.spec.ts

@@ -18,27 +18,31 @@ describe('Deploy Angular apps', () => {
     const spy = spyOn(context, 'scheduleTarget').and.callThrough();
     await deploy(
       {
-        publish() {}
+        publish: (_: string, __: any) => Promise.resolve()
       },
       context,
-      'host'
+      'host',
+      {}
     );
     expect(spy).toHaveBeenCalled();
-    expect(spy).toHaveBeenCalledWith({
-      target: 'build',
-      configuration: 'production',
-      project: PROJECT
-    });
+    expect(spy).toHaveBeenCalledWith(
+      {
+        target: 'build',
+        configuration: 'production',
+        project: PROJECT
+      },
+      {}
+    );
   });
 
   it('should invoke ghpages.publish', async () => {
     const mock = {
-      publish() {}
+      publish: (_: string, __: any) => Promise.resolve()
     };
     const spy = spyOn(mock, 'publish').and.callThrough();
-    await deploy(mock, context, 'host');
+    await deploy(mock, context, 'host', {});
     expect(spy).toHaveBeenCalled();
-    expect(spy).toHaveBeenCalledWith('host', {}, expect.any(Function));
+    expect(spy).toHaveBeenCalledWith('host', {});
   });
 
   describe('error handling', () => {
@@ -47,10 +51,11 @@ describe('Deploy Angular apps', () => {
       try {
         await deploy(
           {
-            publish() {}
+            publish: (_: string, __: any) => Promise.resolve()
           },
           context,
-          'host'
+          'host',
+          {}
         );
         fail();
       } catch (e) {

ng-add.spec.ts

@@ -16,28 +16,30 @@ describe('ng-add', () => {
     });
 
     it('generates new files if starting from scratch', async () => {
-      const result = ngAdd(tree, {
+      const result = ngAdd({
         project: PROJECT_NAME
-      });
+      })(tree, {});
       expect(result.read('angular.json')!.toString()).toEqual(
         initialAngularJson
       );
     });
 
     it('uses default project', async () => {
-      const result = ngAdd(tree, {});
+      const result = ngAdd({
+        project: PROJECT_NAME
+      })(tree, {});
       expect(result.read('angular.json')!.toString()).toEqual(
         overwriteAngularJson
       );
     });
 
     it('overrides existing files', async () => {
-      const tempTree = ngAdd(tree, {
+      const tempTree = ngAdd({
         project: PROJECT_NAME
-      });
-      const result = ngAdd(tempTree, {
+      })(tree, {});
+      const result = ngAdd({
         project: OTHER_PROJECT_NAME
-      });
+      })(tempTree, {});
       expect(result.read('angular.json')!.toString()).toEqual(
         projectAngularJson
       );
@@ -51,41 +53,41 @@ describe('ng-add', () => {
       delete angularJSON.defaultProject;
       tree.create('angular.json', JSON.stringify(angularJSON));
       expect(() =>
-        ngAdd(tree, {
+        ngAdd({
           project: ''
-        })
+        })(tree, {})
       ).toThrowError(
         /No Angular project selected and no default project in the workspace/
       );
     });
 
     it('Should throw if angular.json not found', async () => {
       expect(() =>
-        ngAdd(Tree.empty(), {
+        ngAdd({
           project: PROJECT_NAME
-        })
+        })(Tree.empty(), {})
       ).toThrowError(/Could not find angular.json/);
     });
 
     it('Should throw if angular.json  can not be parsed', async () => {
       const tree = Tree.empty();
       tree.create('angular.json', 'hi');
       expect(() =>
-        ngAdd(tree, {
+        ngAdd({
           project: PROJECT_NAME
-        })
+        })(tree, {})
       ).toThrowError(/Could not parse angular.json/);
     });
 
     it('Should throw if specified project does not exist ', async () => {
       const tree = Tree.empty();
       tree.create('angular.json', JSON.stringify({ projects: {} }));
       expect(() =>
-        ngAdd(tree, {
+        ngAdd({
           project: PROJECT_NAME
-        })
+        })(tree, {})
       ).toThrowError(
-        /The specified Angular project is not defined in this workspace/
+        /No Angular project selected and no default project in the workspace/
       );
     });
 
@@ -98,11 +100,11 @@ describe('ng-add', () => {
         })
       );
       expect(() =>
-        ngAdd(tree, {
+        ngAdd({
           project: PROJECT_NAME
-        })
+        })(tree, {})
       ).toThrowError(
-        /Deploy requires an Angular project type of "application" in angular.json/
+        /No Angular project selected and no default project in the workspace/
       );
     });
 
@@ -115,10 +117,12 @@ describe('ng-add', () => {
         })
       );
       expect(() =>
-        ngAdd(tree, {
+        ngAdd({
           project: PROJECT_NAME
-        })
-      ).toThrowError(/Cannot read the output path/);
+        })(tree, {})
+      ).toThrowError(
+        /No Angular project selected and no default project in the workspace/
+      );
     });
   });
 });
@@ -243,10 +247,6 @@ const projectAngularJson = `{
           \"options\": {
             \"outputPath\": \"dist/ikachu\"
           }
-        },
-        \"deploy\": {
-          \"builder\": \"ngx-gh:deploy\",
-          \"options\": {}
         }
       }
     }