Merge pull request #412 from Strongminds/feature/KITOSUDV-1012-task-1…

…618-protractor Feature/kitosudv 1012 task 1618 protractor
os2kitos · Apr 19, 2021 · db095e3 · db095e3
2 parents 3f7fcdf + 12e5fd6
commit db095e3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 25 deletions.
diff --git a/Presentation.Web/Tests/Helpers/SystemUsageHelper.ts b/Presentation.Web/Tests/Helpers/SystemUsageHelper.ts
@@ -3,18 +3,18 @@
 class SystemUsageHelper {
     private static pageObject = new ItSystemOverview();
 
-    public static openLocalSystem(name: string) {
+    static openLocalSystem(name: string) {
         console.log(`open details for local system: ${name}`);
         return SystemUsageHelper.pageObject.getPage()
             .then(() => SystemUsageHelper.waitForKendoGrid())
             .then(() => SystemUsageHelper.findCatalogColumnsFor(name).first().click());
     }
 
-    public static findCatalogColumnsFor(name: string) {
+    static findCatalogColumnsFor(name: string) {
         return SystemUsageHelper.pageObject.kendoToolbarWrapper.getFilteredColumnElement(SystemUsageHelper.pageObject.kendoToolbarWrapper.columnObjects().systemName, name);
     }
 
-    public static waitForKendoGrid() {
+    static waitForKendoGrid() {
         console.log("Waiting for kendo grid to be ready");
         return this.pageObject.waitForKendoGrid();
     }

diff --git a/Presentation.Web/Tests/Utility/Constants.ts b/Presentation.Web/Tests/Utility/Constants.ts
@@ -1,10 +1,8 @@
 class Constants {
-    readonly kendoSystemNameHeader = "systemNameKendoHeader";
-    readonly kendoSystemNameObjects = "systemNameKendoObject";
+    readonly kendoSystemNameObjects = "sysnameKendoObject";
     readonly kendoReportNameObjects = "reportNameKendoObject";
     readonly kendoProjectNameObjects = "projectNameKendoObject";
-    readonly kendoSystemRightsOwnerHeader = "systemRightsOwnerHeader";
-    readonly kendoSystemRightsOwnerObject = "systemRightsOwnerObject";
+    readonly kendoSystemRightsOwnerObject = "belongstoKendoObject";
     readonly kendoSystemButtonCreate = "createITSystemButton";
     readonly kendoDpaButtonCreate = "createDpaButton";
     readonly kendoContractNameHeader = "contractNameHeader";

diff --git a/Presentation.Web/Tests/it-system/regularUser.System.e2e.spec.ts b/Presentation.Web/Tests/it-system/regularUser.System.e2e.spec.ts
@@ -29,7 +29,7 @@ describe("Regular user IT Systems tests", () => {
     it("Apply and delete filter buttons are disabled", () => {
         loginHelper.loginAsRegularUser()
             .then(() => pageObject.getPage())
-            .then(() => browser.wait(ec.visibilityOf(headerButtons.useFilter), waitUpTo.twentySeconds))
+            .then(() => browser.wait(ec.presenceOf(headerButtons.useFilter), waitUpTo.twentySeconds))
             .then(() => expect(headerButtonsHelper.isUseDisabled()).toEqual("true"))
             .then(() => expect(headerButtonsHelper.isDeleteDisabled()).toEqual("true"));
     });
@@ -38,14 +38,8 @@ describe("Regular user IT Systems tests", () => {
         loginHelper.loginAsRegularUser()
             .then(() => pageObject.getPage())
             .then(() => pageObject.waitForKendoGrid())
+            .then(() => browser.wait(ec.presenceOf(gridObjects.systemName.first()), waitUpTo.twentySeconds))
             .then(() => gridObjects.systemName.first().click())
             .then(() => expect(browser.getCurrentUrl()).toContain("system/usage"));
     });
-
-    it("Show rights owner column data", () => {
-        loginHelper.loginAsRegularUser()
-            .then(() => pageObject.getPage())
-            .then(() => pageObject.waitForKendoGrid())
-            .then(() => expect(headerObjects.systemRightsOwner.isPresent()).toBe(true));
-    });
 });
diff --git a/Presentation.Web/Tests/object-wrappers/kendoToolbarWrapper.ts b/Presentation.Web/Tests/object-wrappers/kendoToolbarWrapper.ts
@@ -26,7 +26,6 @@ type InputFields =
 };
 
 type ColumnHeaders = {
-    systemName: protractor.ElementFinder,
     referenceName: protractor.ElementFinder,
     referenceId: protractor.ElementFinder,
     contractName: protractor.ElementFinder,
@@ -35,7 +34,6 @@ type ColumnHeaders = {
     usedByNameHeader: protractor.ElementFinder,
     userApi: protractor.ElementFinder,
     userEmail: protractor.ElementFinder,
-    systemRightsOwner: protractor.ElementFinder,
 };
 
 type ColumnObjects = {
@@ -97,7 +95,6 @@ class kendoToolbarWrapper {
         var kendo = new kendoHelper();
 
         var columns: ColumnHeaders = {
-            systemName: kendo.getColumnHeaderClickable(consts.kendoSystemNameHeader),
             contractName: kendo.getColumnHeaderClickable(consts.kendoContractNameHeader),
             catalogName: kendo.getColumnHeaderClickable(consts.kendoCatalogNameHeader),
             catalogUsage: kendo.getColumnHeaderClickable(consts.kendoCatalogUsageHeader),
@@ -106,7 +103,6 @@ class kendoToolbarWrapper {
             userApi: kendo.getUserColumnHeaderClickable(consts.kendoUserApiHeader),
             userEmail: kendo.getColumnHeaderClickable(consts.kendoUserEmailHeader),
             usedByNameHeader: kendo.getColumnHeaderClickable(consts.kendoUsedByHeader),
-            systemRightsOwner: kendo.getColumnHeaderClickable(consts.kendoSystemRightsOwnerHeader)
 
         };
         return columns;

diff --git a/Presentation.Web/app/utility/kendoGridLauncher.ts b/Presentation.Web/app/utility/kendoGridLauncher.ts
@@ -592,25 +592,25 @@ module Kitos.Utility.KendoGrid {
                     name: "clearFilter",
                     text: "Nulstil",
                     template:
-                        "<button type='button' class='k-button k-button-icontext' title='Nulstil sortering, filtering og kolonnevisning, -bredde og –rækkefølge' data-ng-click='kendoVm.standardToolbar.clearOptions()'>#: text #</button>"
+                        "<button data-element-type='resetFilterButton' type='button' class='k-button k-button-icontext' title='Nulstil sortering, filtering og kolonnevisning, -bredde og –rækkefølge' data-ng-click='kendoVm.standardToolbar.clearOptions()'>#: text #</button>"
                 },
                 {
                     name: "saveFilter",
                     text: "Gem filter",
                     template:
-                        '<button type="button" class="k-button k-button-icontext" title="Gem filtre og sortering" data-ng-click="kendoVm.standardToolbar.saveGridProfile()">#: text #</button>'
+                        '<button data-element-type="saveFilterButton" type="button" class="k-button k-button-icontext" title="Gem filtre og sortering" data-ng-click="kendoVm.standardToolbar.saveGridProfile()">#: text #</button>'
                 },
                 {
                     name: "useFilter",
                     text: "Anvend filter",
                     template:
-                        '<button type="button" class="k-button k-button-icontext" title="Anvend gemte filtre og sortering" data-ng-click="kendoVm.standardToolbar.loadGridProfile()" data-ng-disabled="!kendoVm.standardToolbar.doesGridProfileExist()">#: text #</button>'
+                        '<button data-element-type="useFilterButton" type="button" class="k-button k-button-icontext" title="Anvend gemte filtre og sortering" data-ng-click="kendoVm.standardToolbar.loadGridProfile()" data-ng-disabled="!kendoVm.standardToolbar.doesGridProfileExist()">#: text #</button>'
                 },
                 {
                     name: "deleteFilter",
                     text: "Slet filter",
                     template:
-                        "<button type='button' class='k-button k-button-icontext' title='Slet filtre og sortering' data-ng-click='kendoVm.standardToolbar.clearGridProfile()' data-ng-disabled='!kendoVm.standardToolbar.doesGridProfileExist()'>#: text #</button>"
+                        "<button data-element-type='removeFilterButton' type='button' class='k-button k-button-icontext' title='Slet filtre og sortering' data-ng-click='kendoVm.standardToolbar.clearGridProfile()' data-ng-disabled='!kendoVm.standardToolbar.doesGridProfileExist()'>#: text #</button>"
                 }
             ];
 

diff --git a/Tests.Unit.Core.ApplicationServices/Infrastructure/EndpointValidationServiceTest.cs b/Tests.Unit.Core.ApplicationServices/Infrastructure/EndpointValidationServiceTest.cs
@@ -16,10 +16,9 @@ public EndpointValidationServiceTest()
 
         [Theory]
         [InlineData("http://127.0.0.1/should-not-be-here/", false, EndpointValidationErrorType.ErrorResponseCode, HttpStatusCode.NotFound)]
-        [InlineData("http://kitos.dk", true, null, null)] //will upgrade to https
-        [InlineData("https://kitos.dk", true, null, null)]
         [InlineData("http://strongminds.dk", true, null, null)] //will upgrade to https
         [InlineData("https://strongminds.dk", true, null, null)]
+        [InlineData("http://google.com", true, null, null)] //will upgrade to https
         [InlineData("https://google.com", true, null, null)]
         [InlineData("htt:/google.com", false, EndpointValidationErrorType.InvalidWebsiteUri, null)]
         [InlineData("https://d724FF4EE-EA34-4941-88C3-D567958976FF.com", false, EndpointValidationErrorType.DnsLookupFailed, null)]