fix(tests): cleanup tests from devwork

awslabs · Jul 8, 2022 · 18f270e · 18f270e
1 parent ff565fc
commit 18f270e
Show file tree

Hide file tree

Showing 17 changed files with 113 additions and 45 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.4.0",
+  "version": "1.5.0",
   "packages": [
     "packages/*"
   ],

diff --git a/...ion/iot-bar-chart/iot-bar-chart.spec.component.ts/bar chart -- renders.snap.png b/...ion/iot-bar-chart/iot-bar-chart.spec.component.ts/bar chart -- renders.snap.png
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "IoT App Kit Components",
   "main": "dist/index.cjs.js",
   "module": "dist/custom-elements/index.js",
@@ -41,9 +41,9 @@
     "@awsui/collection-hooks": "^1.0.0",
     "@awsui/components-react": "^3.0.0",
     "@awsui/design-tokens": "^3.0.0",
-    "@iot-app-kit/core": "^1.4.0",
-    "@iot-app-kit/related-table": "^1.4.0",
-    "@iot-app-kit/source-iotsitewise": "^1.4.0",
+    "@iot-app-kit/core": "^1.5.0",
+    "@iot-app-kit/related-table": "^1.5.0",
+    "@iot-app-kit/source-iotsitewise": "^1.5.0",
     "@stencil/core": "^2.7.0",
     "@synchro-charts/core": "^5.0.0",
     "styled-components": "^5.3.0"

diff --git a/packages/components/src/integration/iot-bar-chart/iot-bar-chart.spec.component.ts b/packages/components/src/integration/iot-bar-chart/iot-bar-chart.spec.component.ts
@@ -2,6 +2,7 @@ import { renderChart } from '../../testing/renderChart';
 import { mockGetAggregatedOrRawResponse } from '../../testing/mocks/mockGetAggregatedOrRawResponse';
 import { mockGetAssetSummary } from '../../testing/mocks/mockGetAssetSummaries';
 import { ScaleConfig, ScaleType } from '@synchro-charts/core';
+import { mockGetAssetModelSummary } from '../../testing/mocks/mockGetAssetModelSummary';
 
 const SECOND_IN_MS = 1000;
 
@@ -25,11 +26,15 @@ describe('bar chart', () => {
     });
 
     cy.intercept(`/assets/${assetId}`, (req) => {
-      req.reply(mockGetAssetSummary({ assetModelId, id: assetId }));
+      req.reply(mockGetAssetSummary({ assetModelId, assetId }));
+    });
+
+    cy.intercept(`/asset-models/${assetModelId}`, (req) => {
+      req.reply(mockGetAssetModelSummary({ assetModelId }));
     });
   });
 
-  it.skip('renders', () => {
+  it('renders', () => {
     renderChart({ chartType: 'iot-bar-chart', settings: { resolution: '1m' } });
 
     cy.wait(SECOND_IN_MS * 2);

diff --git a/packages/components/src/integration/iot-connector/iot-connector.spec.component.ts b/packages/components/src/integration/iot-connector/iot-connector.spec.component.ts
@@ -1,6 +1,7 @@
 import { renderChart, testChartContainerClassNameSelector } from '../../testing/renderChart';
 import { mockGetAggregatedOrRawResponse } from '../../testing/mocks/mockGetAggregatedOrRawResponse';
 import { mockGetAssetSummary } from '../../testing/mocks/mockGetAssetSummaries';
+import { mockGetAssetModelSummary } from '../../testing/mocks/mockGetAssetModelSummary';
 
 const SECOND_IN_MS = 1000;
 
@@ -52,7 +53,11 @@ describe('handles gestures', () => {
     });
 
     cy.intercept(`/assets/${assetId}`, (req) => {
-      req.reply(mockGetAssetSummary({ assetModelId, id: assetId }));
+      req.reply(mockGetAssetSummary({ assetModelId, assetId }));
+    });
+
+    cy.intercept(`/asset-models/${assetModelId}`, (req) => {
+      req.reply(mockGetAssetModelSummary({ assetModelId }));
     });
   });
 

diff --git a/packages/components/src/integration/iot-kpi/iot-kpi.spec.component.ts b/packages/components/src/integration/iot-kpi/iot-kpi.spec.component.ts
@@ -1,6 +1,7 @@
 import { renderChart } from '../../testing/renderChart';
 import { mockLatestValueResponse } from '../../testing/mocks/mockGetAggregatedOrRawResponse';
 import { mockGetAssetSummary } from '../../testing/mocks/mockGetAssetSummaries';
+import { mockGetAssetModelSummary } from '../../testing/mocks/mockGetAssetModelSummary';
 
 const SECOND_IN_MS = 1000;
 
@@ -18,7 +19,11 @@ describe('kpi', () => {
     });
 
     cy.intercept(`/assets/${assetId}`, (req) => {
-      req.reply(mockGetAssetSummary({ assetModelId, id: assetId }));
+      req.reply(mockGetAssetSummary({ assetModelId, assetId }));
+    });
+
+    cy.intercept(`/asset-models/${assetModelId}`, (req) => {
+      req.reply(mockGetAssetModelSummary({ assetModelId }));
     });
   });
 

diff --git a/packages/components/src/integration/iot-line-chart/iot-line-chart.spec.component.ts b/packages/components/src/integration/iot-line-chart/iot-line-chart.spec.component.ts
@@ -2,6 +2,7 @@ import { renderChart } from '../../testing/renderChart';
 import { mockGetAggregatedOrRawResponse } from '../../testing/mocks/mockGetAggregatedOrRawResponse';
 import { mockGetAssetSummary } from '../../testing/mocks/mockGetAssetSummaries';
 import { ScaleConfig, ScaleType } from '@synchro-charts/core';
+import { mockGetAssetModelSummary } from '../../testing/mocks/mockGetAssetModelSummary';
 
 const SECOND_IN_MS = 1000;
 
@@ -35,7 +36,11 @@ describe('line chart', () => {
     });
 
     cy.intercept(`/assets/${assetId}`, (req) => {
-      req.reply(mockGetAssetSummary({ assetModelId, id: assetId }));
+      req.reply(mockGetAssetSummary({ assetModelId, assetId }));
+    });
+
+    cy.intercept(`/asset-models/${assetModelId}`, (req) => {
+      req.reply(mockGetAssetModelSummary({ assetModelId }));
     });
   });
 

diff --git a/.../components/src/integration/iot-resource-explorer/iot-resource-explorer.spec.component.ts b/.../components/src/integration/iot-resource-explorer/iot-resource-explorer.spec.component.ts
@@ -1,11 +1,14 @@
 import { renderComponent, testContainerClassName } from './setup';
 import {
   getTableAscSortedColumnSelector,
+  getTableCellSelector,
   getTableDescSortedColumnSelector,
   getTableRowSelector,
+  getTableRowsSelector,
   getTableSelectedRowsSelector,
   setTableColumnSelectionSelector,
   setTableRowSelection,
+  setTextFilterValue,
 } from './utils';
 import { mocklistAssociatedAssetsResponse } from '../../testing/mocks/data/listAssociatedAssetsResponse';
 import { mocklistAssetsResponse } from '../../testing/mocks/data/listAssetsResponse';
@@ -25,13 +28,13 @@ it('sort by name asc', () => {
   cy.matchImageSnapshotOnCI('sort by name asc');
 });
 
-// it('filter by name', () => {
-//   renderComponent();
-//   cy.get(`.${testContainerClassName}`).should('be.visible');
-//   setTextFilterValue('Turbine', '[placeholder="Filter by name"]');
-//   cy.waitUntil(() => cy.get(getTableRowsSelector()).then((rows) => rows.length === 1));
-//   cy.matchImageSnapshotOnCI('filter by name');
-// });
+it('filter by name', () => {
+  renderComponent();
+  cy.get(`.${testContainerClassName}`).should('be.visible');
+  setTextFilterValue('Turbine', '[placeholder="Filter by name"]');
+  cy.waitUntil(() => cy.get(getTableRowsSelector()).then((rows) => rows.length === 1));
+  cy.matchImageSnapshotOnCI('filter by name');
+});
 
 it('select row', () => {
   renderComponent();
@@ -41,16 +44,16 @@ it('select row', () => {
   cy.matchImageSnapshotOnCI('select row');
 });
 
-// it('expand row', () => {
-//   renderComponent();
-//   cy.get(`.${testContainerClassName}`).should('be.visible');
-//   cy.get(getTableCellSelector(2, 2)).should('be.contain', 'Turbine 1');
-//   cy.get(getTableCellSelector(2, 2)).then((cell) => {
-//     cell.find('button').click();
-//   });
-//   cy.waitUntil(() => cy.get(getTableRowsSelector()).then((rows) => rows.length === 4));
-//   cy.matchImageSnapshotOnCI('expand row');
-// });
+it('expand row', () => {
+  renderComponent();
+  cy.get(`.${testContainerClassName}`).should('be.visible');
+  cy.get(getTableCellSelector(2, 2)).should('be.contain', 'Turbine 1');
+  cy.get(getTableCellSelector(2, 2)).then((cell) => {
+    cell.find('button').click();
+  });
+  cy.waitUntil(() => cy.get(getTableRowsSelector()).then((rows) => rows.length === 4));
+  cy.matchImageSnapshotOnCI('expand row');
+});
 
 it('expands all nodes', () => {
   renderComponent({ propOverrides: { expanded: true } });

diff --git a/packages/components/src/integration/iot-scatter-chart/iot-scatter-chart.spec.component.ts b/packages/components/src/integration/iot-scatter-chart/iot-scatter-chart.spec.component.ts
@@ -2,6 +2,7 @@ import { renderChart } from '../../testing/renderChart';
 import { mockGetAggregatedOrRawResponse } from '../../testing/mocks/mockGetAggregatedOrRawResponse';
 import { mockGetAssetSummary } from '../../testing/mocks/mockGetAssetSummaries';
 import { ScaleConfig, ScaleType } from '@synchro-charts/core';
+import { mockGetAssetModelSummary } from '../../testing/mocks/mockGetAssetModelSummary';
 
 const SECOND_IN_MS = 1000;
 
@@ -25,7 +26,11 @@ describe('scatter chart', () => {
     });
 
     cy.intercept(`/assets/${assetId}`, (req) => {
-      req.reply(mockGetAssetSummary({ assetModelId, id: assetId }));
+      req.reply(mockGetAssetSummary({ assetModelId, assetId }));
+    });
+
+    cy.intercept(`/asset-models/${assetModelId}`, (req) => {
+      req.reply(mockGetAssetModelSummary({ assetModelId }));
     });
   });
 

diff --git a/packages/components/src/integration/iot-status-grid/iot-status-grid.spec.component.ts b/packages/components/src/integration/iot-status-grid/iot-status-grid.spec.component.ts
@@ -2,6 +2,7 @@ import { renderChart } from '../../testing/renderChart';
 import { mockLatestValueResponse } from '../../testing/mocks/mockGetAggregatedOrRawResponse';
 import { mockGetAssetSummary } from '../../testing/mocks/mockGetAssetSummaries';
 import { COMPARISON_OPERATOR } from '@synchro-charts/core';
+import { mockGetAssetModelSummary } from '../../testing/mocks/mockGetAssetModelSummary';
 
 const SECOND_IN_MS = 1000;
 
@@ -19,7 +20,11 @@ describe('status grid', () => {
     });
 
     cy.intercept(`/assets/${assetId}`, (req) => {
-      req.reply(mockGetAssetSummary({ assetModelId, id: assetId }));
+      req.reply(mockGetAssetSummary({ assetModelId, assetId }));
+    });
+
+    cy.intercept(`/asset-models/${assetModelId}`, (req) => {
+      req.reply(mockGetAssetModelSummary({ assetModelId }));
     });
   });
 

diff --git a/...ages/components/src/integration/iot-status-timeline/iot-status-timeline.spec.component.ts b/...ages/components/src/integration/iot-status-timeline/iot-status-timeline.spec.component.ts
@@ -2,6 +2,7 @@ import { renderChart } from '../../testing/renderChart';
 import { mockGetAggregatedOrRawResponse } from '../../testing/mocks/mockGetAggregatedOrRawResponse';
 import { mockGetAssetSummary } from '../../testing/mocks/mockGetAssetSummaries';
 import { COMPARISON_OPERATOR } from '@synchro-charts/core';
+import { mockGetAssetModelSummary } from '../../testing/mocks/mockGetAssetModelSummary';
 
 const SECOND_IN_MS = 1000;
 
@@ -35,7 +36,11 @@ describe('status timeline', () => {
     });
 
     cy.intercept(`/assets/${assetId}`, (req) => {
-      req.reply(mockGetAssetSummary({ assetModelId, id: assetId }));
+      req.reply(mockGetAssetSummary({ assetModelId, assetId }));
+    });
+
+    cy.intercept(`/asset-models/${assetModelId}`, (req) => {
+      req.reply(mockGetAssetModelSummary({ assetModelId }));
     });
   });
 

diff --git a/packages/components/src/testing/mocks/mockGetAssetModelSummary.ts b/packages/components/src/testing/mocks/mockGetAssetModelSummary.ts
@@ -0,0 +1,23 @@
+import { DescribeAssetModelResponse } from '@aws-sdk/client-iotsitewise';
+
+export const mockGetAssetModelSummary = (
+  assetSummary: Partial<DescribeAssetModelResponse> = {}
+): DescribeAssetModelResponse => ({
+  assetModelId: 'some-asset-model-id',
+  assetModelName: 'some-asset-model-name',
+  assetModelDescription: undefined,
+  assetModelCreationDate: undefined,
+  assetModelLastUpdateDate: undefined,
+  assetModelStatus: undefined,
+  assetModelHierarchies: [],
+  assetModelArn: undefined,
+  assetModelProperties: [
+    {
+      dataType: 'DOUBLE',
+      id: 'some-property-id',
+      name: 'Asset Name',
+      type: undefined,
+    },
+  ],
+  ...assetSummary,
+});
diff --git a/packages/components/src/testing/mocks/mockGetAssetSummaries.ts b/packages/components/src/testing/mocks/mockGetAssetSummaries.ts
@@ -1,13 +1,20 @@
-import { AssetSummary } from '@aws-sdk/client-iotsitewise';
+import { DescribeAssetResponse } from '@aws-sdk/client-iotsitewise';
 
-export const mockGetAssetSummary = (assetSummary: Partial<AssetSummary> = {}): AssetSummary => ({
-  id: 'some-asset-id',
-  name: 'some-asset-summary-name',
+export const mockGetAssetSummary = (assetSummary: Partial<DescribeAssetResponse> = {}): DescribeAssetResponse => ({
+  assetId: 'some-asset-id',
+  assetName: 'some-asset-summary-name',
   assetModelId: 'some-asset-model-id',
-  creationDate: undefined,
-  lastUpdateDate: undefined,
-  status: undefined,
-  hierarchies: [],
-  arn: undefined,
+  assetCreationDate: undefined,
+  assetLastUpdateDate: undefined,
+  assetStatus: undefined,
+  assetHierarchies: [],
+  assetArn: undefined,
+  assetProperties: [
+    {
+      id: 'some-property-id',
+      name: 'Asset Name',
+      dataType: 'DOUBLE',
+    },
+  ],
   ...assetSummary,
 });
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "IoT Application Kit core",
   "main": "./dist/index.cj.js",
   "module": "./dist/index.js",

diff --git a/packages/react-components/package.json b/packages/react-components/package.json
@@ -5,7 +5,7 @@
     "access": "public"
   },
   "sideEffects": false,
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "React specific wrapper for IoT Application Kit",
   "author": {
     "name": "Amazon Web Services",
@@ -41,7 +41,7 @@
     "typescript": "^3.3.4000"
   },
   "dependencies": {
-    "@iot-app-kit/components": "^1.4.0"
+    "@iot-app-kit/components": "^1.5.0"
   },
   "peerDependencies": {
     "react": "^17.0.2",

diff --git a/packages/related-table/package.json b/packages/related-table/package.json
@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "IoT Application Kit - Related Table component",
   "license": "Apache-2.0",
   "main": "dist/index.js",

diff --git a/packages/source-iotsitewise/package.json b/packages/source-iotsitewise/package.json
@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "AWS IoT SiteWise source for IoT Application Kit",
   "homepage": "https://github.com/awslabs/iot-app-kit#readme",
   "license": "Apache-2.0",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-iotsitewise": "^3.39.0",
-    "@iot-app-kit/core": "^1.4.0",
+    "@iot-app-kit/core": "^1.5.0",
     "@rollup/plugin-typescript": "^8.3.0",
     "@synchro-charts/core": "^5.0.0",
     "flush-promises": "^1.0.2",