From e9c62078e5be41b6527a6b1881a908f3aed4156e Mon Sep 17 00:00:00 2001 From: cptran777 Date: Mon, 17 Sep 2018 14:12:47 -0700 Subject: [PATCH] Fix for failing tests for lineage. Avatar tests still failing --- .../mirage/factories/lineage-view.ts | 32 +++++++++++++++++++ .../mirage/helpers/dataset-downstreams.ts | 4 +-- .../mirage/helpers/dataset-upstreams.ts | 2 +- wherehows-web/mirage/models/lineage-view.ts | 3 ++ wherehows-web/mirage/scenarios/default.ts | 1 + .../dataset-lineage-downstreams-test.ts | 1 + .../dataset-lineage-upstreams-test.ts | 1 + .../containers/upstream-dataset-test.js | 8 ++++- .../datasets/upstream-dataset-test.js | 3 +- 9 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 wherehows-web/mirage/factories/lineage-view.ts create mode 100644 wherehows-web/mirage/models/lineage-view.ts diff --git a/wherehows-web/mirage/factories/lineage-view.ts b/wherehows-web/mirage/factories/lineage-view.ts new file mode 100644 index 0000000000..69f82dc63e --- /dev/null +++ b/wherehows-web/mirage/factories/lineage-view.ts @@ -0,0 +1,32 @@ +import { Factory, faker } from 'ember-cli-mirage'; +import { DatasetPlatform } from 'wherehows-web/constants'; +import { hdfsUrn, nonHdfsUrn } from 'wherehows-web/mirage/fixtures/urn'; + +export default Factory.extend({ + dataset() { + const platform = faker.list.random(...Object.values(DatasetPlatform)); + + return { + createdTime: faker.date.past(2), + deprecated: true, + deprecationNote: faker.lorem.words(5), + description: faker.lorem.words(7), + fabric: null, + modifiedTime: faker.date.recent(), + nativeName: 'abook.default-public-container', + nativeType: null, + platform, + properties: '{}', + removed: faker.random.boolean(), + tags: null, + uri: + platform === DatasetPlatform.HDFS + ? hdfsUrn + : nonHdfsUrn.replace(/li:dataPlatform:db/, `li:dataPlatform:${platform}`) + }; + }, + + actor: 'corpuser:lskywalker', + + type: 'fake-type' +}); diff --git a/wherehows-web/mirage/helpers/dataset-downstreams.ts b/wherehows-web/mirage/helpers/dataset-downstreams.ts index 2597e9698f..a354d0be76 100644 --- a/wherehows-web/mirage/helpers/dataset-downstreams.ts +++ b/wherehows-web/mirage/helpers/dataset-downstreams.ts @@ -1,7 +1,7 @@ import { IFunctionRouteHandler } from 'wherehows-web/typings/ember-cli-mirage'; -const getDatasetDownstreams = function(this: IFunctionRouteHandler, { datasetViews }: { datasetViews: any }) { - return this.serialize(datasetViews.all()); +const getDatasetDownstreams = function(this: IFunctionRouteHandler, { lineageViews }: { lineageViews: any }) { + return this.serialize(lineageViews.all()); }; export { getDatasetDownstreams }; diff --git a/wherehows-web/mirage/helpers/dataset-upstreams.ts b/wherehows-web/mirage/helpers/dataset-upstreams.ts index 3010cb1f9b..4f7b8313ca 100644 --- a/wherehows-web/mirage/helpers/dataset-upstreams.ts +++ b/wherehows-web/mirage/helpers/dataset-upstreams.ts @@ -1,3 +1,3 @@ -const getDatasetUpstreams = ({ datasetViews }: { datasetViews: any }) => datasetViews.all(); +const getDatasetUpstreams = ({ lineageViews }: { lineageViews: any }) => lineageViews.all(); export { getDatasetUpstreams }; diff --git a/wherehows-web/mirage/models/lineage-view.ts b/wherehows-web/mirage/models/lineage-view.ts new file mode 100644 index 0000000000..770b50936d --- /dev/null +++ b/wherehows-web/mirage/models/lineage-view.ts @@ -0,0 +1,3 @@ +import { Model } from 'ember-cli-mirage'; + +export default Model.extend({}); diff --git a/wherehows-web/mirage/scenarios/default.ts b/wherehows-web/mirage/scenarios/default.ts index 082e43df83..b1a014349e 100644 --- a/wherehows-web/mirage/scenarios/default.ts +++ b/wherehows-web/mirage/scenarios/default.ts @@ -30,4 +30,5 @@ export default function(server: IMirageServer) { server.createList('platform', 2); server.createList('version', 2); server.createList('health', 1); + server.createList('lineageView', 4); } diff --git a/wherehows-web/tests/integration/components/datasets/containers/dataset-lineage-downstreams-test.ts b/wherehows-web/tests/integration/components/datasets/containers/dataset-lineage-downstreams-test.ts index 1cffb33125..c0943cd2ed 100644 --- a/wherehows-web/tests/integration/components/datasets/containers/dataset-lineage-downstreams-test.ts +++ b/wherehows-web/tests/integration/components/datasets/containers/dataset-lineage-downstreams-test.ts @@ -33,6 +33,7 @@ module('Integration | Component | datasets/containers/dataset-lineage-downstream const downstreamCount = 4; server.createList('datasetView', downstreamCount); + server.createList('lineageView', downstreamCount); this.set('urn', nonHdfsUrn); diff --git a/wherehows-web/tests/integration/components/datasets/containers/dataset-lineage-upstreams-test.ts b/wherehows-web/tests/integration/components/datasets/containers/dataset-lineage-upstreams-test.ts index f0155960e5..612a901357 100644 --- a/wherehows-web/tests/integration/components/datasets/containers/dataset-lineage-upstreams-test.ts +++ b/wherehows-web/tests/integration/components/datasets/containers/dataset-lineage-upstreams-test.ts @@ -33,6 +33,7 @@ module('Integration | Component | datasets/containers/dataset-lineage-upstreams' const upstreamCount = 3; server.createList('datasetView', upstreamCount); + server.createList('lineageView', upstreamCount); this.set('urn', nonHdfsUrn); diff --git a/wherehows-web/tests/integration/components/datasets/containers/upstream-dataset-test.js b/wherehows-web/tests/integration/components/datasets/containers/upstream-dataset-test.js index b3ee6c0c0f..da14ba3199 100644 --- a/wherehows-web/tests/integration/components/datasets/containers/upstream-dataset-test.js +++ b/wherehows-web/tests/integration/components/datasets/containers/upstream-dataset-test.js @@ -4,6 +4,7 @@ import { render, waitUntil, find, findAll, click } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; import { DatasetPlatform, PurgePolicy } from 'wherehows-web/constants'; import { hdfsUrn } from 'wherehows-web/mirage/fixtures/urn'; +import defaultScenario from 'wherehows-web/mirage/scenarios/default'; const upstreamElement = '.upstream-dataset'; const downstreamPolicyEditButton = '#downstream-purge-edit'; @@ -12,10 +13,15 @@ const purgePolicyClass = '.purge-policy-list__item'; module('Integration | Component | datasets/containers/upstream dataset', function(hooks) { setupRenderingTest(hooks); + hooks.beforeEach(function() { + defaultScenario(this.server); + }); + test('it renders', async function(assert) { assert.expect(1); const { server } = this; - const { nativeName, platform, uri } = server.create('datasetView'); + const something = server.create('datasetView'); + const { nativeName, platform, uri } = server.create('dataset-view'); this.set('urn', uri); this.set('platform', platform); diff --git a/wherehows-web/tests/integration/components/datasets/upstream-dataset-test.js b/wherehows-web/tests/integration/components/datasets/upstream-dataset-test.js index 5c41cd63fb..036df08fd0 100644 --- a/wherehows-web/tests/integration/components/datasets/upstream-dataset-test.js +++ b/wherehows-web/tests/integration/components/datasets/upstream-dataset-test.js @@ -6,7 +6,6 @@ import { hdfsUrn, nonHdfsUrn } from 'wherehows-web/mirage/fixtures/urn'; module('Integration | Component | datasets/upstream dataset', function(hooks) { setupRenderingTest(hooks); - test('it renders', async function(assert) { await render(hbs`{{datasets/upstream-dataset}}`); @@ -15,7 +14,7 @@ module('Integration | Component | datasets/upstream dataset', function(hooks) { test('it renders upstream dataset properties', async function(assert) { const upstreamLink = '.upstream-dataset__upstream-link'; - const upstreamsMetadata = [{}, {}]; + const upstreamsMetadata = [{ dataset: {} }, { dataset: {} }]; this.set('upstreamsMetadata', upstreamsMetadata); await render(hbs`{{datasets/upstream-dataset upstreamsMetadata=upstreamsMetadata}}`);