tests(angular): awaiting promises

Signed-off-by: Vojtech Mašek <[email protected]>

Author: vmasek

tests/test-angular-project/src/api-tests/api-client.module.spec.ts

@@ -19,20 +19,28 @@ describe('APIClientModule', () => {
     });
   });
 
-  it('should provide APIClient', inject([APIClient], (apiClient: APIClient) => {
-    expect(apiClient).toBeTruthy();
-  }));
+  it('should provide APIClient',
+    inject([APIClient], async (apiClient: APIClient) => {
+      await expect(apiClient).toBeTruthy();
+    })
+  );
 
-  it('should have domain set to current hostname and port', inject([APIClient], (apiClient: APIClient) => {
-    expect(apiClient.domain).toBe(`//${window.location.hostname}${window.location.port ? ':'+window.location.port : ''}`);
-  }));
+  it('should have domain set to current hostname and port',
+    inject([APIClient], (apiClient: APIClient) => {
+      expect(apiClient.domain).toBe(`//${window.location.hostname}${window.location.port ? ':' + window.location.port : ''}`);
+    })
+  );
 
-  it('should have header set', inject([APIClient], (apiClient: APIClient) => {
-    expect(apiClient.options.headers.getAll('testHeader')).toEqual(['42']);
-  }));
+  it('should have header set',
+    inject([APIClient], (apiClient: APIClient) => {
+      expect(apiClient.options.headers.getAll('testHeader')).toEqual(['42']);
+    })
+  );
 
-  it('should not have params set', inject([APIClient], (apiClient: APIClient) => {
-    // if params are not set they equal to new empty http params
-    expect(apiClient.options.params).toEqual(new HttpParams());
-  }));
+  it('should not have params set',
+    inject([APIClient], async (apiClient: APIClient) => {
+      // if params are not set they equal to new empty http params
+      await expect(apiClient.options.params).toEqual(new HttpParams());
+    })
+  );
 });

tests/test-angular-project/src/api-tests/user.service.spec.ts

@@ -15,9 +15,9 @@ describe('UserService', () => {
     });
   });
 
-  it('should be initialized', inject([UserAPIClient], (userApi: UserAPIClient) => {
-    expect(userApi).toBeTruthy();
-    expect(userApi.domain).toBe(DUMMY_DOMAIN);
+  it('should be initialized', inject([UserAPIClient], async (userApi: UserAPIClient) => {
+    await expect(userApi).toBeTruthy();
+    await expect(userApi.domain).toBe(DUMMY_DOMAIN);
   }));
 
   it('should register user', inject(
@@ -34,9 +34,9 @@ describe('UserService', () => {
         userStatus: 1,
       };
 
-      userApi.createUser({body: user}).subscribe(data => {
+      userApi.createUser({body: user}).subscribe(async data => {
         console.info('data', data);
-        expect(data).toBe('register was successful');
+        await expect(data).toBe('register was successful');
       });
 
       backend

tests/test-angular-project/swagger.yaml

@@ -213,98 +213,6 @@ paths:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
-  /store/inventory:
-    get:
-      tags:
-      - "store"
-      summary: "Returns pet inventories by status"
-      description: "Returns a map of status codes to quantities"
-      operationId: "getInventory"
-      produces:
-      - "application/json"
-      parameters: []
-      responses:
-        200:
-          description: "successful operation"
-          schema:
-            type: "object"
-            additionalProperties:
-              type: "integer"
-              format: "int32"
-      security:
-      - api_key: []
-  /store/order:
-    post:
-      tags:
-      - "store"
-      summary: "Place an order for a pet"
-      operationId: "placeOrder"
-      produces:
-      - "application/json"
-      parameters:
-      - in: "body"
-        name: "body"
-        description: "order placed for purchasing the pet"
-        required: true
-        schema:
-          $ref: "#/definitions/Order"
-      responses:
-        200:
-          description: "successful operation"
-          schema:
-            $ref: "#/definitions/Order"
-        400:
-          description: "Invalid Order"
-  /store/order/{orderId}:
-    get:
-      tags:
-      - "store"
-      summary: "Find purchase order by ID"
-      description: "For valid response try integer IDs with value >= 1 and <= 10.\
-        \ Other values will generated exceptions"
-      operationId: "getOrderById"
-      produces:
-      - "application/json"
-      parameters:
-      - name: "orderId"
-        in: "path"
-        description: "ID of pet that needs to be fetched"
-        required: true
-        type: "integer"
-        maximum: 10.0
-        minimum: 1.0
-        format: "int64"
-      responses:
-        200:
-          description: "successful operation"
-          schema:
-            $ref: "#/definitions/Order"
-        400:
-          description: "Invalid ID supplied"
-        404:
-          description: "Order not found"
-    delete:
-      tags:
-      - "store"
-      summary: "Delete purchase order by ID"
-      description: "For valid response try integer IDs with positive integer value.\
-        \ Negative or non-integer values will generate API errors"
-      operationId: "deleteOrder"
-      produces:
-      - "application/json"
-      parameters:
-      - name: "orderId"
-        in: "path"
-        description: "ID of the order that needs to be deleted"
-        required: true
-        type: "integer"
-        minimum: 1.0
-        format: "int64"
-      responses:
-        400:
-          description: "Invalid ID supplied"
-        404:
-          description: "Order not found"
   /user:
     post:
       tags:
@@ -459,33 +367,6 @@ securityDefinitions:
     name: "api_key"
     in: "header"
 definitions:
-  Order:
-    type: "object"
-    properties:
-      id:
-        type: "integer"
-        format: "int64"
-      petId:
-        type: "integer"
-        format: "int64"
-      quantity:
-        type: "integer"
-        format: "int32"
-      shipDate:
-        type: "string"
-        format: "date-time"
-      status:
-        type: "string"
-        description: "Order Status"
-        enum:
-        - "placed"
-        - "approved"
-        - "delivered"
-      complete:
-        type: "boolean"
-        default: false
-    xml:
-      name: "Order"
   User:
     type: "object"
     properties: