merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>
diff --git a/vid-webpack-master/cypress/integration/iFrames/welcomePage.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/welcomePage.e2e.ts
new file mode 100644
index 0000000..98d39ff
--- /dev/null
+++ b/vid-webpack-master/cypress/integration/iFrames/welcomePage.e2e.ts
@@ -0,0 +1,40 @@
+///<reference path="../../../node_modules/cypress/types/index.d.ts"/> / <reference types="Cypress" />
+
+import {JsonBuilder} from "../../support/jsonBuilders/jsonBuilder";
+import {ServiceModel} from "../../support/jsonBuilders/models/service.model";
+
+describe('Welcome page', function () {
+  var jsonBuilderAndMock : JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
+
+  //describe('Contact us', () => {
+
+    beforeEach(() => {
+      cy.login();
+    });
+
+  afterEach(() => {
+    cy.screenshot();
+  });
+
+    it(`verifying Contact Us link"`, function () {
+    cy.visit('/welcome.htm');
+    cy.get('A[href="mailto:portal@lists.onap.org"]').contains('Contact Us');
+      });
+
+  it(`verifying VID version"`, function () {
+
+    const APP_VERSION = "1902.1948";
+    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/version.json').then((res) => {
+      jsonBuilderAndMock.basicJson(res,
+        Cypress.config('baseUrl') + '/version',
+        200,
+        0,
+        'app_version');
+    });
+    cy.visit('/welcome.htm');
+    cy.getElementByDataTestsId('app-version').should("text", APP_VERSION);
+  });
+  //  });
+  });
+
+